summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_elpa17
2 files changed, 20 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 7213eff..ec4c009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-elpa (0.0.12) unstable; urgency=medium
+
+ * Replace use of private function `autoscript_sed' from Dh_Lib
+
+ -- David Bremner <bremner@debian.org> Fri, 25 Sep 2015 08:19:59 -0300
+
dh-elpa (0.0.11) unstable; urgency=medium
* Fix elpa version in generated maintainer scripts (Closes: #799032)
diff --git a/dh_elpa b/dh_elpa
index 3ca503e..b921cb9 100755
--- a/dh_elpa
+++ b/dh_elpa
@@ -76,6 +76,17 @@ sub doit_quietly {
}
+# simplified version of private sub autoscript_sed in Dh_Lib
+sub sed_file {
+ my ($sed, $infile, $outfile) = @_;
+
+ open(IN, $infile) or die "$infile: $!";
+ open(OUT, ">>$outfile") or die "$outfile: $!";
+ while (<IN>) { $sed->(); print OUT }
+ close(OUT) or die "$outfile: $!";
+ close(IN) or die "$infile: $!";
+}
+
sub read_package_desc {
my ($descdir, $package) = @_;
my %desc = ();
@@ -117,9 +128,9 @@ sub maybe_install_helper{
my $elpaversion = $desc->{'ELPA-Version'} or
error "elpa version not found";
- Debian::Debhelper::Dh_Lib::autoscript_sed (sub {s/#ELPAPACKAGE#/$elpapackage/;
- s/#ELPAVERSION#/$elpaversion/; },
- "$templatedir/$piece", $target);
+ sed_file (sub {s/#ELPAPACKAGE#/$elpapackage/;
+ s/#ELPAVERSION#/$elpaversion/; },
+ "$templatedir/$piece", $target);
chmod oct($mode), $target;
}
}