[libterm-readline-zoid-perl] 02/03: Import Debian changes 0.07-2

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libterm-readline-zoid-perl.

commit d0587d3bed5e2c84a49aca5fae9f2dc5adc72055
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date:   Sun Aug 7 12:20:10 2005 +0200

    Import Debian changes 0.07-2
    
    libterm-readline-zoid-perl (0.07-2) unstable; urgency=low
    
      * debian/{control,rules,patches}: dpatchified.
      * debian/patches/10_return_feature_hash_instead_of_list.dpatch:
        Added to fix a wrong return value (expected a hash ref, got a list).
        Report and patch from Roderick Schertler <roderick at ibcinc.com>, thanks.
        (Closes: #292215)
      * Bumped Standards-Version. No changes needed. Yay.
---
 debian/changelog                                    | 11 +++++++++++
 debian/control                                      |  4 ++--
 debian/patches/00list                               |  1 +
 .../10_return_feature_hash_instead_of_list.dpatch   | 21 +++++++++++++++++++++
 debian/rules                                        | 15 ++++++++-------
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0021ae..e78c37c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libterm-readline-zoid-perl (0.07-2) unstable; urgency=low
+
+  * debian/{control,rules,patches}: dpatchified.
+  * debian/patches/10_return_feature_hash_instead_of_list.dpatch:
+    Added to fix a wrong return value (expected a hash ref, got a list).
+    Report and patch from Roderick Schertler <roderick at ibcinc.com>, thanks.
+    (Closes: #292215)
+  * Bumped Standards-Version. No changes needed. Yay.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Sun,  7 Aug 2005 12:20:10 +0200
+
 libterm-readline-zoid-perl (0.07-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6657433..f37ad71 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: libterm-readline-zoid-perl
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 4.0.2)
-Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libterm-readkey-perl
+Build-Depends-Indep: perl (>= 5.8.0-7), libmodule-build-perl, libterm-readkey-perl, dpatch
 Maintainer: Marc 'HE' Brockschmidt <he at debian.org>
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: libterm-readline-zoid-perl
 Architecture: all
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..f19ef40
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+10_return_feature_hash_instead_of_list.dpatch
diff --git a/debian/patches/10_return_feature_hash_instead_of_list.dpatch b/debian/patches/10_return_feature_hash_instead_of_list.dpatch
new file mode 100644
index 0000000..cbcfc7b
--- /dev/null
+++ b/debian/patches/10_return_feature_hash_instead_of_list.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_return_feature_hash_instead_of_list.dpatch by Roderick Schertler <roderick at ibcinc.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add a "retur"n to ensure that a hash ref is returned, not a list
+## DP: {} alone is a block, so the return value is a list of values from this block
+
+ at DPATCH@
+
+diff -Nwru Term-ReadLine-Zoid-0.07/lib/Term/ReadLine/Zoid.pm Term-ReadLine-Zoid-0.07.new/lib/Term/ReadLine/Zoid.pm
+--- Term-ReadLine-Zoid-0.07/lib/Term/ReadLine/Zoid.pm	2005-04-30 19:22:26.000000000 +0200
++++ Term-ReadLine-Zoid-0.07.new/lib/Term/ReadLine/Zoid.pm	2005-08-07 12:16:34.000000000 +0200
+@@ -202,7 +202,7 @@
+ 
+ sub Attribs { $_[0]{config} }
+ 
+-sub Features { {
++sub Features { return {
+ 	( map {($_ => 1)} qw/appname minline attribs 
+ 		addhistory addHistory getHistory getHistory TermSize/ ),
+ 	( map {($_ => $_[0]{config}{$_})}
diff --git a/debian/rules b/debian/rules
index 73627a1..7bdb3b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
@@ -9,12 +12,9 @@ ifndef PERL
 PERL = /usr/bin/perl
 endif
 
-ifndef DESTDIR
-DESTDIR=..
-endif
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 	
@@ -24,7 +24,8 @@ build-stamp:
 
 	touch build-stamp
 
-clean:
+clean: unpatch clean-unpatched
+clean-unpatched:
 	dh_testdir
 	dh_testroot
 
@@ -64,10 +65,10 @@ binary-indep: build install
 	dh_perl 
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb --destdir=$(DESTDIR)
+	dh_builddeb
 
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build build-stamp clean clean-unpatched binary-indep binary-arch binary

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libterm-readline-zoid-perl.git