[Python-modules-commits] r18749 - in packages/python-peak.rules/trunk/debian (3 files)

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

    Date: Wednesday, September 28, 2011 @ 02:41:40
  Author: eriol-guest
Revision: 18749

Switched from cdbs to dh sequencer

Modified:
  packages/python-peak.rules/trunk/debian/changelog
  packages/python-peak.rules/trunk/debian/control
  packages/python-peak.rules/trunk/debian/rules

Modified: packages/python-peak.rules/trunk/debian/changelog
===================================================================
--- packages/python-peak.rules/trunk/debian/changelog	2011-09-28 02:27:28 UTC (rev 18748)
+++ packages/python-peak.rules/trunk/debian/changelog	2011-09-28 02:41:40 UTC (rev 18749)
@@ -6,6 +6,8 @@
     - Set myself as uploader with Stefano Zacchiroli's permission.
       Thanks to Stefano Zacchiroli for his past work!
     - Bumped Standards-Version to 3.9.2 (no changes needed)
+  * debian/{control,rules}
+    - Switched from cdbs to dh sequencer
   * debian/patches/01_invoke-multiple-setup.patch
     - Use a patch to add the setup.py which take care of invocation
       of multiple setup.py in subdir provided by Stefano Zacchiroli
@@ -14,7 +16,7 @@
   * debian/watch
     - Added filenamemangle option
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 28 Sep 2011 04:25:47 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 28 Sep 2011 04:40:09 +0200
 
 python-peak.rules (0.5a1+r2600-1) unstable; urgency=low
 

Modified: packages/python-peak.rules/trunk/debian/control
===================================================================
--- packages/python-peak.rules/trunk/debian/control	2011-09-28 02:27:28 UTC (rev 18748)
+++ packages/python-peak.rules/trunk/debian/control	2011-09-28 02:41:40 UTC (rev 18749)
@@ -4,8 +4,8 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Daniele Tricoli <eriol at mornie.org>
 Build-Depends:
- cdbs,
- debhelper (>= 7),
+ debhelper (>= 7.0.50~),
+ python-all,
  python-peak.util,
  python-peak.util.decorators,
  python-setuptools,

Modified: packages/python-peak.rules/trunk/debian/rules
===================================================================
--- packages/python-peak.rules/trunk/debian/rules	2011-09-28 02:27:28 UTC (rev 18748)
+++ packages/python-peak.rules/trunk/debian/rules	2011-09-28 02:41:40 UTC (rev 18749)
@@ -1,43 +1,38 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
 PKG = python-peak.rules
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | sed 's,-.*,,')
 TARBALLS_DIR = $$PWD"/../tarballs/"
 
 PRIORITIZED_METHODS = prioritized_methods-0.2.2dev-20110830
-
 DEB_PRIORITIZED_METHODS_DIR = $(subst _,-,$(subst .,-,$(PRIORITIZED_METHODS)))
 
 export SUBDIRS = rules $(DEB_PRIORITIZED_METHODS_DIR)
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+%:
+	dh $@
 
-# avoid installing useless *.pth files
-install/$(PKG)::
-	rm -f debian/$(PKG)/usr/lib/python*/site-packages/*.pth
+override_dh_auto_clean:
+	rm -f README.prioritized_methods.txt
 
-# Generate README for prioritized_methods out of its PKG-INFO.
-# It will be installed by dh_installdocs
-build/$(PKG)::
+override_dh_auto_install:
+	dh_auto_install -- --single-version-externally-managed
+	rm -f debian/$(PKG)/usr/lib/python*/dist-packages/*.pth
+
+override_dh_installdocs:
+	# Generate README for prioritized_methods out of its PKG-INFO.
 	egrep -i '^( |description:)' $(DEB_PRIORITIZED_METHODS_DIR)/PKG-INFO > \
 		README.prioritized_methods.txt
-clean::
-	rm -f README.prioritized_methods.txt
+	dh_installdocs
 
 get-orig-source:
-	set -e; \
+	set -e;
 	uscan --force-download --destdir $(TARBALLS_DIR) --no-symlink;
-
 	uscan --no-conf \
 		--watchfile debian/`echo $(PRIORITIZED_METHODS) | cut -d- -f1`.watch \
 		--upstream-version 0 --download-version `echo $(PRIORITIZED_METHODS) | cut -d- -f2,3` \
-		--download --destdir $(TARBALLS_DIR)/ --no-symlink; \
+		--download --destdir $(TARBALLS_DIR)/ --no-symlink;
 	mv $(TARBALLS_DIR)/$(PRIORITIZED_METHODS).tar.gz \
-		$(TARBALLS_DIR)/$(PKG)_$(VERSION).orig-`echo $(PRIORITIZED_METHODS) | tr ._ -`.tar.gz; \
-
+		$(TARBALLS_DIR)/$(PKG)_$(VERSION).orig-`echo $(PRIORITIZED_METHODS) | tr ._ -`.tar.gz;
 	# Create manually the empty main package
 	mkdir $(TARBALLS_DIR)/$(PKG)-$(VERSION)
 	cd $(TARBALLS_DIR); tar czf $(PKG)_$(VERSION).orig.tar.gz $(PKG)-$(VERSION)