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

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

    Date: Friday, September 9, 2011 @ 01:44:53
  Author: eriol-guest
Revision: 18473

Switched from cdbs to dh sequencer

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

Modified: packages/python-peak.util/trunk/debian/changelog
===================================================================
--- packages/python-peak.util/trunk/debian/changelog	2011-09-09 00:19:32 UTC (rev 18472)
+++ packages/python-peak.util/trunk/debian/changelog	2011-09-09 01:44:53 UTC (rev 18473)
@@ -9,6 +9,8 @@
       Maintainer
     - Added myself to Uploaders (Closes: #607083)
     - Bumped Standards-Version to 3.9.2 (no changes needed)
+  * debian/{control,rules}
+    - Switched from cdbs to dh sequencer
   * debian/copyright
     - Made DEP5 compliant
   * debian/patches/01_invoke-multiple-setup.patch
@@ -16,8 +18,10 @@
       of multiple setup.py in subdir provided by Stefano Zacchiroli
   * debian/source/format
     - Switched to source format 3.0 (quilt)
+  * debian/source/options
+    - Added create-empty-orig
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 09 Sep 2011 00:11:08 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 09 Sep 2011 03:38:16 +0200
 
 python-peak.util (20090610-3) unstable; urgency=low
 

Modified: packages/python-peak.util/trunk/debian/control
===================================================================
--- packages/python-peak.util/trunk/debian/control	2011-09-09 00:19:32 UTC (rev 18472)
+++ packages/python-peak.util/trunk/debian/control	2011-09-09 01:44:53 UTC (rev 18473)
@@ -4,8 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Daniele Tricoli <eriol at mornie.org>
 Build-Depends:
- debhelper (>= 7),
- cdbs,
+ debhelper (>= 7.0.50~),
  python-all,
  python-setuptools,
  python-support

Modified: packages/python-peak.util/trunk/debian/rules
===================================================================
--- packages/python-peak.util/trunk/debian/rules	2011-09-09 00:19:32 UTC (rev 18472)
+++ packages/python-peak.util/trunk/debian/rules	2011-09-09 01:44:53 UTC (rev 18473)
@@ -1,8 +1,4 @@
 #!/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.util
 VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | sed 's,-.*,,')
 
@@ -21,24 +17,20 @@
 
 PKG_PREFIX = peak.util-
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+USCAN_EXTRA_ARGS = --repack
 
-clean::
+%:
+	dh $@
+
+override_dh_auto_clean:
 	rm -rf build/
-	rm -f addons-0-7/AddOns.egg-info/PKG-INFO
-	rm -f bytecodeassembler-0-6/BytecodeAssembler.egg-info/PKG-INFO
-	rm -f extremes-1-1-1/Extremes.egg-info/PKG-INFO
-	rm -f symboltype-1-0/SymbolType.egg-info/PKG-INFO
-	rm -f symboltype-1-0/SymbolType.egg-info/SOURCES.txt
-	rm -f symboltype-1-0/SymbolType.egg-info/dependency_links.txt
+	find . -prune -name '*.egg-info' -exec rm -rf {} \;
+	dh_auto_clean
 
-# avoid installing tests: useless at runtime and prone to name clashes
-install/$(PKG)::
-	rm -f debian/$(PKG)/usr/lib/python*/*-packages/*.pth
+override_dh_auto_install:
+	dh_auto_install -- --single-version-externally-managed
+	rm -f debian/$(PKG)/usr/lib/python*/dist-packages/*.pth
 
-USCAN_EXTRA_ARGS = --repack
-
-.PHONY: get-orig-source
 get-orig-source:
 	@echo $(DEB_SUBDIR)
 	set -e; \