[libtemplate-stash-autoescaping-perl] 01/05: Fix shebang from d/rules instead of a patch

Julian Maurice jajm-guest at moszumanska.debian.org
Thu Feb 4 19:21:46 UTC 2016


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

jajm-guest pushed a commit to branch master
in repository libtemplate-stash-autoescaping-perl.

commit 90de0988071cf6c575f91f6e1794351ffd668091
Author: Julian Maurice <jajm at jajm.org>
Date:   Thu Feb 4 19:20:35 2016 +0100

    Fix shebang from d/rules instead of a patch
---
 debian/changelog                                   |  4 ----
 .../0001-example-wrong-path-for-interpreter.patch  | 25 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  7 ++++++
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7e383f..c36fb71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,6 @@
 libtemplate-stash-autoescaping-perl (0.0303-1) UNRELEASED; urgency=low
 
   TODO:
-  - debian/patches/0001-example-wrong-path-for-interpreter.patch needs DEP3
-    headers; alternatively it's easier in the long term to fix the hashbang
-    from debian/rules instead of carrying a patch; cf.
-    https://pkg-perl.alioth.debian.org/debhelper.html#fixing_interpreter_shebang_lines
   - d/copyright: we have a problem with the copyright holder for "Files. *".
     first of all, there is no mention of any copyright holder anywhere.
     second, Shlomi Fish explcitly disclaims any rights. What I would do is:
diff --git a/debian/patches/0001-example-wrong-path-for-interpreter.patch b/debian/patches/0001-example-wrong-path-for-interpreter.patch
deleted file mode 100644
index a30a706..0000000
--- a/debian/patches/0001-example-wrong-path-for-interpreter.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix Perl interpreter path in example scripts to satisfy lintian
---- a/samples/detect_xss.pl
-+++ b/samples/detect_xss.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- use strict;
- use lib qw(../lib);
---- a/samples/html_escape.pl
-+++ b/samples/html_escape.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- use strict;
- use Template;
---- a/samples/your_code.pl
-+++ b/samples/your_code.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- use strict;
- use lib qw(../lib);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a261512..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-example-wrong-path-for-interpreter.patch
diff --git a/debian/rules b/debian/rules
index 2d33f6a..1749286 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
 
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 %:
 	dh $@
+
+override_dh_installexamples:
+	dh_installexamples
+	sed -i '1s|^#!/usr/local/bin/perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtemplate-stash-autoescaping-perl.git



More information about the Pkg-perl-cvs-commits mailing list