[Python-modules-commits] [python-demjson] 07/08: use dh-exec

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository python-demjson.

commit 6357c46e3aeaa6e6196ae32c7785446e12f2f4e7
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Wed Nov 25 20:22:40 2015 +0900

    use dh-exec
---
 debian/control                  |  5 +++--
 debian/install.python-jsonlint  |  2 --
 debian/install.python3-jsonlint |  2 --
 debian/python-demjson.install   |  3 +++
 debian/python3-demjson.install  |  3 +++
 debian/rules                    | 10 ++++------
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 38a4b77..9030523 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>
 Build-Depends: debhelper (>= 9)
+	, dh-exec
 	, python-all (>= 2.6.6-3)
 	, python3-all
 	, python-setuptools
@@ -24,8 +25,8 @@ Description: encoder, decoder, and lint/validator for JSON in Python
 
 Package: python3-demjson
 Architecture: all
-Depends: python3, ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends: python3, ${python3:Depends}, ${misc:Depends}
+Provides: ${python3:Provides}
 Description: encoder, decoder, and lint/validator for JSON in Python
  demjson is a comprehensive Python language binding to the JSON
  language-independent data encoding standard, which is often used as a
diff --git a/debian/install.python-jsonlint b/debian/install.python-jsonlint
deleted file mode 100755
index 187d4a6..0000000
--- a/debian/install.python-jsonlint
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-jsonlint => /usr/bin/jsonlint-py
diff --git a/debian/install.python3-jsonlint b/debian/install.python3-jsonlint
deleted file mode 100755
index b301a19..0000000
--- a/debian/install.python3-jsonlint
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-jsonlint => /usr/bin/jsonlint-py3
diff --git a/debian/python-demjson.install b/debian/python-demjson.install
new file mode 100755
index 0000000..87dd705
--- /dev/null
+++ b/debian/python-demjson.install
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec --with=install
+/usr/bin/jsonlint => /usr/bin/jsonlint-py
+debian/jsonlint.1 => /usr/share/man/man1/jsonlint-py.1
diff --git a/debian/python3-demjson.install b/debian/python3-demjson.install
new file mode 100755
index 0000000..8debcc6
--- /dev/null
+++ b/debian/python3-demjson.install
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec --with=install
+/usr/bin/jsonlint => /usr/bin/jsonlint-py3
+debian/jsonlint.1 => /usr/share/man/man1/jsonlint-py3.1
diff --git a/debian/rules b/debian/rules
index 9d4f010..998429a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
 
-export PYBUILD_DESTDIR_python2=debian/python-demjson/
-export PYBUILD_DESTDIR_python3=debian/python3-demjson/
+export PYBUILD_NAME=demjson
+export PYBUILD_AFTER_INSTALL=rm -f {destdir}/usr/bin/jsonlint
 
 %:
 	dh  $@ --with python2,python3 --buildsystem=pybuild
 
-override_dh_install:
-	dh_install
-	mv $(CURDIR)/debian/python3-demjson/usr/bin/jsonlint \
-		$(CURDIR)/debian/python3-demjson/usr/bin/jsonlint3 
+#override_dh_install:
+#	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-demjson.git