Package: python-cloudservers
Followup-For: Bug #631212

Dear Maintainer,

Here is a debdiff for a NMU of this package. It solves the issue with 
simplejson in python2.6 and solves the issue with argparse in python 2.7. I can 
not upload it myself, please feel free to use it as it is or to modify it to 
solve this RC bug.

Regards,
Carl Chenet

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (900, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru python-cloudservers-1.1/debian/changelog python-cloudservers-1.1/debian/changelog
--- python-cloudservers-1.1/debian/changelog    2010-05-17 22:49:46.000000000 +0200
+++ python-cloudservers-1.1/debian/changelog    2012-02-19 16:14:20.000000000 +0100
@@ -1,3 +1,15 @@
+python-cloudservers (1.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add argparse-condition.patch to get rid of argparse external modules when python < 2.7 
+  * debian/control
+    - do not use python-argparse if python < 2.7 in B-D and Depends
+  * debian/patches/series
+    - remove cleaner_sources.txt
+  * remove debian/patches/cleaner_sources.txt
+
+ -- Carl Chenet <cha...@ohmytux.com>  Sun, 19 Feb 2012 15:35:24 +0100
+
 python-cloudservers (1.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru python-cloudservers-1.1/debian/patches/argparse-condition.patch python-cloudservers-1.1/debian/patches/argparse-condition.patch
--- python-cloudservers-1.1/debian/patches/argparse-condition.patch 1970-01-01 01:00:00.000000000 +0100
+++ python-cloudservers-1.1/debian/patches/argparse-condition.patch 2012-02-19 16:14:11.000000000 +0100
@@ -0,0 +1,27 @@
+# Description: use external argparse module only if not in python 2.7
+# Author: Carl Chenet <cha...@ohmytux.com>
+
+Index: python-cloudservers-1.1/setup.py
+===================================================================
+--- python-cloudservers-1.1.orig/setup.py  2010-05-07 00:17:02.000000000 +0200
++++ python-cloudservers-1.1/setup.py   2012-02-19 15:22:43.000000000 +0100
+@@ -6,9 +6,11 @@
+ def read(fname):
+     return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ 
+-requirements = ['httplib2', 'argparse', 'prettytable']
++requirements = ['httplib2', 'prettytable']
+ if sys.version_info < (2,6):
+     requirements.append('simplejson')
++if sys.version_info < (2,7):
++    requirements.append('argparse')
+ 
+ setup(
+     name = "python-cloudservers",
+@@ -37,4 +39,4 @@
+     entry_points = {
+         'console_scripts': ['cloudservers = cloudservers.shell:main']
+     }
+-)
+\ No newline at end of file
++)
diff -Nru python-cloudservers-1.1/debian/patches/series python-cloudservers-1.1/debian/patches/series
--- python-cloudservers-1.1/debian/patches/series   2010-05-17 22:46:44.000000000 +0200
+++ python-cloudservers-1.1/debian/patches/series   2012-02-19 16:14:04.000000000 +0100
@@ -1,2 +1,2 @@
-cleaner-sources.txt
 autogeneration-fallout
+argparse-condition.patch

Reply via email to