[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#688287: unblock: stow/2.2.0-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package stow

Since version 2.2.0-2 fixes an important bug that prevents package
installation (missing #! lines in maintainer scripts), I would like
to request allowing stow 2.2.0-2 into testing.


diff -Nru stow-2.2.0/debian/changelog stow-2.2.0/debian/changelog
--- stow-2.2.0/debian/changelog	2012-04-13 22:21:04.000000000 -0700
+++ stow-2.2.0/debian/changelog	2012-09-10 18:45:37.000000000 -0700
@@ -1,3 +1,12 @@
+stow (2.2.0-2) unstable; urgency=low
+
+  * Add shebang lines to maintainer scripts (Closes: #686434).
+  * Include patch by Kalle Olavi Niemitalo <kon@iki.fi> to process
+    command-line arguments beyond '--' (Closes: #681752).
+  * Add 'set -e' to maintainer scripts per Policy section 10.4.
+
+ -- Chuan-kai Lin <cklin@debian.org>  Mon, 10 Sep 2012 18:45:37 -0700
+
 stow (2.2.0-1) unstable; urgency=low
 
   * New upstream version 2.2.0 (closes: #650986).
diff -Nru stow-2.2.0/debian/patches/03_stow_getopt.patch stow-2.2.0/debian/patches/03_stow_getopt.patch
--- stow-2.2.0/debian/patches/03_stow_getopt.patch	1969-12-31 16:00:00.000000000 -0800
+++ stow-2.2.0/debian/patches/03_stow_getopt.patch	2012-09-10 18:23:28.000000000 -0700
@@ -0,0 +1,55 @@
+Author: Kalle Olavi Niemitalo <kon@iki.fi>
+Description: Fix '--' getopt argument processing
+Origin: other, http://bugs.debian.org/681752
+Bug-Debian: http://bugs.debian.org/681752
+Reviewed-By: Chuan-kai Lin <cklin@debian.org>
+Last-Update: 2012-09-10
+
+--- stow-2.2.0.orig/bin/stow.in
++++ stow-2.2.0/bin/stow.in
+@@ -473,6 +473,19 @@ sub process_options {
+     my @pkgs_to_stow   = ();
+     my $action = 'stow';
+ 
++    my $remember_package_action = sub {
++        if ($action eq 'restow') {
++            push @pkgs_to_unstow, $_[0];
++            push @pkgs_to_stow, $_[0];
++        }
++        elsif ($action eq 'unstow') {
++            push @pkgs_to_unstow, $_[0];
++        }
++        else {
++            push @pkgs_to_stow, $_[0];
++        }
++    };
++
+     unshift @ARGV, get_config_file_options();
+     #$,="\n"; print @ARGV,"\n"; # for debugging rc file
+ 
+@@ -510,21 +523,12 @@ sub process_options {
+         'R|restow'  => sub { $action = 'restow' },
+ 
+         # Handler for non-option arguments
+-        '<>' =>
+-        sub {
+-            if ($action eq 'restow') {
+-                push @pkgs_to_unstow, $_[0];
+-                push @pkgs_to_stow, $_[0];
+-            }
+-            elsif ($action eq 'unstow') {
+-                push @pkgs_to_unstow, $_[0];
+-            }
+-            else {
+-                push @pkgs_to_stow, $_[0];
+-            }
+-        },
++        '<>' => $remember_package_action,
+     ) or usage();
+ 
++    # If GetOptions stopped at "--", process any remaining arguments.
++    $remember_package_action->($_) foreach @ARGV;
++
+     usage()   if $options{help};
+     version() if $options{version};
+ 
diff -Nru stow-2.2.0/debian/patches/series stow-2.2.0/debian/patches/series
--- stow-2.2.0/debian/patches/series	2012-04-13 22:21:04.000000000 -0700
+++ stow-2.2.0/debian/patches/series	2012-09-10 18:28:53.000000000 -0700
@@ -1,2 +1,3 @@
 01_gpl2_file_reference.patch
 02_stow_manpage_section_8.patch
+03_stow_getopt.patch
diff -Nru stow-2.2.0/debian/postinst stow-2.2.0/debian/postinst
--- stow-2.2.0/debian/postinst	2012-04-13 22:21:04.000000000 -0700
+++ stow-2.2.0/debian/postinst	2012-09-10 18:42:10.000000000 -0700
@@ -1,3 +1,5 @@
+#!/bin/sh
+set -e
 if [ ! -e /usr/local/stow ]; then
   if mkdir /usr/local/stow 2>/dev/null; then
     if chown root:staff /usr/local/stow; then
diff -Nru stow-2.2.0/debian/prerm stow-2.2.0/debian/prerm
--- stow-2.2.0/debian/prerm	2012-04-13 22:21:04.000000000 -0700
+++ stow-2.2.0/debian/prerm	2012-09-10 18:42:04.000000000 -0700
@@ -1,2 +1,4 @@
+#!/bin/sh
+set -e
 #DEBHELPER#
 rmdir /usr/local/stow 2>/dev/null || true


unblock stow/2.2.0-2

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


Reply to: