summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-08-22 07:40:13 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-08-22 07:40:13 -0700
commitf113e18fd3e79ad7798209785ea52318f8ef0b0d (patch)
tree59992f9402e09faba2ea65da657ab6f29495e5fd
parente639ee2ed5f445baaf3e76b02e555d566cbce006 (diff)
downloaddebug-me-f113e18fd3e79ad7798209785ea52318f8ef0b0d.tar.gz
Commit Debian 3.0 (quilt) metadata
[dgit (9.10~bpo10+1) quilt-fixup]
-rw-r--r--debian/patches/debian-changes36
1 files changed, 7 insertions, 29 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 192a4e6..3be7ea0 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -15,19 +15,8 @@ upload of upstream version 1.2.3, you could use:
clone`.)
A single combined diff, containing all the changes, follows.
---- debug-me-1.20190926.orig/Server.hs
-+++ debug-me-1.20190926/Server.hs
-@@ -16,7 +16,7 @@ import Log
- import Network.Wai
- import Network.Wai.Handler.Warp
- import Network.Wai.Handler.WebSockets
--import Network.WebSockets hiding (Message)
-+import Network.WebSockets hiding (Message, serverPort)
- import qualified Network.WebSockets as WS
- import Network.HTTP.Types
- import Control.Concurrent
---- debug-me-1.20190926.orig/Val.hs
-+++ debug-me-1.20190926/Val.hs
+--- debug-me-1.20200820.orig/Val.hs
++++ debug-me-1.20200820/Val.hs
@@ -42,7 +42,7 @@ instance FromJSON Val where
b64 :: B.ByteString -> T.Text
b64 = T.decodeUtf8 . B64.encode
@@ -37,19 +26,8 @@ A single combined diff, containing all the changes, follows.
unb64 t = either
(\_ -> fail "bad base64 data")
return
---- debug-me-1.20190926.orig/debug-me.cabal
-+++ debug-me-1.20190926/debug-me.cabal
-@@ -50,7 +50,7 @@ custom-setup
-
- Executable debug-me
- Main-Is: debug-me.hs
-- GHC-Options: -threaded -Wall -fno-warn-tabs -O2
-+ GHC-Options: -threaded -Wall -fno-warn-tabs -O2 -XNoMonadFailDesugaring
- Build-Depends:
- base (>= 4.9 && < 5.0)
- , network (>= 2.6)
---- debug-me-1.20190926.orig/debug-me.init
-+++ debug-me-1.20190926/debug-me.init
+--- debug-me-1.20200820.orig/debug-me.init
++++ debug-me-1.20200820/debug-me.init
@@ -33,7 +33,7 @@ case "$1" in
start-stop-daemon --start --quiet --oknodo \
--background --no-close \
@@ -59,11 +37,11 @@ A single combined diff, containing all the changes, follows.
--exec "$DAEMON" -- $DAEMON_PARAMS \
> /var/log/debug-me.log
log_end_msg $?
---- debug-me-1.20190926.orig/debug-me.service
-+++ debug-me-1.20190926/debug-me.service
+--- debug-me-1.20200820.orig/debug-me.service
++++ debug-me-1.20200820/debug-me.service
@@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/debug-me
ExecStart=/usr/bin/debug-me $DAEMON_PARAMS
- InaccessiblePaths=/home /etc
+ InaccessiblePaths=/home
ReadWritePaths=/var/log/debug-me
-User=debug-me
-Group=debug-me