[Python-modules-commits] r31871 - in packages/python-softlayer/trunk (19 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Sat Feb 14 20:35:05 UTC 2015
Date: Saturday, February 14, 2015 @ 20:35:04
Author: kitterman
Revision: 31871
[svn-inject] Applying Debian modifications (3.2.0-2) to trunk
Added:
packages/python-softlayer/trunk/debian/
packages/python-softlayer/trunk/debian/changelog
packages/python-softlayer/trunk/debian/compat
packages/python-softlayer/trunk/debian/control
packages/python-softlayer/trunk/debian/copyright
packages/python-softlayer/trunk/debian/gbp.conf
packages/python-softlayer/trunk/debian/patches/
packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch
packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch
packages/python-softlayer/trunk/debian/patches/docopt-versions.patch
packages/python-softlayer/trunk/debian/patches/series
packages/python-softlayer/trunk/debian/python-softlayer.postinst
packages/python-softlayer/trunk/debian/python-softlayer.prerm
packages/python-softlayer/trunk/debian/python3-softlayer.postinst
packages/python-softlayer/trunk/debian/python3-softlayer.prerm
packages/python-softlayer/trunk/debian/rules
packages/python-softlayer/trunk/debian/source/
packages/python-softlayer/trunk/debian/source/format
packages/python-softlayer/trunk/debian/watch
Property changes on: packages/python-softlayer/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/python-softlayer/trunk/debian/changelog
===================================================================
--- packages/python-softlayer/trunk/debian/changelog (rev 0)
+++ packages/python-softlayer/trunk/debian/changelog 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,48 @@
+python-softlayer (3.2.0-2) unstable; urgency=medium
+
+ * Fix docopt version in requires to SL will start (Closes: #778344)
+ * Fix python-softlayer postinst/postrm file names to that alternatives works
+ and SL is properly provided by python-softlayer (Closes: #778279)
+ * Agreed maintainer change to Debian Python Modules Team (Closes: #777337)
+ * Add Vcs-* for DPMT repository
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 13 Feb 2015 16:13:11 -0500
+
+python-softlayer (3.2.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Refresh patch set.
+ * Drop dependency on python-tox, not needed at all.
+ * Refresh patches.
+ * Add patch to fix FTBFS.
+ * Add Python 3 support.
+ * Handle /usr/bin/SL via update-alternatives.
+
+ -- Alessio Treglia <alessio at debian.org> Mon, 14 Jul 2014 14:41:50 +0100
+
+python-softlayer (3.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Alessio Treglia <alessio at debian.org> Mon, 28 Apr 2014 12:35:22 +0100
+
+python-softlayer (3.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update examples, example.py is no longer provided.
+ * Fix debian/watch.
+ * Bump Standards.
+
+ -- Alessio Treglia <alessio at debian.org> Tue, 11 Mar 2014 09:35:46 +0000
+
+python-softlayer (3.0.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Alessio Treglia <alessio at debian.org> Sun, 24 Nov 2013 23:43:01 +0000
+
+python-softlayer (3.0.0-1) unstable; urgency=low
+
+ * Initial release. (Closes: #725912)
+
+ -- Alessio Treglia <alessio at debian.org> Wed, 09 Oct 2013 23:29:25 +0100
Added: packages/python-softlayer/trunk/debian/compat
===================================================================
--- packages/python-softlayer/trunk/debian/compat (rev 0)
+++ packages/python-softlayer/trunk/debian/compat 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1 @@
+9
Added: packages/python-softlayer/trunk/debian/control
===================================================================
--- packages/python-softlayer/trunk/debian/control (rev 0)
+++ packages/python-softlayer/trunk/debian/control 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,58 @@
+Source: python-softlayer
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Scott Kitterman <scott at kitterman.com>
+Build-Depends:
+ debhelper (>= 9~),
+ dh-python,
+ python-all,
+ python-setuptools,
+ python3-all,
+ python3-setuptools
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.3
+Standards-Version: 3.9.5
+Homepage: http://github.com/softlayer/softlayer-api-python-client
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-softlayer/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-softlayer/trunk/
+
+Package: python-softlayer
+Architecture: all
+Depends:
+ python-docopt,
+ python-mock,
+ python-nose,
+ python-prettytable,
+ python-requests,
+ python-six,
+ ${misc:Depends},
+ ${python:Depends}
+Description: Python client for SoftLayer API (Python 2)
+ This library provides a simple interface to interact with SoftLayer's
+ XML-RPC API and provides support for many of SoftLayer API's features
+ like object masks and a command-line interface that can be used to
+ access various SoftLayer services using the API.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-softlayer
+Architecture: all
+Breaks: python-softlayer (<= 3.1.0-1)
+Replaces: python-softlayer (<= 3.1.0-1)
+Depends:
+ python3-docopt,
+ python3-mock,
+ python3-nose,
+ python3-prettytable,
+ python3-requests,
+ python3-six,
+ ${misc:Depends},
+ ${python3:Depends}
+Description: Python client for SoftLayer API (Python 3)
+ This library provides a simple interface to interact with SoftLayer's
+ XML-RPC API and provides support for many of SoftLayer API's features
+ like object masks and a command-line interface that can be used to
+ access various SoftLayer services using the API.
+ .
+ This is the Python 3 version of the package.
Added: packages/python-softlayer/trunk/debian/copyright
===================================================================
--- packages/python-softlayer/trunk/debian/copyright (rev 0)
+++ packages/python-softlayer/trunk/debian/copyright 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SoftLayer API Python Client
+Upstream-Contact: SoftLayer Technologies, Inc.
+Source: https://github.com/softlayer/softlayer-api-python-client/releases
+
+Files: *
+Copyright: 2013 SoftLayer Technologies, Inc. All rights reserved.
+License: Expat
+
+Files: debian/*
+Copyright: 2013 Alessio Treglia <alessio at debian.org>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
Added: packages/python-softlayer/trunk/debian/gbp.conf
===================================================================
--- packages/python-softlayer/trunk/debian/gbp.conf (rev 0)
+++ packages/python-softlayer/trunk/debian/gbp.conf 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
Added: packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch (rev 0)
+++ packages/python-softlayer/trunk/debian/patches/1001-rename_sl.patch 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,18 @@
+Description: Rename launcher script to avoid namespace conflicts.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
+---
+ 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',
+ entry_points={
+ 'console_scripts': [
+- 'sl = SoftLayer.CLI.core:main',
++ 'SL = SoftLayer.CLI.core:main',
+ ],
+ },
+ package_data={
Added: packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch (rev 0)
+++ packages/python-softlayer/trunk/debian/patches/1002-longdesc.patch 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,25 @@
+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',
Added: packages/python-softlayer/trunk/debian/patches/docopt-versions.patch
===================================================================
--- packages/python-softlayer/trunk/debian/patches/docopt-versions.patch (rev 0)
+++ packages/python-softlayer/trunk/debian/patches/docopt-versions.patch 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,17 @@
+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',
+ ]
+
Added: packages/python-softlayer/trunk/debian/patches/series
===================================================================
--- packages/python-softlayer/trunk/debian/patches/series (rev 0)
+++ packages/python-softlayer/trunk/debian/patches/series 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,3 @@
+1001-rename_sl.patch
+1002-longdesc.patch
+docopt-versions.patch
Added: packages/python-softlayer/trunk/debian/python-softlayer.postinst
===================================================================
--- packages/python-softlayer/trunk/debian/python-softlayer.postinst (rev 0)
+++ packages/python-softlayer/trunk/debian/python-softlayer.postinst 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+PYTHONVER=2
+ALT_NAME=SL
+ALT_LINK="/usr/bin/${ALT_NAME}"
+ALT_PATH="/usr/lib/python${PYTHONVER}-softlayer/${ALT_NAME}"
+
+case "$1" in
+ configure)
+ update-alternatives --quiet --install \
+ "${ALT_LINK}" "${ALT_NAME}" "${ALT_PATH}" 25
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/python-softlayer/trunk/debian/python-softlayer.prerm
===================================================================
--- packages/python-softlayer/trunk/debian/python-softlayer.prerm (rev 0)
+++ packages/python-softlayer/trunk/debian/python-softlayer.prerm 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+PYTHONVER=2
+ALT_NAME=SL
+ALT_LINK="/usr/bin/${ALT_NAME}"
+ALT_PATH="/usr/lib/python${PYTHONVER}-softlayer/${ALT_NAME}"
+
+case "$1" in
+ upgrade)
+ ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove "${ALT_NAME}" "${ALT_PATH}"
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/python-softlayer/trunk/debian/python3-softlayer.postinst
===================================================================
--- packages/python-softlayer/trunk/debian/python3-softlayer.postinst (rev 0)
+++ packages/python-softlayer/trunk/debian/python3-softlayer.postinst 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+PYTHONVER=3
+ALT_NAME=SL
+ALT_LINK="/usr/bin/${ALT_NAME}"
+ALT_PATH="/usr/lib/python${PYTHONVER}-softlayer/${ALT_NAME}"
+
+case "$1" in
+ configure)
+ update-alternatives --quiet --install \
+ "${ALT_LINK}" "${ALT_NAME}" "${ALT_PATH}" 50
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
\ No newline at end of file
Added: packages/python-softlayer/trunk/debian/python3-softlayer.prerm
===================================================================
--- packages/python-softlayer/trunk/debian/python3-softlayer.prerm (rev 0)
+++ packages/python-softlayer/trunk/debian/python3-softlayer.prerm 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+PYTHONVER=3
+ALT_NAME=SL
+ALT_LINK="/usr/bin/${ALT_NAME}"
+ALT_PATH="/usr/lib/python${PYTHONVER}-softlayer/${ALT_NAME}"
+
+case "$1" in
+ upgrade)
+ ;;
+ remove|failed-upgrade|deconfigure)
+ update-alternatives --remove "${ALT_NAME}" "${ALT_PATH}"
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
\ No newline at end of file
Added: packages/python-softlayer/trunk/debian/rules
===================================================================
--- packages/python-softlayer/trunk/debian/rules (rev 0)
+++ packages/python-softlayer/trunk/debian/rules 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+export PYBUILD_NAME=softlayer
+export PYBUILD_INSTALL_ARGS_python2=--install-scripts=/usr/lib/python2-softlayer/
+export PYBUILD_INSTALL_ARGS_python3=--install-scripts=/usr/lib/python3-softlayer/
+
+%:
+ dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+ rm -rf *.egg-info
+
+# Disabled as they require multiple packages to run
+override_dh_auto_test:
Property changes on: packages/python-softlayer/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/python-softlayer/trunk/debian/source/format
===================================================================
--- packages/python-softlayer/trunk/debian/source/format (rev 0)
+++ packages/python-softlayer/trunk/debian/source/format 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/python-softlayer/trunk/debian/watch
===================================================================
--- packages/python-softlayer/trunk/debian/watch (rev 0)
+++ packages/python-softlayer/trunk/debian/watch 2015-02-14 20:35:04 UTC (rev 31871)
@@ -0,0 +1,3 @@
+version=3
+https://github.com/softlayer/softlayer-api-python-client/tags \
+ .*/v(\d[\d\.]*)\.tar\.gz
More information about the Python-modules-commits
mailing list