[Reproducible-builds] [dh-python] 30/183: move scripts to /usr/share, do not install /usr/bin/dh_python2 and its autoscript

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 1bf2ad442a759d7eaaf385de9a6da11b4a1a595c
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Tue Jul 2 21:42:49 2013 +0200

    move scripts to /usr/share, do not install /usr/bin/dh_python2 and its autoscript
    
    dh_python2 from python-defaults package will ship a shell script that
    will choose the right dh_python2 - the one from dh-python package if
    dh-python is in Build-Depends or the one from python package
---
 Makefile        | 12 ++++++------
 debian/control  |  3 ---
 debian/links    |  4 ++++
 debian/manpages |  2 +-
 debian/rules    |  5 +++++
 dh_python2      |  1 -
 dh_python3      |  1 -
 pybuild         |  6 +-----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9ae5d0b..849cf14 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@ install:
 		$(DESTDIR)$(PREFIX)/share/dh-python/dhpython/build
 	$(INSTALL) -m 644 dhpython/*.py $(DESTDIR)$(PREFIX)/share/dh-python/dhpython/
 	$(INSTALL) -m 644 dhpython/build/*.py $(DESTDIR)$(PREFIX)/share/dh-python/dhpython/build/
-	$(INSTALL) -m 755 pybuild $(DESTDIR)$(PREFIX)/bin/
+	$(INSTALL) -m 755 pybuild $(DESTDIR)$(PREFIX)/share/dh-python/
 	$(INSTALL) -m 755 dh_pypy $(DESTDIR)$(PREFIX)/share/dh-python/
-	$(INSTALL) -m 755 dh_python2 $(DESTDIR)$(PREFIX)/bin/
-	$(INSTALL) -m 755 dh_python3 $(DESTDIR)$(PREFIX)/bin/
-	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/bin/pybuild
+	$(INSTALL) -m 755 dh_python2 $(DESTDIR)$(PREFIX)/share/dh-python/
+	$(INSTALL) -m 755 dh_python3 $(DESTDIR)$(PREFIX)/share/dh-python/
+	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/share/dh-python/pybuild
 	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/share/dh-python/dh_pypy
-	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/bin/dh_python2
-	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/bin/dh_python3
+	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/share/dh-python/dh_python2
+	sed -i -e 's/DEVELV/$(DVERSION)/' $(DESTDIR)$(PREFIX)/share/dh-python/dh_python3
 	
 	$(INSTALL) -m 644 dh/pybuild.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Buildsystem/
 	$(INSTALL) -m 644 dh/pypy.pm $(DESTDIR)$(PREFIX)/share/perl5/Debian/Debhelper/Sequence/
diff --git a/debian/control b/debian/control
index 4623af4..d10e863 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,8 @@ Package: dh-python
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
 Breaks:
-# due to /usr/bin/dh_python2 and debhelper files
- python (<< 2.7.5-3~),
 # due to /usr/bin/dh_python3 and debhelper files
  python3 (<< 3.3.0-4~)
-Replaces: python (<< 2.7.5-3~), python3 (<< 3.3.0-4~)
 Description: Debian helper tools for packaging Python libraries and applications
  This package contains:
   * pybuild - invokes various build systems for requested Python versions in
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..e82c141
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,4 @@
+/usr/share/dh-python/pybuild		/usr/bin/pybuild
+/usr/share/dh-python/dh_pypy		/usr/bin/dh_pypy
+#/usr/share/dh-python/dh_python2	/usr/bin/dh_python2
+/usr/share/dh-python/dh_python3		/usr/bin/dh_python3
diff --git a/debian/manpages b/debian/manpages
index 820706e..17ac958 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,4 +1,4 @@
 pybuild.1
-dh_python2.1
 dh_pypy.1
+#dh_python2.1
 dh_python3.1
diff --git a/debian/rules b/debian/rules
index 0bc0ab1..be9c1ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,9 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	DESTDIR=debian/dh-python PREFIX=/usr make install manpages
+	# disable dh_python2 for now (shipped in python-defaults)
+	rm debian/dh-python/usr/share/debhelper/autoscripts/postinst-pycompile
+	rm debian/dh-python/usr/share/debhelper/autoscripts/prerm-pyclean
+	rm debian/dh-python/usr/share/perl5/Debian/Debhelper/Sequence/python2.pm
+	# generate maintainer scripts, etc.
 	./dh_python3
diff --git a/dh_python2 b/dh_python2
index 664b199..41dd2e0 100755
--- a/dh_python2
+++ b/dh_python2
@@ -29,7 +29,6 @@ from filecmp import dircmp, cmpfiles, cmp as fcmp
 from optparse import OptionParser, SUPPRESS_HELP
 from os.path import isabs, isdir, islink, exists, join, normpath, realpath
 from shutil import copy as fcopy
-sys.path.insert(1, '/usr/share/dh-python/')
 from dhpython.debhelper import DebHelper
 from dhpython.depends import Dependencies
 from dhpython.interpreter import Interpreter
diff --git a/dh_python3 b/dh_python3
index 3a06b2c..514c637 100755
--- a/dh_python3
+++ b/dh_python3
@@ -28,7 +28,6 @@ import sys
 from optparse import OptionParser, SUPPRESS_HELP
 from os.path import exists, join
 from shutil import copy as fcopy
-sys.path.insert(1, '/usr/share/dh-python/')
 from dhpython.debhelper import DebHelper
 from dhpython.depends import Dependencies
 from dhpython.interpreter import Interpreter, EXTFILE_RE
diff --git a/pybuild b/pybuild
index e6d73bf..e7b3617 100755
--- a/pybuild
+++ b/pybuild
@@ -33,11 +33,7 @@ log = logging.getLogger('dhpython')
 
 def main(cfg):
     log.debug('cfg: %s', cfg)
-    try:
-        from dhpython import build
-    except ImportError:
-        sys.path.append('/usr/share/dh-python/')
-        from dhpython import build  # NOQA
+    from dhpython import build
     from dhpython.version import Version, get_requested_versions
     from dhpython.tools import execute, move_matching_files
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git