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

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

    Date: Saturday, March 23, 2013 @ 16:43:34
  Author: eriol-guest
Revision: 23774

Reverted last commit since circuits' upstream modified the embedded copy
of python-six. However circuits' upstream made also a pull request to include
these changes into python-six so, hopefully, it will be possible to remove the
embedded copy soon.

For details: 
https://bitbucket.org/gutworth/six/pull-request/9/various-additions-that-circuits-uses/diff

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-23 13:10:26 UTC (rev 23773)
+++ packages/circuits/trunk/debian/changelog	2013-03-23 16:43:34 UTC (rev 23774)
@@ -1,8 +1,6 @@
-circuits (2.1.0-1) UNRELEASED; urgency=low
+circuits (2.1.0-2) 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
@@ -11,10 +9,8 @@
       html files with Google Analytics web service
   * debian/patches/03_force-localhost-as-host-name.patch
     - Refreshed
-  * debian/rules
-    - Used override_dh_auto_configure to remove embedded copy of python-six
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 20 Mar 2013 03:59:02 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Sat, 23 Mar 2013 17:24:48 +0100
 
 circuits (2.0.1-1) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/control
===================================================================
--- packages/circuits/trunk/debian/control	2013-03-23 13:10:26 UTC (rev 23773)
+++ packages/circuits/trunk/debian/control	2013-03-23 16:43:34 UTC (rev 23774)
@@ -11,12 +11,10 @@
  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

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2013-03-23 13:10:26 UTC (rev 23773)
+++ packages/circuits/trunk/debian/rules	2013-03-23 16:43:34 UTC (rev 23774)
@@ -15,9 +15,6 @@
 	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 \