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

[kitterman at users.alioth.debian.org]

    Date: Tuesday, June 23, 2015 @ 04:00:47
  Author: kitterman
Revision: 33057

* New upstream release
  - Drop debian/patches/docopt-versions.patch since docopt is no longer
    required
  - Drop depends on python-docopt and python3-docopt, no longer used
  - Drop debian/patches/1002-longdesc.patch, no longer required
  - Update debian/patches/1001-rename_sl.patch for upstream changes

Modified:
  packages/python-softlayer/trunk/debian/changelog
  packages/python-softlayer/trunk/debian/control
  packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch
  packages/python-softlayer/trunk/debian/patches/series
Deleted:
  packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch
  packages/python-softlayer/trunk/debian/patches/docopt-versions.patch

Modified: packages/python-softlayer/trunk/debian/changelog
===================================================================
--- packages/python-softlayer/trunk/debian/changelog	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/changelog	2015-06-23 04:00:47 UTC (rev 33057)
@@ -1,3 +1,14 @@
+python-softlayer (4.0.3-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop debian/patches/docopt-versions.patch since docopt is no longer
+      required
+    - Drop depends on python-docopt and python3-docopt, no longer used
+    - Drop debian/patches/1002-longdesc.patch, no longer required
+    - Update debian/patches/1001-rename_sl.patch for upstream changes
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 22 Jun 2015 22:15:59 -0400
+
 python-softlayer (3.3.1-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/python-softlayer/trunk/debian/control
===================================================================
--- packages/python-softlayer/trunk/debian/control	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/control	2015-06-23 04:00:47 UTC (rev 33057)
@@ -20,7 +20,6 @@
 Package: python-softlayer
 Architecture: all
 Depends:
- python-docopt,
  python-mock,
  python-nose,
  python-prettytable,
@@ -41,7 +40,6 @@
 Breaks: python-softlayer (<= 3.1.0-1)
 Replaces: python-softlayer (<= 3.1.0-1)
 Depends:
- python3-docopt,
  python3-mock,
  python3-nose,
  python3-prettytable,

Modified: packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch	2015-06-23 04:00:47 UTC (rev 33057)
@@ -5,14 +5,16 @@
  setup.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- python-softlayer.orig/setup.py
-+++ python-softlayer/setup.py
-@@ -55,7 +55,7 @@ setup(
-     url='http://github.com/softlayer/softlayer-python',
+Index: python-softlayer-4.0.3/setup.py
+===================================================================
+--- python-softlayer-4.0.3.orig/setup.py	2015-06-22 22:57:09.872020045 -0400
++++ python-softlayer-4.0.3/setup.py	2015-06-22 22:57:46.760020831 -0400
+@@ -48,7 +48,7 @@
      entry_points={
          'console_scripts': [
--            'sl = SoftLayer.CLI.core:main',
-+            'SL = SoftLayer.CLI.core:main',
+             'slcli = SoftLayer.CLI.core:main',
+-            'sl = SoftLayer.CLI.deprecated:main',
++            'SL = SoftLayer.CLI.deprecated:main',
          ],
      },
-     package_data={
+     test_suite='nose.collector',

Deleted: packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch	2015-06-23 04:00:47 UTC (rev 33057)
@@ -1,25 +0,0 @@
-Description: Fix non-ASCII characters decoding issue.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- setup.py |    9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- python-softlayer.orig/setup.py
-+++ python-softlayer/setup.py
-@@ -27,14 +27,7 @@ if sys.version_info < (2, 7):
- 
- description = "A library for SoftLayer's API"
- 
--if os.path.exists('README.rst'):
--    f = open('README.rst')
--    try:
--        long_description = f.read()
--    finally:
--        f.close()
--else:
--    long_description = description
-+long_description = description
- 
- setup(
-     name='SoftLayer',

Deleted: packages/python-softlayer/trunk/debian/patches/docopt-versions.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/docopt-versions.patch	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/patches/docopt-versions.patch	2015-06-23 04:00:47 UTC (rev 33057)
@@ -1,17 +0,0 @@
-Description: Fix docopt version in requires to SL will start (Closes: #778344)
-Author: Scott Kitterman <scott at kitterman.com>
-Bug-Debian: http://bugs.debian.org/778344
-Origin: vendor
-Forwarded: no
-
---- python-softlayer-3.2.0.orig/setup.py
-+++ python-softlayer-3.2.0/setup.py
-@@ -18,7 +18,7 @@ extra = {}
- requires = [
-     'six >= 1.7.0',
-     'prettytable >= 0.7.0',
--    'docopt == 0.6.1',
-+    'docopt >= 0.6.1',
-     'requests',
- ]
- 

Modified: packages/python-softlayer/trunk/debian/patches/series
===================================================================
--- packages/python-softlayer/trunk/debian/patches/series	2015-06-22 21:41:32 UTC (rev 33056)
+++ packages/python-softlayer/trunk/debian/patches/series	2015-06-23 04:00:47 UTC (rev 33057)
@@ -1,3 +1 @@
 1001-rename_sl.patch
-1002-longdesc.patch
-docopt-versions.patch