[libxml-validate-perl] 05/09: Replace patches with overrides in debian/rules.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libxml-validate-perl.

commit bc441c9dba59aa21cd87a120231d6bafe7f530e0
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Aug 8 19:33:03 2017 -0400

    Replace patches with overrides in debian/rules.
---
 debian/control                        |  3 ++-
 debian/patches/makeFileOverride.patch | 13 -------------
 debian/patches/manifestOverride.patch | 15 ---------------
 debian/patches/perlPath.patch         | 10 ----------
 debian/patches/series                 |  3 ---
 debian/rules                          | 14 +++++++-------
 6 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/debian/control b/debian/control
index 4baa0da..8e7bf2c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends-Indep: perl,
                      libtest-pod-coverage-perl,
                      libtest-pod-perl,
                      libtest-assertions-perl,
-                     liblog-trace-perl
+                     liblog-trace-perl,
+                     rename
 Standards-Version: 4.0.1
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libxml-validate-perl.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libxml-validate-perl.git
diff --git a/debian/patches/makeFileOverride.patch b/debian/patches/makeFileOverride.patch
deleted file mode 100644
index ca13ac0..0000000
--- a/debian/patches/makeFileOverride.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Jotam Jr. Trejo <jotamjr at debian.org.sv>
-Description: Change the name of the script validxml.pl to validxml, because in build time we rename it as such
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -3,7 +3,7 @@
- WriteMakefile(
-               NAME          => 'XML::Validate',
-               VERSION_FROM  => 'lib/XML/Validate.pm',
--              EXE_FILES     => ['scripts/validxml.pl'],
-+              EXE_FILES     => ['scripts/validxml'],
-               PREREQ_PM => {
- 								'Test::More' => 0,
-               					'Test::Assertions' => 0,
diff --git a/debian/patches/manifestOverride.patch b/debian/patches/manifestOverride.patch
deleted file mode 100644
index 1a78fee..0000000
--- a/debian/patches/manifestOverride.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Jotam Jr. Trejo <jotamjr at debian.org.sv>
-Description: Changes the file validxml.pl to validxml in MANIFEST this because 
-at build time we rename the file due to the policy of not allow extensions of
-scripts like .pl.
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -9,7 +9,7 @@
- lib/XML/Validate/LibXML.pm
- lib/XML/Validate/MSXML.pm
- lib/XML/Validate/Xerces.pm
--scripts/validxml.pl
-+scripts/validxml
- t/Validate.t
- t/MSXML.t
- t/Xerces.t
diff --git a/debian/patches/perlPath.patch b/debian/patches/perlPath.patch
deleted file mode 100644
index de30553..0000000
--- a/debian/patches/perlPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Author: Jotam Jr. Trejo <jotamjr at debian.org.sv>
-Description: Changes the path of perl from /usr/local/bin/perl to /usr/bin/perl 
---- a/scripts/validxml.pl
-+++ b/scripts/validxml.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- 
- use strict;
- use XML::Validate qw();
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2b4d685..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-perlPath.patch
-manifestOverride.patch
-makeFileOverride.patch
diff --git a/debian/rules b/debian/rules
index 8328f71..42fe0e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
 %:
 	dh $@
 
-override_dh_auto_configure:
-	mv $(CURDIR)/scripts/validxml.pl $(CURDIR)/scripts/validxml
-	dh_auto_configure
-
-override_dh_clean:
-	if [ -f $(CURDIR)/scripts/validxml ]; then mv $(CURDIR)/scripts/validxml $(CURDIR)/scripts/validxml.pl; fi
-	dh_clean
+override_dh_auto_install:
+	dh_auto_install
+	file-rename 's/\.pl//' $(TMP)/usr/bin/* $(TMP)/usr/share/man/man1/*1p*
+	sed -i '1s|^#!/usr/local/bin/perl|#!/usr/bin/perl|' $(TMP)/usr/bin/*

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