[Python-modules-commits] r6322 - in packages/configobj (6 files)

Sun Aug 24 03:08:56 UTC 2008

Date: Sunday, August 24, 2008 @ 03:08:55
  Author: odd_bloke-guest
Revision: 6322

Major modifications to packaging.

Added:
  packages/configobj/trunk/debian/patches/00list
  packages/configobj/trunk/debian/patches/01_eggify.dpatch
  packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch
Modified:
  packages/configobj/trunk/	(properties)
  packages/configobj/trunk/debian/rules	(contents, properties)
Deleted:
  packages/configobj/trunk/debian/patches/00_eggify.diff


Property changes on: packages/configobj/trunk
___________________________________________________________________
Name: bzr:revision-info
   + timestamp: 2008-08-22 16:40:01.585999966 +0100
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
properties: 
	branch-nick: configobj

Name: bzr:file-ids
   + debian/patches/00list	00list-20080822153942-juczx0aiviicp35q-1
debian/patches/01_eggify.dpatch	01_eggify.dpatch-20080822153942-juczx0aiviicp35q-2
debian/patches/02_doc_generation_fix.dpatch	02_doc_generation_fi-20080822153942-juczx0aiviicp35q-3

Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWXrctpkAABdRgAAQABC6yV4AIAAhtU1MmBtQUwAE0zC-FIoOFRv95GyEprQjsj13FDS34XckU4UJB63LaZA.
   + 50 daniel at daniel-watkins.co.uk-20080822154001-vpbhtt74th9b1kis


Deleted: packages/configobj/trunk/debian/patches/00_eggify.diff
===================================================================

--- packages/configobj/trunk/debian/patches/00_eggify.diff	2008-08-23 23:29:52 UTC (rev 6321)
+++ packages/configobj/trunk/debian/patches/00_eggify.diff	2008-08-24 03:08:55 UTC (rev 6322)
@@ -1,11 +0,0 @@
---- setup.py~	2006-09-15 10:07:56.000000000 -0300
-+++ setup.py	2007-04-21 12:16:37.000000000 -0300
-@@ -21,7 +21,7 @@
- 
- if __name__ == '__main__':
-     import sys
--    from distutils.core import setup
-+    from setuptools import setup
-     from configobj import __version__ as VERSION
- 
-     NAME = 'configobj'

Added: packages/configobj/trunk/debian/patches/00list
===================================================================
--- packages/configobj/trunk/debian/patches/00list	                        (rev 0)
+++ packages/configobj/trunk/debian/patches/00list	2008-08-24 03:08:55 UTC (rev 6322)
@@ -0,0 +1,2 @@
+01_eggify.dpatch
+02_doc_generation_fix.dpatch

Added: packages/configobj/trunk/debian/patches/01_eggify.dpatch
===================================================================
--- packages/configobj/trunk/debian/patches/01_eggify.dpatch	                        (rev 0)
+++ packages/configobj/trunk/debian/patches/01_eggify.dpatch	2008-08-24 03:08:55 UTC (rev 6322)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_eggify.dpatch by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+--- setup.py~	2006-09-15 10:07:56.000000000 -0300
++++ setup.py	2007-04-21 12:16:37.000000000 -0300
+@@ -21,7 +21,7 @@
+ 
+ if __name__ == '__main__':
+     import sys
+-    from distutils.core import setup
++    from setuptools import setup
+     from configobj import __version__ as VERSION
+ 
+     NAME = 'configobj'

Added: packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch
===================================================================
--- packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch	                        (rev 0)
+++ packages/configobj/trunk/debian/patches/02_doc_generation_fix.dpatch	2008-08-24 03:08:55 UTC (rev 6322)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_doc_generation_fix.dpatch by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove invalid ReStructured Text markup to allow documentation 
+## DP: generation to work.
+
+ at DPATCH@
+
+=== modified file 'configobj.py'
+--- configobj.py	2008-08-22 15:15:17 +0000
++++ configobj.py	2008-08-22 15:15:38 +0000
+@@ -875,7 +875,7 @@
+         
+         See  the encode and decode methods for examples, including functions.
+         
+-        .. caution::
++        .. admonition:: Caution
+         
+             You can use ``walk`` to transform the names of members of a section
+             but you mustn't add or delete members.
+

Modified: packages/configobj/trunk/debian/rules
===================================================================
--- packages/configobj/trunk/debian/rules	2008-08-23 23:29:52 UTC (rev 6321)
+++ packages/configobj/trunk/debian/rules	2008-08-24 03:08:55 UTC (rev 6322)
@@ -1,22 +1,41 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-DEB_PYTHON_SYSTEM = pysupport
+include /usr/share/dpatch/dpatch.make
 
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+build: patch
 
-DEB_COMPRESS_EXCLUDE = .js
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed --install-lib usr/share/python-support/python-configobj
+clean:
+	dh_testdir
+	dh_testroot
+	python setup.py clean
+	find . -name "*.pyc" -print0 | xargs -0 rm
+	dh_clean
 
-binary-post-install/python-configobj::
-	-rm -rf debian/python-configobj/usr/lib/
-	-rm debian/python-configobj/usr/share/doc/python-configobj/BSD*
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	python setup.py install --no-compile --root=debian/python-configobj
 
-post-patches::
-	env PYTHONPATH=`pwd` epydoc --name ConfigObj --url http://www.voidspace.org.uk/python/configobj.html -o configobj-api configobj
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_compress -X.txt -X.py
+	dh_fixperms
+	dh_pysupport
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
-clean::
-	-rm -rf configobj.egg-info
-	-rm -rf configobj-api
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+binary: binary-indep binary-arch
+.PHONY: build pre-clean clean binary-indep binary-arch binary install


