[libjavascript-beautifier-perl] 04/04: Rename js_beautify* after being installed, remove Makefile.PL from remove-pl-extension.patch

[Axel Beckert]

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

abe pushed a commit to branch master
in repository libjavascript-beautifier-perl.

commit 8822ffbd8f8b880a0cb259180f076b7094e7c73f
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Jun 9 00:37:15 2015 +0200

    Rename js_beautify* after being installed, remove Makefile.PL from remove-pl-extension.patch
---
 debian/changelog                         |  3 ++-
 debian/clean                             |  1 -
 debian/patches/remove-pl-extension.patch | 15 +--------------
 debian/rules                             | 13 ++++++-------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3b0de2..128cd8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,13 +28,14 @@ libjavascript-beautifier-perl (0.18-1) unstable; urgency=medium
   * Declare compliance with Debian Policy 3.9.6
   * Switch to source format "3.0 (quilt)"
     + Remove "--with quilt" from dh call and quilt build-dependency.
+    + Rename js_beautify* after being installed instead of in the source.
+    + Remove Makefile.PL from debian/patches/remove-pl-extension.patch.
   * Bump debhelper compatibility to 8
     + Update versioned debhelper build-dependency accordingly.
     + Add explicit build dependency on libmodule-build-perl
   * Add debian/upstream/metadata
   * Import upstream version 0.18
     + Refresh patch.
-  * Add bin/js_beautify to debian/clean.
   * Fix lintian warning copyright-refers-to-symlink-license.
   * Reindent debian/copyright.
   * Fix typo in copyright holder's e-mail address.
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 743f8e5..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-bin/js_beautify
diff --git a/debian/patches/remove-pl-extension.patch b/debian/patches/remove-pl-extension.patch
index 6b07e77..1399bc9 100644
--- a/debian/patches/remove-pl-extension.patch
+++ b/debian/patches/remove-pl-extension.patch
@@ -2,21 +2,8 @@ Description: Remove .pl extension from js_beautify.pl
 Origin: vendor
 Author: Jonathan Yu <frequency at cpan.org>
 Forwarded: not-needed
-Last-Update: 2015-06-08
+Last-Update: 2015-06-09
 
-Index: libjavascript-beautifier-perl/Makefile.PL
-===================================================================
---- libjavascript-beautifier-perl.orig/Makefile.PL	2015-06-08 08:43:15.269054524 +0200
-+++ libjavascript-beautifier-perl/Makefile.PL	2015-06-08 08:43:22.852968578 +0200
-@@ -12,7 +12,7 @@
-                  },
-   'INSTALLDIRS' => 'site',
-   'EXE_FILES' => [
--                   'bin/js_beautify.pl'
-+                   'bin/js_beautify'
-                  ],
-   'PL_FILES' => {}
- )
 Index: libjavascript-beautifier-perl/bin/js_beautify.pl
 ===================================================================
 --- libjavascript-beautifier-perl.orig/bin/js_beautify.pl	2015-06-08 08:43:15.269054524 +0200
diff --git a/debian/rules b/debian/rules
index b6c3abf..27a4c8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
+DIR=debian/$(shell dh_listpackages)/usr
+
 %:
 	dh $@
 
-override_dh_quilt_patch:
-	dh_quilt_patch
-	[ -f bin/js_beautify ] || mv bin/js_beautify.pl bin/js_beautify
-
-override_dh_quilt_unpatch:
-	[ -f bin/js_beautify.pl ] || mv bin/js_beautify bin/js_beautify.pl
-	dh_quilt_unpatch
+override_dh_auto_install:
+	dh_auto_install
+	mv $(DIR)/bin/js_beautify.pl $(DIR)/bin/js_beautify
+	mv $(DIR)/share/man/man1/js_beautify.pl.1p $(DIR)/share/man/man1/js_beautify.1p

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