[kup] 11/18: Note the new upstream version in the changelog, and refresh patch

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kup.

commit e55e97467275b73118d5e88057907f65c4b2822f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Apr 9 02:06:30 2017 +0100

    Note the new upstream version in the changelog, and refresh patch
---
 debian/changelog                  |  9 ++++++++
 debian/patches/debian-paths.patch | 43 +++++++++++++++++++++++----------------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bd239c..3830b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kup (0.3.6-1) UNRELEASED; urgency=medium
+
+  * New upstream version, including changes needed to work with kernel.org in
+    future (Closes: #859143):
+    - Add support for subcmd config option
+    - Make sure we use sanitized KUP_SUBCMD
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 09 Apr 2017 02:04:20 +0100
+
 kup (0.3.4-2) unstable; urgency=medium
 
   * debian/control: Change Vcs-Git, Vcs-Browser and Homepage to canonical
diff --git a/debian/patches/debian-paths.patch b/debian/patches/debian-paths.patch
index 1605ad0..ebe02b6 100644
--- a/debian/patches/debian-paths.patch
+++ b/debian/patches/debian-paths.patch
@@ -9,7 +9,8 @@ Description: Change kup-server default configuration to follow Debian convention
  installs kup-server on a system with unprivileged accounts already
  enabled.
  .
- bzip2 is installed under /bin.
+ bzip2 is installed under /bin but pigz and xz are installed under
+ /usr/bin.
 
 --- a/kup-server.cfg
 +++ b/kup-server.cfg
@@ -37,13 +38,19 @@ Description: Change kup-server default configuration to follow Debian convention
  ;
  ; A directory containing a GnuPG public keyring for each user, named
  ; <user>.gpg and readable (but not writable) by that user.
-@@ -61,5 +61,5 @@ use = gz, bz2, xz
- ; "-9" as commandline parameter for compression and "-cd" for decompression
- ; to stdout.
- gz  = /bin/gzip
--bz2 = /usr/bin/bzip2
-+bz2 = /bin/bzip2
- xz  = /usr/bin/xz
+@@ -60,9 +60,9 @@ use = gz, xz
+ ; Specify which commands should be used for compression and decompression of
+ ; each archival format. Make sure the decompression command outputs to stdout.
+ [gz]
+-compress_command = /bin/pigz -9
++compress_command = /usr/bin/pigz -9
+ decompress_command = /bin/gzip -cd
+ 
+ [xz]
+-compress_command = /bin/xz -9 -T0
+-decompress_command = /bin/xz -cd
++compress_command = /usr/bin/xz -9 -T0
++decompress_command = /usr/bin/xz -cd
 --- a/kup-server.1
 +++ b/kup-server.1
 @@ -41,16 +41,16 @@ into one directory.
@@ -68,12 +75,14 @@ Description: Change kup-server default configuration to follow Debian convention
  .RS
 --- a/kup-server
 +++ b/kup-server
-@@ -146,7 +146,7 @@ if (defined($cfg->param('compressors.use
- } else {
- 	%zformats = (
- 		'.gz'  => '/bin/gzip',
--		'.bz2' => '/usr/bin/bzip2',
-+		'.bz2' => '/bin/bzip2',
- 		'.xz'  => '/usr/bin/xz'
- 	);
- }
+@@ -164,8 +164,8 @@ if (defined($cfg->param('compressors.use
+ 			'decompress' => '/bin/gzip -cd',
+ 		},
+ 		'.bz2' => {
+-			'compress'   => '/usr/bin/bzip2 -9',
+-			'decompress' => '/usr/bin/bzip2 -cd',
++			'compress'   => '/bin/bzip2 -9',
++			'decompress' => '/bin/bzip2 -cd',
+ 		},
+ 		'.xz'  => {
+ 			'compress' => '/usr/bin/xz -9',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kup.git