[Python-apps-commits] r10975 - in packages/mercurial/trunk/debian (changelog rules)

[vicho at users.alioth.debian.org]

    Date: Tuesday, June 17, 2014 @ 22:19:46
  Author: vicho
Revision: 10975

revert r10971 (Fix "odd problem with /usr/bin/hg hash bang when backporting to wheezy" by applying a patch by Max Bowsher (Closes: #750871))

It is the wrong fix.  Calling distutils directly is a recipe for disaster.  #750871 is a bug about backporting to wheezy and it should be fixed in the backport.  The build of the package should be fixed, but not this way.

Modified:
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2014-06-17 22:14:31 UTC (rev 10974)
+++ packages/mercurial/trunk/debian/changelog	2014-06-17 22:19:46 UTC (rev 10975)
@@ -2,8 +2,6 @@
 
   * New upstream release (Closes: #750444)
   * Update breaks of hgview to hgview-common << 1.8.1 (Thanks Julien Cristau)
-  * Fix "odd problem with /usr/bin/hg hash bang when backporting to
-    wheezy" by applying a patch by Max Bowsher (Closes: #750871)
 
  -- Javi Merino <vicho at debian.org>  Tue, 17 Jun 2014 22:55:05 +0100
 

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2014-06-17 22:14:31 UTC (rev 10974)
+++ packages/mercurial/trunk/debian/rules	2014-06-17 22:19:46 UTC (rev 10975)
@@ -5,30 +5,17 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2,bash-completion --buildsystem python_distutils
+	dh $@ --with python2,bash-completion
 
+PYVERS=$(shell pyversions -vs)
 PYVER_DEFAULT=$(shell pyversions -vd)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-# This package uses both distutils and Makefile elements in its buildsystem.
-# We configure debhelper to use the python_distutils buildsystem plugin, so
-# that appropriate Debian-specific invocations of setup.py are used, and then
-# call the extra needed Makefile targets from override_dh_auto_* targets.
-
 override_dh_auto_build:
-	dh_auto_build
-	$(MAKE) doc
+	$(MAKE) all
 	# Do not start a line with a word with a dot in a manpage
 	sed -i -e 's,^[.]\(hgignore\|hg/hgrc\),\\fP\1,' doc/hg.1
 
-override_dh_auto_install:
-	dh_auto_install
-	$(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp
-
-override_dh_auto_clean:
-	dh_auto_clean
-	$(MAKE) clean
-
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
          NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
          PARALLEL_TEST_JOBS := --jobs $(NJOBS)
@@ -57,6 +44,11 @@
 	rename.ul .deb-backup '' $(CURDIR)/tests/*
 endif
 
+override_dh_auto_install: $(PYVERS:%=install-python%)
+
+install-python%:
+	python$* setup.py install --root $(CURDIR)/debian/tmp --install-layout=deb
+
 override_dh_install:
 	dh_install
 	if test -d $(CURDIR)/debian/mercurial ; then \