Bug#770691: unblock: init-system-helpers/1.22

[Niko Tyni]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock
X-Debbugs-Cc: init-system-helpers at packages.debian.org

(Filing this as requested by init-system-helpers maintainer
 Michael Stapelberg.)

Please unblock init-system-helpers_1.22. It removes the problematic
perl dependency (growing the base system and, until recently, even
the essential set) now that perl_5.20.1-3 has acquired the required
new modules.

Changes:
 init-system-helpers (1.22) unstable; urgency=medium
 .
   * Depend on perl-base instead of perl (Closes: #757891)

Full debdiff attached.

Thanks for your work,
-- 
Niko Tyni   ntyni at debian.org
-------------- next part --------------
diff -Nru init-system-helpers-1.21/debian/changelog init-system-helpers-1.22/debian/changelog
--- init-system-helpers-1.21/debian/changelog	2014-08-21 08:40:58.000000000 +0300
+++ init-system-helpers-1.22/debian/changelog	2014-11-17 21:48:01.000000000 +0200
@@ -1,3 +1,9 @@
+init-system-helpers (1.22) unstable; urgency=medium
+
+  * Depend on perl-base instead of perl (Closes: #757891)
+
+ -- Michael Stapelberg <stapelberg at debian.org>  Mon, 17 Nov 2014 20:47:58 +0100
+
 init-system-helpers (1.21) unstable; urgency=medium
 
   * Demote augeas-tools to Suggests and let the systemd2init tool error out
diff -Nru init-system-helpers-1.21/debian/control init-system-helpers-1.22/debian/control
--- init-system-helpers-1.21/debian/control	2014-08-21 08:40:58.000000000 +0300
+++ init-system-helpers-1.22/debian/control	2014-11-18 19:56:41.000000000 +0200
@@ -13,7 +13,7 @@
 Package: init-system-helpers
 Architecture: all
 Multi-Arch: foreign
-Depends: ${perl:Depends}, ${misc:Depends}
+Depends: perl-base (>= 5.20.1-3), ${perl:Depends}, ${misc:Depends}
 Breaks: systemd (<< 44-12)
 Description: helper tools for all init systems
  This package contains helper tools that are necessary for switching between
diff -Nru init-system-helpers-1.21/debian/rules init-system-helpers-1.22/debian/rules
--- init-system-helpers-1.21/debian/rules	2014-08-21 08:40:58.000000000 +0300
+++ init-system-helpers-1.22/debian/rules	2014-11-18 19:56:32.000000000 +0200
@@ -9,6 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+override_dh_perl:
+	dh_perl -d --package=init-system-helpers
+	dh_perl --no-package=init-system-helpers
+
 override_dh_auto_build:
 	dh_auto_build
 	for file in $$(ls script); do \
diff -Nru init-system-helpers-1.21/script/deb-systemd-helper init-system-helpers-1.22/script/deb-systemd-helper
--- init-system-helpers-1.21/script/deb-systemd-helper	2014-08-21 08:40:58.000000000 +0300
+++ init-system-helpers-1.22/script/deb-systemd-helper	2014-11-17 23:59:23.000000000 +0200
@@ -84,11 +84,12 @@
 use warnings;
 use File::Path qw(make_path); # in core since Perl 5.001
 use File::Basename; # in core since Perl 5
-use File::Find; # in core since Perl 5
 use File::Temp qw(tempfile); # in core since Perl 5.6.1
 use Text::ParseWords qw(shellwords); # in core since Perl 5
 use Getopt::Long; # in core since Perl 5
-use Data::Dumper;
+# Make Data::Dumper::Dumper available if present (not present on systems that
+# only have perl-base, not perl).
+eval { require Data::Dumper; } or *Data::Dumper::Dumper = sub { "no Data::Dumper" };
 
 my $quiet = 0;
 my $enabled_state_dir = '/var/lib/systemd/deb-systemd-helper-enabled';
@@ -260,7 +261,7 @@
     my @links = get_link_closure($scriptname, $service_path);
 
     debug "Old state file contents: " .
-        Dumper([ state_file_entries($dsh_state) ]);
+        Data::Dumper::Dumper([ state_file_entries($dsh_state) ]);
 
     make_path(dirname($dsh_state));
     my ($outfh, $tmpname) = tempfile('.stateXXXXX',
@@ -278,14 +279,14 @@
         error("Unable to move $tmpname to $dsh_state");
 
     debug "New state file contents: " .
-        Dumper([ state_file_entries($dsh_state) ]);
+        Data::Dumper::Dumper([ state_file_entries($dsh_state) ]);
 }
 
 sub was_enabled {
     my ($scriptname) = @_;
 
     my @entries = state_file_entries(dsh_state_path($scriptname));
-    debug "Contents: " . Dumper(\@entries);
+    debug "Contents: " . Data::Dumper::Dumper(\@entries);
 
     for my $link (@entries) {
         if (! -l $link) {
@@ -308,7 +309,7 @@
 
     my $dsh_state = dsh_state_path($service_path);
     my @entries = state_file_entries($dsh_state);
-    debug "Contents: " . Dumper(\@entries);
+    debug "Contents: " . Data::Dumper::Dumper(\@entries);
 
     if (is_purge()) {
         unlink($dsh_state) if -e $dsh_state;