[Pkg-python-debian-commits] r54 ./trunk: * setup.py:

[John Wright]

------------------------------------------------------------
revno: 54
committer: John Wright <john at movingsucks.org>
branch nick: trunk
timestamp: Sat 2007-06-30 22:00:27 -0600
message:
  * setup.py:
    - The version wasn't getting updated, so I've renamed it to setup.py.in,
      and added a __CHANGELOG_VERSION__ placeholder
  * debian/rules:
    - Generate generate setup.py from setup.py.in, filling in the version
      information from debian/changelog
  * debian/control:
    - The above generation depends on m4, so add that as a Build-Depends
    - Add myself as an uploader
renamed:
  setup.py => setup.py.in
modified:
  debian/changelog
  debian/control
  debian/rules
  setup.py.in
-------------- next part --------------
=== renamed file 'setup.py' => 'setup.py.in'
--- a/setup.py	2007-01-07 21:03:49 +0000
+++ b/setup.py.in	2007-07-01 04:00:27 +0000
@@ -19,7 +19,7 @@
 from distutils.core import setup
 
 setup(name='python-debian',
-      version='0.1.1',
+      version='__CHANGELOG_VERSION__',
       description='Debian package related modules',
       url='http://packages.qa.debian.org/p/python-debian.html',
       packages=['debian_bundle'],

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-06-30 13:28:46 +0000
+++ b/debian/changelog	2007-07-01 04:00:27 +0000
@@ -7,7 +7,18 @@
   * examples/
     - added grep-maintainer example to show the Packages parsing API
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat, 30 Jun 2007 15:27:46 +0200
+  [ John Wright ]
+  * setup.py:
+    - The version wasn't getting updated, so I've renamed it to setup.py.in,
+      and added a __CHANGELOG_VERSION__ placeholder
+  * debian/rules:
+    - Generate generate setup.py from setup.py.in, filling in the version
+      information from debian/changelog
+  * debian/control:
+    - The above generation depends on m4, so add that as a Build-Depends
+    - Add myself as an uploader
+
+ -- John Wright <john at movingsucks.org>  Sat, 30 Jun 2007 21:53:00 -0600
 
 python-debian (0.1.3) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-06-30 13:35:28 +0000
+++ b/debian/control	2007-07-01 04:00:27 +0000
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Debian python-debian Maintainers <pkg-python-debian-maint at lists.alioth.debian.org>
-Uploaders: Adeodato Sim?? <dato at net.com.org.es>, Enrico Zini <enrico at debian.org>, James Westby <jw+debian at jameswestby.net>, Reinhard Tartler <siretart at tauware.de>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python
+Uploaders: Adeodato Sim?? <dato at net.com.org.es>, Enrico Zini <enrico at debian.org>, James Westby <jw+debian at jameswestby.net>, Reinhard Tartler <siretart at tauware.de>, Stefano Zacchiroli <zack at debian.org>, John Wright <john at movingsucks.org>
+Build-Depends: debhelper (>= 5.0.37.2), python, m4
 Build-Depends-Indep: python-support (>= 0.3)
 Standards-Version: 3.7.2
 XS-Vcs-Bzr: http://bzr.debian.org/pkg-python-debian/trunk/

=== modified file 'debian/rules'
--- a/debian/rules	2007-06-14 19:02:51 +0000
+++ b/debian/rules	2007-07-01 04:00:27 +0000
@@ -4,8 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+VERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | awk '{print $$2}')
+
+setup.py: setup.py.in
+	m4 -D __CHANGELOG_VERSION__=$(VERSION) < $< > $@
+
 build: build-stamp
-build-stamp:
+build-stamp: setup.py
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -19,7 +24,7 @@
 
 	touch $@
 
-clean:
+clean: setup.py
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -28,6 +33,7 @@
 	python setup.py clean
 	rm -rf build/
 	rm -f README.debtags
+	rm -f setup.py
 
 	dh_clean