[Python-apps-commits] r11919 - in packages/hg-git/trunk/debian (4 files)

[vicho at users.alioth.debian.org]

    Date: Friday, May 8, 2015 @ 12:35:57
  Author: vicho
Revision: 11919

Upgrade debhelper compat to 9

Modified:
  packages/hg-git/trunk/debian/changelog
  packages/hg-git/trunk/debian/compat
  packages/hg-git/trunk/debian/control
  packages/hg-git/trunk/debian/rules

Modified: packages/hg-git/trunk/debian/changelog
===================================================================
--- packages/hg-git/trunk/debian/changelog	2015-05-08 11:45:03 UTC (rev 11918)
+++ packages/hg-git/trunk/debian/changelog	2015-05-08 12:35:57 UTC (rev 11919)
@@ -4,6 +4,7 @@
   * New maintainer (Closes: #780425)
   * Bump standards-version to 3.9.6 (no change needed)
   * Update python-dulwich dependency to 0.9.7 as upstream suggests
+  * Upgrade debhelper compat to 9
 
  -- Javi Merino <vicho at debian.org>  Sat, 02 May 2015 19:38:57 +0100
 

Modified: packages/hg-git/trunk/debian/compat
===================================================================
--- packages/hg-git/trunk/debian/compat	2015-05-08 11:45:03 UTC (rev 11918)
+++ packages/hg-git/trunk/debian/compat	2015-05-08 12:35:57 UTC (rev 11919)
@@ -1 +1 @@
-7
+9

Modified: packages/hg-git/trunk/debian/control
===================================================================
--- packages/hg-git/trunk/debian/control	2015-05-08 11:45:03 UTC (rev 11918)
+++ packages/hg-git/trunk/debian/control	2015-05-08 12:35:57 UTC (rev 11919)
@@ -4,7 +4,10 @@
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders:
  Javi Merino <vicho at debian.org>
-Build-Depends: debhelper (>= 7.0.8), python (>= 2.6.6-3~)
+Build-Depends:
+ debhelper (>= 9),
+ python (>= 2.6.6-3~),
+ dh-python,
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.5
 Homepage: http://hg-git.github.com/

Modified: packages/hg-git/trunk/debian/rules
===================================================================
--- packages/hg-git/trunk/debian/rules	2015-05-08 11:45:03 UTC (rev 11918)
+++ packages/hg-git/trunk/debian/rules	2015-05-08 12:35:57 UTC (rev 11919)
@@ -1,30 +1,16 @@
 #!/usr/bin/make -f
 
-MODULE_DIR = usr/lib/$(shell pyversions -d)/site-packages/hgext/git/
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build build-arch build-indep:
+MODULE_DIR = usr/lib/$(shell pyversions -d)/dist-packages/hgext/git/
 
-clean:
-	dh clean
-	find $(CURDIR) -type f -name '*\.py[co]' -delete
+%:
+	dh $@ --with python2 --buildsystem python_distutils
 
-install: build
-	dh install --until dh_prep
-	dh_installdirs $(MODULE_DIR)
-	cp -r hggit/*.py debian/mercurial-git/$(MODULE_DIR)/
-	dh install --after dh_install --with python2
-
-# Build architecture-independent files here.
-binary-indep: install
-	dh binary-indep
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-patch unpatch:
-	dh_quilt_$(@)
-
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install patch unpatch
-
-# vim:ts=4 sw=4 noet
+# python setup.py install installs it as hggit, whereas mercurial searches for
+# it in hgext/git.  Copy it manually.  As mercurial is the only module that
+# should be importing this, the lack of egg-info shouldn't cause any problems
+override_dh_auto_install:
+	mkdir -p debian/mercurial-git/$(MODULE_DIR)
+	cp -r hggit/*.py debian/mercurial-git/$(MODULE_DIR)