tags 752813 + pending
thanks
Dear maintainer,
I've prepared an NMU for rrdtool (versioned as 1.4.8-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards,
dam
diff -u rrdtool-1.4.8/debian/changelog rrdtool-1.4.8/debian/changelog
--- rrdtool-1.4.8/debian/changelog
+++ rrdtool-1.4.8/debian/changelog
@@ -1,3 +1,15 @@
+rrdtool (1.4.8-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix failure to build with perl 5.20 from experimental
+ Closes: #752813
+ + convert librrds-perl.install to executable script using
+ $Config{vendorarch} instead of hardcoding /usr/lib/perl5
+ + bump debhelper build-dependency and compat level to 9, needed for having
+ an executable .install
+
+ -- Damyan Ivanov <d...@debian.org> Mon, 04 Aug 2014 11:16:56 +0000
+
rrdtool (1.4.8-1) unstable; urgency=medium
[ Sebastian Harl ]
diff -u rrdtool-1.4.8/debian/compat rrdtool-1.4.8/debian/compat
--- rrdtool-1.4.8/debian/compat
+++ rrdtool-1.4.8/debian/compat
@@ -1 +1 @@
-5
+9
diff -u rrdtool-1.4.8/debian/control rrdtool-1.4.8/debian/control
--- rrdtool-1.4.8/debian/control
+++ rrdtool-1.4.8/debian/control
@@ -4,7 +4,7 @@
Maintainer: Debian RRDtool Team <rrdt...@ml.snow-crash.org>
Uploaders: Sebastian Harl <tok...@debian.org>, Alexander Wirt <formo...@debian.org>, Bernd Zeimetz <b...@debian.org>
Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, dh-autoreconf, gettext, quilt,
+Build-Depends: debhelper (>= 9), groff, autotools-dev, dh-autoreconf, gettext, quilt,
zlib1g-dev, libpng12-dev, libcairo2-dev, libpango1.0-dev, libfreetype6-dev,
libdbi0-dev,
libxml2-dev,
diff -u rrdtool-1.4.8/debian/librrds-perl.install rrdtool-1.4.8/debian/librrds-perl.install
--- rrdtool-1.4.8/debian/librrds-perl.install
+++ rrdtool-1.4.8/debian/librrds-perl.install
@@ -1,3 +1,8 @@
-usr/lib/perl5/auto/RRDs
-usr/lib/perl5/RRDs.pm
-usr/share/man/man3/RRDs.3pm
+#!/usr/bin/perl
+use Config;
+# omit the leading '/'
+my $vendorarch = substr( $Config{vendorarch}, 1 );
+
+print "$vendorarch/auto/RRDs\n";
+print "$vendorarch/RRDs.pm\n";
+print "usr/share/man/man3/RRDs.3pm\n";
diff -u rrdtool-1.4.8/debian/rules rrdtool-1.4.8/debian/rules
--- rrdtool-1.4.8/debian/rules
+++ rrdtool-1.4.8/debian/rules
@@ -154,6 +154,7 @@
make install DESTDIR=$(CURDIR)/debian/tmp
# we don't want .txt and .pod documentation in the package
rm -rf debian/tmp/usr/share/doc/rrdtool/txt
+ chmod a+x debian/librrds-perl.install
dh_install --sourcedir=$(CURDIR)/debian/tmp -X.la --fail-missing
# remove duplicates
rm debian/rrdtool/usr/bin/rrdcached
