Control: tags -1 pending
Attached is the NMU diff for the just uploaded libhdate 1.6-2.1,
produced by 'git diff'.
Note that debian/libhdate-perl.dirs and debian/libhdate-perl.install are
made executable, which may not be honoured by the 'patch' program when
applying the patch.
Cheers,
dam
diff --git a/debian/changelog b/debian/changelog
index 785cb63..dd174b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libhdate (1.6-2.1) unstable; urgency=medium
+
+ [ Damyan Ivanov ]
+ * Non-maintainer upload with maintainer's permission
+
+ [ gregor herrmann ]
+ * Fix "hardcodes /usr/lib/perl5"
+ - use $Config{vendorarch} in debian/rules and debian/libhdate-perl.*
+ - make the latter two executable
+ (Closes: #752348)
+
+ -- Damyan Ivanov <[email protected]> Tue, 29 Jul 2014 06:38:35 +0000
+
libhdate (1.6-2) unstable; urgency=low
* Patch fix_3: fix an endless loop with hcal -3 (Closes: #692039).
diff --git a/debian/libhdate-perl.dirs b/debian/libhdate-perl.dirs
old mode 100644
new mode 100755
index 92105be..105d79d
--- a/debian/libhdate-perl.dirs
+++ b/debian/libhdate-perl.dirs
@@ -1 +1,3 @@
-usr/lib/perl5
+#!/usr/bin/perl -w
+use Config;
+print substr($Config{vendorarch}, 1) . "\n";
diff --git a/debian/libhdate-perl.install b/debian/libhdate-perl.install
old mode 100644
new mode 100755
index c1a78d7..105d79d
--- a/debian/libhdate-perl.install
+++ b/debian/libhdate-perl.install
@@ -1 +1,3 @@
-usr/lib/perl5/*
+#!/usr/bin/perl -w
+use Config;
+print substr($Config{vendorarch}, 1) . "\n";
diff --git a/debian/rules b/debian/rules
index 9900396..7593636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
#!/usr/bin/make -f
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
%:
dh $* --with python2,autotools_dev
override_dh_auto_configure:
- dh_auto_configure -- --with-perl-sitelib-dir=/usr/lib/perl5
+ dh_auto_configure -- --with-perl-sitelib-dir=$(ARCHLIB)
override_dh_python2:
dh_python2 -s --no-guessing-versions
