[Python-apps-commits] r2848 - in packages/phenny/trunk/debian (control patches/00list rules)

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

    Date: Monday, May 4, 2009 @ 17:11:00
  Author: nslater-guest
Revision: 2848

debhelper changes

Added:
  packages/phenny/trunk/debian/patches/00list
Modified:
  packages/phenny/trunk/debian/control
  packages/phenny/trunk/debian/rules

Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control	2009-05-04 17:08:49 UTC (rev 2847)
+++ packages/phenny/trunk/debian/control	2009-05-04 17:11:00 UTC (rev 2848)
@@ -4,7 +4,7 @@
 Maintainer: Noah Slater <nslater at tumbolia.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Standards-Version: 3.8.1
-Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5)
+Build-Depends: debhelper (>= 5), dpatch
 Build-Depends-Indep: help2man, python-support (>= 0.6.4), python2.5
 Homepage: http://inamidst.com/phenny/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/phenny/trunk/

Added: packages/phenny/trunk/debian/patches/00list
===================================================================
--- packages/phenny/trunk/debian/patches/00list	                        (rev 0)
+++ packages/phenny/trunk/debian/patches/00list	2009-05-04 17:11:00 UTC (rev 2848)
@@ -0,0 +1,8 @@
+01_non-executable
+02_expand-home
+03_module-home
+04_module-import
+05_python-version
+06_catch-exception
+07_command-option
+08_default-configuration

Modified: packages/phenny/trunk/debian/rules
===================================================================
--- packages/phenny/trunk/debian/rules	2009-05-04 17:08:49 UTC (rev 2847)
+++ packages/phenny/trunk/debian/rules	2009-05-04 17:11:00 UTC (rev 2848)
@@ -6,23 +6,17 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved.
 
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/dpatch/dpatch.make
 
-DEB_ORIG_URI = static-http://inamidst.com/phenny/
-DEB_ORIG_DIRECTORY=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-DEB_ORIG_FILENAME=$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~hg//")
+clean: unpatch
+build: patch-stamp
 
-# @@ workaround for #486848
-binary-arch binary-indep: build
+%:
+	dh $@
 
-clean::
-	find . -name '*\.pyc' -delete
-	rm -f phenny.1
+override_dh_auto_build:
 
-common-install-prehook-impl::
+override_dh_install:
 	cp *.py debian/phenny/usr/share/python-support/phenny/phenny
 	cp modules/*.py debian/phenny/usr/share/python-support/phenny/phenny/modules
 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/*.py
@@ -30,12 +24,36 @@
 	cp phenny debian/phenny/usr/bin
 	help2man -N -n "an extensible IRC bot written in Python" ./phenny > phenny.1
 
-binary-install/phenny::
-	dh_pysupport -pphenny
+# include /usr/share/cdbs/1/rules/buildcore.mk
+# include /usr/share/cdbs/1/rules/debhelper.mk
+# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# @@ only works from source directory, see #494141
-.PHONY: get-orig-source
-get-orig-source:
-	hg clone -r $(DEB_REPOS_VERSION) $(DEB_ORIG_URI) $(DEB_ORIG_DIRECTORY)
-	tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY) --exclude .hg
-	rm -fr $(DEB_ORIG_DIRECTORY)
+# DEB_ORIG_URI = static-http://inamidst.com/phenny/
+# DEB_ORIG_DIRECTORY=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+# DEB_ORIG_FILENAME=$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+# DEB_REPOS_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -r "s/.*~hg//")
+
+# # @@ workaround for #486848
+# binary-arch binary-indep: build
+
+# clean::
+# 	find . -name '*\.pyc' -delete
+# 	rm -f phenny.1
+
+# common-install-prehook-impl::
+# 	cp *.py debian/phenny/usr/share/python-support/phenny/phenny
+# 	cp modules/*.py debian/phenny/usr/share/python-support/phenny/phenny/modules
+# 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/*.py
+# 	chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/modules/*.py
+# 	cp phenny debian/phenny/usr/bin
+# 	help2man -N -n "an extensible IRC bot written in Python" ./phenny > phenny.1
+
+# binary-install/phenny::
+# 	dh_pysupport -pphenny
+
+# # @@ only works from source directory, see #494141
+# .PHONY: get-orig-source
+# get-orig-source:
+# 	hg clone -r $(DEB_REPOS_VERSION) $(DEB_ORIG_URI) $(DEB_ORIG_DIRECTORY)
+# 	tar -czf $(DEB_ORIG_FILENAME) $(DEB_ORIG_DIRECTORY) --exclude .hg
+# 	rm -fr $(DEB_ORIG_DIRECTORY)