[Python-modules-commits] r2410 - in /packages/python-networkx/trunk/debian: TODO changelog control patches/series rules

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

Author: kibi-guest
Date: Tue May 15 09:28:30 2007
New Revision: 2410

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2410
Log:
Fix #423981, add versioned B-D on python-{all-dev,support}, use setup_egg.py

Modified:
    packages/python-networkx/trunk/debian/TODO
    packages/python-networkx/trunk/debian/changelog
    packages/python-networkx/trunk/debian/control
    packages/python-networkx/trunk/debian/patches/series
    packages/python-networkx/trunk/debian/rules

Modified: packages/python-networkx/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/python-modules/packages/python-networkx/trunk/debian/TODO?rev=2410&op=diff
==============================================================================
--- packages/python-networkx/trunk/debian/TODO (original)
+++ packages/python-networkx/trunk/debian/TODO Tue May 15 09:28:30 2007
@@ -1,9 +1,6 @@
 python-networkx
 ---------------
 
-  * python-all-dev (>= 2.3.5-11)
   * Drop the doc relocation patch and manage that in the rules file?
-  * Drop the egg (setuptools) patch, and use setup_egg.py instead of setup.py
-    in the rules file.
 
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 23 Apr 2007 23:36:38 +0200

Modified: packages/python-networkx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-networkx/trunk/debian/changelog?rev=2410&op=diff
==============================================================================
--- packages/python-networkx/trunk/debian/changelog (original)
+++ packages/python-networkx/trunk/debian/changelog Tue May 15 09:28:30 2007
@@ -1,8 +1,15 @@
 python-networkx (0.34-2) UNRELEASED; urgency=low
 
+  * Added a versioned B-D on python-suppport (>= 0.6.4) since #422436 is
+    fixed in this version, and on python-all-dev (>= 2.3.5-11), according
+    to the Python Policy.
+  * Dropped the manual egg renaming, which isn't needed anymore, and even
+    fails with the new python-support (Closes: #423981).
+  * Turned setup.py usage into setup_egg.py usage. 20_egg_support patch
+    disabled accordingly.
   * Added a TODO file so as not to forget TODO items for next uploads.
 
- -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Mon, 23 Apr 2007 23:40:02 +0200
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Tue, 15 May 2007 10:59:02 +0200
 
 python-networkx (0.34-1) unstable; urgency=low
 

Modified: packages/python-networkx/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-networkx/trunk/debian/control?rev=2410&op=diff
==============================================================================
--- packages/python-networkx/trunk/debian/control (original)
+++ packages/python-networkx/trunk/debian/control Tue May 15 09:28:30 2007
@@ -2,8 +2,8 @@
 Section: graphics
 Priority: optional
 Maintainer: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), python-all-dev, quilt (>= 0.40)
-Build-Depends-Indep: python-support (>= 0.4), python-setuptools (>= 0.6a9)
+Build-Depends: debhelper (>= 5), python-all-dev (>= 2.3.5-11), quilt (>= 0.40)
+Build-Depends-Indep: python-support (>= 0.6.4), python-setuptools (>= 0.6a9)
 Standards-Version: 3.7.2
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 

Modified: packages/python-networkx/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-modules/packages/python-networkx/trunk/debian/patches/series?rev=2410&op=diff
==============================================================================
--- packages/python-networkx/trunk/debian/patches/series (original)
+++ packages/python-networkx/trunk/debian/patches/series Tue May 15 09:28:30 2007
@@ -1,2 +1,2 @@
 10_doc_relocation
-20_egg_support
+#20_egg_support

Modified: packages/python-networkx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-networkx/trunk/debian/rules?rev=2410&op=diff
==============================================================================
--- packages/python-networkx/trunk/debian/rules (original)
+++ packages/python-networkx/trunk/debian/rules Tue May 15 09:28:30 2007
@@ -42,7 +42,7 @@
 
 	# Install w/o compiling *.pyc files
 	# Install egg-info directories (--single-... option)
-	python setup.py install --no-compile --root=$(CURDIR)/debian/python-networkx \
+	python setup_egg.py install --no-compile --root=$(CURDIR)/debian/python-networkx \
 		--single-version-externally-managed
 
 	# Do some cleanup: delete unneeded files
@@ -70,8 +70,6 @@
 	dh_installdocs
 	dh_installexamples
 	dh_pysupport
-	mv ${PYSUPPORT_DIR}/networkx-${DEB_UPSTREAM_VERSION}-py[0-9].[0-9].egg-info \
-		${PYSUPPORT_DIR}/networkx-${DEB_UPSTREAM_VERSION}.egg-info
 	chmod +x ${PYSUPPORT_DIR}/networkx/tests/test.py
 	dh_installman
 	dh_link