Package: pwgen Version: 2.07-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for pwgen (versioned as 2.07-1.1), and uploaded it to DELAYED/7. This was primarily to fix this missing multiarch metadata issue, but I've also included the other two pending bugs with patches as they looked uncontroversial. Please feel free to tell me if I should delay it longer. (I see I actually accidentally left backup copies of the patches in the upload, which is untidy but harmless - I've taken them out of the diff so it's not got pointless clutter in. Didn't seem worth re-doing the upload as they are tiny, but I can if it offends you) Cheers Wookey -- Principal hats: Linaro, Debian, Wookware, ARM http://wookware.org/
diff -Nru pwgen-2.07/debian/changelog pwgen-2.07/debian/changelog
--- pwgen-2.07/debian/changelog 2014-10-28 03:31:07.000000000 +0000
+++ pwgen-2.07/debian/changelog 2015-10-22 22:32:04.000000000 +0100
@@ -1,3 +1,12 @@
+pwgen (2.07-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add multiarch metadata (Closes: #693964)
+ * Fix manpage typo (Closes: #579178)
+ * Stop -s from overwriting other flags (Closes: 436912)
+
+ -- Wookey <woo...@debian.org> Thu, 22 Oct 2015 22:14:04 +0100
+
pwgen (2.07-1) unstable; urgency=high
* New upstream version
diff -Nru pwgen-2.07/debian/control pwgen-2.07/debian/control
--- pwgen-2.07/debian/control 2014-10-28 03:11:30.000000000 +0000
+++ pwgen-2.07/debian/control 2015-10-22 22:30:47.000000000 +0100
@@ -7,6 +7,7 @@
Package: pwgen
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Automatic Password generation
pwgen generates random, meaningless but pronounceable passwords.
@@ -17,6 +18,7 @@
Package: pwgen-udeb
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
Section: debian-installer
XC-Package-Type: udeb
diff -Nru pwgen-2.07/debian/patches/bug-436912-fix.patch pwgen-2.07/debian/patches/bug-436912-fix.patch
--- pwgen-2.07/debian/patches/bug-436912-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ pwgen-2.07/debian/patches/bug-436912-fix.patch 2015-10-22 22:41:01.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Stop -s flag overwriting others
+ Specifying -s overwrites other flags without this fix
+ (i.e. -s -y not the same as -y -s)
+Author: Andreas Sundstrom <sun...@zappa.cx>
+Bug-Debian: https://bugs.debian.org/436912
+
+--- pwgen-2.07.orig/pwgen.c
++++ pwgen-2.07/pwgen.c
+@@ -137,7 +137,7 @@ int main(int argc, char **argv)
+ break;
+ case 's':
+ pwgen = pw_rand;
+- pwgen_flags = PW_DIGITS | PW_UPPERS;
++ pwgen_flags |= PW_DIGITS | PW_UPPERS;
+ break;
+ case 'C':
+ do_columns = 1;
diff -Nru pwgen-2.07/debian/patches/bug-579178-fix.patch pwgen-2.07/debian/patches/bug-579178-fix.patch
--- pwgen-2.07/debian/patches/bug-579178-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ pwgen-2.07/debian/patches/bug-579178-fix.patch 2015-10-22 22:40:36.000000000 +0100
@@ -0,0 +1,21 @@
+Description: Fix manpage error and update version/date
+Author: Lars Wirzenius <l...@catalyst.net.nz>
+Bug-Debian: https://bugs.debian.org/579178
+
+--- pwgen-2.07.orig/pwgen.1
++++ pwgen-2.07/pwgen.1
+@@ -1,4 +1,4 @@
+-.TH PWGEN 1 "January 2006" "pwgen version 2.05"
++.TH PWGEN 1 "October 2014" "pwgen version 2.07"
+ .SH NAME
+ pwgen \- generate pronounceable passwords
+ .SH SYNOPSIS
+@@ -78,7 +78,7 @@ standard output is a tty device.
+ Generate
+ .I num
+ passwords. This defaults to a screenful if passwords are
+-printed by columns, and one password.
++printed by columns, and one password otherwise.
+ .TP
+ .B \-n, --numerals
+ Include at least one number in the password. This is the default
diff -Nru pwgen-2.07/debian/patches/series pwgen-2.07/debian/patches/series
--- pwgen-2.07/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pwgen-2.07/debian/patches/series 2015-10-22 22:38:20.000000000 +0100
@@ -0,0 +1,2 @@
+bug-436912-fix.patch
+bug-579178-fix.patch
signature.asc
Description: Digital signature
