[libtext-header-perl] 01/15: merge changes from -2.1 manually

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libtext-header-perl.

commit 3aef72034aade213b7e5fb6dc3cfaf7cc7975f96
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Sep 28 23:03:49 2015 +0200

    merge changes from -2.1 manually
    
    gbp-import* fail miserably on the native package with non-native version
    
    Gbp-Dch: Ignore
---
 debian/changelog | 9 +++++++++
 debian/rules     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 13998dd..2a28a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,15 @@ libtext-header-perl (1.03-3) UNRELEASED; urgency=medium
 
  -- gregor herrmann <gregoa at debian.org>  Mon, 28 Sep 2015 22:36:54 +0200
 
+libtext-header-perl (1.03-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.22 in experimental (MakeMaker changes)":
+    use DESTDIR in debian/rules.
+    (Closes: #795633)
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 26 Aug 2015 18:27:26 +0200
+
 libtext-header-perl (1.03-2) unstable; urgency=low
 
   * Trivial fix for -w.  (closes: #217791)
diff --git a/debian/rules b/debian/rules
index ba9b0a8..399809e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ install:
 
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) install DESTDIR=`pwd`/debian/tmp
-	$(MAKE) install PREFIX=$(TMP)/usr
+	$(MAKE) install DESTDIR=$(TMP)
 
 
 # Build architecture-independent files here.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtext-header-perl.git