[Python-apps-commits] r8813 - in packages/hellanzb/trunk/debian (4 files)

[dandrimont-guest at users.alioth.debian.org]

    Date: Friday, June 1, 2012 @ 05:08:17
  Author: dandrimont-guest
Revision: 8813

Move to dh short form

Modified:
  packages/hellanzb/trunk/debian/changelog
  packages/hellanzb/trunk/debian/compat
  packages/hellanzb/trunk/debian/control
  packages/hellanzb/trunk/debian/rules

Modified: packages/hellanzb/trunk/debian/changelog
===================================================================
--- packages/hellanzb/trunk/debian/changelog	2012-06-01 04:27:34 UTC (rev 8812)
+++ packages/hellanzb/trunk/debian/changelog	2012-06-01 05:08:17 UTC (rev 8813)
@@ -3,13 +3,17 @@
   * Adopt package under the Python Applications Packaging Team umbrella
     (Closes: #673946)
   * Acknowledge previous NMU, thanks Jakub.
+  * Add patch from Emil Mikulic to support Twisted 11.1.0+ (Closes: #653294)
+  * Add patch from upstream to fix a potential lockup on CRC mismatches
+    (Closes: #549124)
+
   * Change source format to "3.0 (quilt)" (Closes: #664281)
     - Convert patches to the DEP3 format
     - Refresh the patches with quilt
     - Drop the dpatch build-dependency and dpatch-related targets
     - Drop README.source
-  * Add patch from Emil Mikulic to support Twisted 11.1.0+ (Closes: #653294)
-  * Add patch from upstream to fix a potential lockup on CRC mismatches (Closes: #549124)
+  * Convert debian/rules to dh short form
+  * Bump debhelper compatibility level to 8
 
  -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Fri, 01 Jun 2012 06:24:48 +0200
 

Modified: packages/hellanzb/trunk/debian/compat
===================================================================
--- packages/hellanzb/trunk/debian/compat	2012-06-01 04:27:34 UTC (rev 8812)
+++ packages/hellanzb/trunk/debian/compat	2012-06-01 05:08:17 UTC (rev 8813)
@@ -1 +1 @@
-5
+8

Modified: packages/hellanzb/trunk/debian/control
===================================================================
--- packages/hellanzb/trunk/debian/control	2012-06-01 04:27:34 UTC (rev 8812)
+++ packages/hellanzb/trunk/debian/control	2012-06-01 05:08:17 UTC (rev 8813)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
-Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: python-all (>= 2.5.4), python-support (>= 0.5.3)
 Standards-Version: 3.8.4
 Homepage: http://www.hellanzb.com/

Modified: packages/hellanzb/trunk/debian/rules
===================================================================
--- packages/hellanzb/trunk/debian/rules	2012-06-01 04:27:34 UTC (rev 8812)
+++ packages/hellanzb/trunk/debian/rules	2012-06-01 05:08:17 UTC (rev 8813)
@@ -6,59 +6,20 @@
 
 # Install directory
 DESTDIR   = $(CURDIR)/debian/hellanzb
-# Current python version
-PYDEF     = $(shell pyversions -d)
 
-# Added for Python 2.6 site packages directory change
-include /usr/share/python/python.mk
-SITEDIR = $(call py_sitename, $(PYDEF))
+%:
+	dh $@
 
-build:
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build/
+override_dh_auto_clean:
 	find . -name "*.pyc" -exec rm -f {} \;
-	dh_clean 
+	dh_auto_clean
 
-install: build install-prereq install-python install-finish
-
-install-prereq: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-install-python: install-prereq
-	python setup.py install --prefix=$(DESTDIR)/usr --no-compile $(py_setup_install_args)
-
-install-finish: install-python
+override_dh_auto_install:
 	# Remove docs and conf installed by setup.py
 	rm -rf $(DESTDIR)/usr/share $(DESTDIR)/usr/etc/
 	# Remove .py
 	mv $(DESTDIR)/usr/bin/hellanzb.py $(DESTDIR)/usr/bin/hellanzb
 	# Remove interpreter in python modules
-	sed -i -e '0,/^.*$$/s///' $(DESTDIR)/usr/lib/$(PYDEF)/$(SITEDIR)/Hellanzb/Growl.py
+	sed -i -e '0,/^.*$$/s///' $(DESTDIR)/usr/lib/python*/*/Hellanzb/Growl.py
 	# Install conf file
 	install -D -m 644 etc/hellanzb.conf.sample $(DESTDIR)/etc/hellanzb.conf
-
-binary-indep: install
-	dh_testdir -i
-	dh_testroot -i
-	dh_install -i
-	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_pysupport -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install