[Python-modules-commits] r23732 - in packages/circuits/trunk/debian (changelog control rules)

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

    Date: Wednesday, March 20, 2013 @ 03:05:28
  Author: eriol-guest
Revision: 23732

Removed embedded copy of python-six

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/control
  packages/circuits/trunk/debian/rules

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2013-03-19 16:14:43 UTC (rev 23731)
+++ packages/circuits/trunk/debian/changelog	2013-03-20 03:05:28 UTC (rev 23732)
@@ -1,6 +1,8 @@
 circuits (2.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/control
+    - Added python(3)-six to Build-Depends and Depends fields
   * debian/patches/01_disable_sphinxcontrib-bitbucket.patch
     - Renamed into 01_disable_sphinxcontrib_extensions.patch
   * debian/patches/01_disable_sphinxcontrib_extensions.patch
@@ -8,9 +10,11 @@
       because it's not packaged for Debian and it is used to track generated
       html files with Google Analytics web service
   * debian/patches/03_force-localhost-as-host-name.patch
-    - Refreshed 
+    - Refreshed
+  * debian/rules
+    - Used override_dh_auto_configure to remove embedded copy of python-six
 
- -- Daniele Tricoli <eriol at mornie.org>  Tue, 19 Mar 2013 03:06:16 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 20 Mar 2013 03:59:02 +0100
 
 circuits (2.0.1-1) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/control
===================================================================
--- packages/circuits/trunk/debian/control	2013-03-19 16:14:43 UTC (rev 23731)
+++ packages/circuits/trunk/debian/control	2013-03-20 03:05:28 UTC (rev 23732)
@@ -11,10 +11,12 @@
  python-pyinotify,
  python-pytest,
  python-setuptools,
+ python-six,
  python-sphinx (>= 1.0.7+dfsg),
  python3-all (>= 3.1.2-7~),
  python3-pytest,
  python3-setuptools,
+ python3-six,
 Standards-Version: 3.9.4
 Homepage: http://bitbucket.org/prologic/circuits/
 X-Python-Version: >= 2.6
@@ -29,6 +31,7 @@
  ${python:Depends},
  python-pkg-resources,
  python-pyinotify,
+ python-six,
 Recommends:
  python-greenlet,
  python-imaging,
@@ -56,6 +59,7 @@
  ${misc:Depends},
  ${python3:Depends},
  python3-pkg-resources,
+ python3-six,
 Recommends: python3-serial
 Description: event-driven framework with a component architecture (Python3 version)
  circuits is an event-driven framework with a focus on Component

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2013-03-19 16:14:43 UTC (rev 23731)
+++ packages/circuits/trunk/debian/rules	2013-03-20 03:05:28 UTC (rev 23732)
@@ -15,6 +15,9 @@
 	find . -name *.pyc -delete
 	find . -name *.coverage.* -delete
 
+override_dh_auto_configure:
+	rm -f circuits/six.py
+
 override_dh_auto_build:
 	set -e -x; \
 	for python in $(PY2VERS); do \