[Python-modules-commits] r11879 - in packages/python-networkx/trunk/debian (6 files)

[morph at users.alioth.debian.org]

    Date: Monday, February 22, 2010 @ 19:53:51
  Author: morph
Revision: 11879

Merging 1.0~rc1~svn1492 to trunk

Added:
  packages/python-networkx/trunk/debian/patches/20_fix_broken_svn_keyboards
Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/control
  packages/python-networkx/trunk/debian/patches/10_doc_relocation
  packages/python-networkx/trunk/debian/patches/series
  packages/python-networkx/trunk/debian/rules

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2010-02-22 19:52:51 UTC (rev 11878)
+++ packages/python-networkx/trunk/debian/changelog	2010-02-22 19:53:51 UTC (rev 11879)
@@ -1,3 +1,26 @@
+python-networkx (1.0~rc1~svn1492-2) experimental; urgency=low
+
+  * Work around both svn's and python's broken behaviours: exporting from
+    the former is locale-dependant, and the latter can't cope with Unicode
+    out of the box (Closes: #557743):
+     + debian/patches/20_fix_broken_svn_keyboards.
+  * Self-reminder: don't touch svn ever again.
+
+ -- Cyril Brulebois <kibi at debian.org>  Tue, 24 Nov 2009 12:26:36 +0100
+
+python-networkx (1.0~rc1~svn1492-1) experimental; urgency=low
+
+  * New upstream snapshot, past 1.0~rc1, as requested by Yaroslav
+    Halchenko (Closes: #549996).
+  * Refresh patch accordingly:
+     + debian/patches/10_doc_relocation.
+  * Get rid of extra LICENSE.txt file in /usr/share/doc.
+  * Use dh_compress -Xexamples/ to avoid compressing examples, thanks to
+    Sandro Tosi (Closes: #539942).
+  * Bump Standards-Version from 3.8.0 to 3.8.3 (no changes needed).
+
+ -- Cyril Brulebois <kibi at debian.org>  Mon, 23 Nov 2009 15:44:34 +0100
+
 python-networkx (0.99-2) unstable; urgency=low
 
   * Upload to unstable now that lenny is released (yay).

Modified: packages/python-networkx/trunk/debian/control
===================================================================
--- packages/python-networkx/trunk/debian/control	2010-02-22 19:52:51 UTC (rev 11878)
+++ packages/python-networkx/trunk/debian/control	2010-02-22 19:53:51 UTC (rev 11879)
@@ -4,7 +4,7 @@
 Maintainer: Cyril Brulebois <kibi at debian.org>
 Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6a9)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: https://networkx.lanl.gov/
 Vcs-Git: git://git.debian.org/git/collab-maint/python-networkx.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/python-networkx.git

Modified: packages/python-networkx/trunk/debian/patches/10_doc_relocation
===================================================================
--- packages/python-networkx/trunk/debian/patches/10_doc_relocation	2010-02-22 19:52:51 UTC (rev 11878)
+++ packages/python-networkx/trunk/debian/patches/10_doc_relocation	2010-02-22 19:53:51 UTC (rev 11879)
@@ -1,10 +1,10 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@ packages=["networkx",
            "networkx.tests",
            ]
  
--docdirbase  = 'share/doc/networkx-%s' % version
+-docdirbase  = 'share/doc/networkx-%s' % release.version
 +docdirbase  = 'share/doc/python-networkx'
  # add basic documentation 
  data = [(docdirbase, glob("*.txt"))]

Added: packages/python-networkx/trunk/debian/patches/20_fix_broken_svn_keyboards
===================================================================
--- packages/python-networkx/trunk/debian/patches/20_fix_broken_svn_keyboards	                        (rev 0)
+++ packages/python-networkx/trunk/debian/patches/20_fix_broken_svn_keyboards	2010-02-22 19:53:51 UTC (rev 11879)
@@ -0,0 +1,11 @@
+--- a/networkx/algorithms/isomorphism/isomorphvf2.py
++++ b/networkx/algorithms/isomorphism/isomorphvf2.py
+@@ -138,7 +138,7 @@ In general, this problem is NP-Complete.
+ 
+ import sys
+ 
+-__date__ = "$Date: 2009-08-26 05:54:18 +0200 (mer. 26 août 2009) $"
++__date__ = "$Date: 2009-08-26 05:54:18 +0200 (Wed, 26 Aug 2009) $"
+ 
+ #__doc__ += sources#.replace('\n', '\n'+indent)
+ 

Modified: packages/python-networkx/trunk/debian/patches/series
===================================================================
--- packages/python-networkx/trunk/debian/patches/series	2010-02-22 19:52:51 UTC (rev 11878)
+++ packages/python-networkx/trunk/debian/patches/series	2010-02-22 19:53:51 UTC (rev 11879)
@@ -1 +1,2 @@
 10_doc_relocation
+20_fix_broken_svn_keyboards

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2010-02-22 19:52:51 UTC (rev 11878)
+++ packages/python-networkx/trunk/debian/rules	2010-02-22 19:53:51 UTC (rev 11879)
@@ -48,8 +48,8 @@
 	chmod +x debian/python-networkx/usr/lib/`pyversions -d`/site-packages/networkx/tests/test.py
 	find debian/python-networkx -name '*.bz2' -exec chmod a-x {} ';'
 
-	# Do some cleanup: delete an unneeded file
-	rm $(DEBIANDOC_DIR)/INSTALL.txt
+	# Do some cleanup: delete unneeded files:
+	rm $(DEBIANDOC_DIR)/INSTALL.txt $(DEBIANDOC_DIR)/LICENSE.txt
 
 	# Rename the README file.
 	mv $(DEBIANDOC_DIR)/README.txt $(DEBIANDOC_DIR)/README
@@ -65,7 +65,7 @@
 	dh_pysupport
 	dh_installman
 	dh_link
-	dh_compress
+	dh_compress -Xexamples/
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums