Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package python-stem

Fix for RC bug #767555

unblock python-stem/1.2.2-1.1
diff -Nru python-stem-1.2.2/debian/changelog python-stem-1.2.2/debian/changelog
--- python-stem-1.2.2/debian/changelog	2014-07-02 13:33:10.000000000 -0400
+++ python-stem-1.2.2/debian/changelog	2014-11-10 10:45:06.000000000 -0500
@@ -1,3 +1,15 @@
+python-stem (1.2.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: Remove /usr/bin/tor-prompt from python3-stem due to file
+    conflict with python-stem (Closes: #767555)
+    - Since tor-prompt uses /usr/bin/env python, it will always execute with
+      python, not python3, so shipping it with python3-stem didn't work in any
+      case
+  * debian/control: Add versioned breaks for python3-stem << 1.2.2-1.1~
+
+ -- Scott Kitterman <sc...@kitterman.com>  Mon, 10 Nov 2014 10:27:48 -0500
+
 python-stem (1.2.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru python-stem-1.2.2/debian/control python-stem-1.2.2/debian/control
--- python-stem-1.2.2/debian/control	2014-07-02 13:32:21.000000000 -0400
+++ python-stem-1.2.2/debian/control	2014-11-10 10:45:24.000000000 -0500
@@ -12,6 +12,7 @@
 Package: python-stem
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
+Breaks: python3-stem (<< 1.2.2-1.1~)
 Description: Tor control library for Python
  Stem is a TorCtl successor, a Python Tor controller with extensions to support
  path building and various constraints on node and path selection, as well as
diff -Nru python-stem-1.2.2/debian/rules python-stem-1.2.2/debian/rules
--- python-stem-1.2.2/debian/rules	2014-07-02 12:37:18.000000000 -0400
+++ python-stem-1.2.2/debian/rules	2014-11-10 10:38:07.000000000 -0500
@@ -23,6 +23,7 @@
 	for py in $(PY3VERS); do \
 	$$py setup.py install --root debian/python3-stem \
 	--install-layout=deb; \
+	rm -rf $(CURDIR)/debian/python3-stem/usr/bin; \
 	done; \
 	
 override_dh_auto_clean:

Reply via email to