From 3289726f729507e154c92883a728f88bcfd31074 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 25 Jan 2017 08:08:13 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (3.8) quilt-fixup] --- .../bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch | 48 ---------------------- debian/patches/debian-changes | 40 ++++++++++++++++++ debian/patches/series | 3 +- debian/patches/use-_keysafe.patch | 40 ------------------ 4 files changed, 41 insertions(+), 90 deletions(-) delete mode 100644 debian/patches/bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch create mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/use-_keysafe.patch (limited to 'debian') diff --git a/debian/patches/bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch b/debian/patches/bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch deleted file mode 100644 index 8aa2fc6..0000000 --- a/debian/patches/bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Sean Whitton -Date: Tue, 29 Nov 2016 17:39:54 -0700 -Subject: bump deps to GHC 8.0.1 / LTS Haskell 7.8 - -Forwarded: yes ---- - keysafe.cabal | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/keysafe.cabal b/keysafe.cabal -index 335e8a3..fc64e3f 100644 ---- a/keysafe.cabal -+++ b/keysafe.cabal -@@ -39,27 +39,27 @@ Executable keysafe - , random == 1.1.* - , secret-sharing == 1.0.* - , raaz == 0.0.2 -- , time == 1.5.* -+ , time == 1.6.* - , containers == 0.5.* -- , binary == 0.7.* -+ , binary == 0.8.* - , text == 1.2.* - , utf8-string == 1.0.* - , unix == 2.7.* - , filepath == 1.4.* - , split == 0.2.* - , directory == 1.2.* -- , process == 1.2.* -+ , process == 1.4.* - , optparse-applicative == 0.12.* - , readline == 1.0.* - , zxcvbn-c == 1.0.* -- , servant == 0.7.* -- , servant-server == 0.7.* -- , servant-client == 0.7.* -+ , servant == 0.8.* -+ , servant-server == 0.8.* -+ , servant-client == 0.8.* - , aeson == 0.11.* - , wai == 3.2.* - , warp == 3.2.* - , http-client == 0.4.* -- , transformers == 0.4.* -+ , transformers == 0.5.* - , stm == 2.4.* - , socks == 0.5.* - , network == 2.6.* diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 0000000..a62110e --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,40 @@ +The Debian packaging of foo is maintained in git, using the merging +workflow described in dgit-maint-merge(7). There isn't a patch queue +that can be represented as a quilt series. + +A detailed breakdown of the changes is available from their canonical +representation - git commits in the packaging repository. For +example, to see the changes made by the Debian maintainer in the first +upload of upstream version 1.2.3, you could use: + + % git clone https://git.dgit.debian.org/ + % cd foo + % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' + +(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.) + +A single combined diff, containing all the changes, follows. +--- keysafe-0.20170122.orig/keysafe.init ++++ keysafe-0.20170122/keysafe.init +@@ -32,7 +32,7 @@ case "$1" in + start-stop-daemon --start --quiet --oknodo \ + --background --no-close \ + --pidfile "$PIDFILE" --make-pidfile \ +- --chuid keysafe:keysafe \ ++ --chuid _keysafe:_keysafe \ + --exec "$DAEMON" -- --server $DAEMON_PARAMS \ + > /var/log/keysafe.log + log_end_msg $? +--- keysafe-0.20170122.orig/keysafe.service ++++ keysafe-0.20170122/keysafe.service +@@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/keysafe + ExecStart=/usr/bin/keysafe --server $DAEMON_PARAMS + InaccessiblePaths=/home /etc + ReadWritePaths=/var/lib/keysafe +-User=keysafe +-Group=keysafe ++User=_keysafe ++Group=_keysafe + StandardInput=null + StandardOutput=journal + StandardError=journal diff --git a/debian/patches/series b/debian/patches/series index 3df9d74..7bb8252 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -use-_keysafe.patch -bump-deps-to-GHC-8.0.1-LTS-Haskell-7.8.patch +debian-changes diff --git a/debian/patches/use-_keysafe.patch b/debian/patches/use-_keysafe.patch deleted file mode 100644 index 77d9591..0000000 --- a/debian/patches/use-_keysafe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Sean Whitton -Date: Sat, 22 Oct 2016 15:46:03 -0700 -Subject: use _keysafe - -To avoid clashes with any non-system user accounts or groups. - -Forwarded: not-needed ---- - keysafe.init | 2 +- - keysafe.service | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/keysafe.init b/keysafe.init -index 4aa1348..3332309 100644 ---- a/keysafe.init -+++ b/keysafe.init -@@ -32,7 +32,7 @@ case "$1" in - start-stop-daemon --start --quiet --oknodo \ - --background --no-close \ - --pidfile "$PIDFILE" --make-pidfile \ -- --chuid keysafe:keysafe \ -+ --chuid _keysafe:_keysafe \ - --exec "$DAEMON" -- --server $DAEMON_PARAMS \ - > /var/log/keysafe.log - log_end_msg $? -diff --git a/keysafe.service b/keysafe.service -index 24eaad2..1a81058 100644 ---- a/keysafe.service -+++ b/keysafe.service -@@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/keysafe - ExecStart=/usr/bin/keysafe --server $DAEMON_PARAMS - InaccessiblePaths=/home /etc - ReadWritePaths=/var/lib/keysafe --User=keysafe --Group=keysafe -+User=_keysafe -+Group=_keysafe - StandardInput=null - StandardOutput=journal - StandardError=journal -- cgit v1.2.3