[Python-modules-commits] r31442 - in packages/websocket-client/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Friday, November 14, 2014 @ 06:00:37
  Author: kitterman
Revision: 31442

* Team upload.
* Do not ship tests module in python3-websocket binary package either
  (Closes: #767400)
  - Thanks to Teemu Hukkanen for the patch

Added:
  packages/websocket-client/trunk/debian/patches/
  packages/websocket-client/trunk/debian/patches/no-ship-tests.diff
  packages/websocket-client/trunk/debian/patches/series
Modified:
  packages/websocket-client/trunk/debian/changelog
  packages/websocket-client/trunk/debian/rules

Modified: packages/websocket-client/trunk/debian/changelog
===================================================================
--- packages/websocket-client/trunk/debian/changelog	2014-11-14 03:52:02 UTC (rev 31441)
+++ packages/websocket-client/trunk/debian/changelog	2014-11-14 06:00:37 UTC (rev 31442)
@@ -1,3 +1,12 @@
+websocket-client (0.18.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Do not ship tests module in python3-websocket binary package either
+    (Closes: #767400)
+    - Thanks to Teemu Hukkanen for the patch
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 14 Nov 2014 00:50:57 -0500
+
 websocket-client (0.18.0-1) unstable; urgency=medium
 
   * Team upload.

Added: packages/websocket-client/trunk/debian/patches/no-ship-tests.diff
===================================================================
--- packages/websocket-client/trunk/debian/patches/no-ship-tests.diff	                        (rev 0)
+++ packages/websocket-client/trunk/debian/patches/no-ship-tests.diff	2014-11-14 06:00:37 UTC (rev 31442)
@@ -0,0 +1,21 @@
+Description: Don't install tests module since it conflicts with other packages
+Author: Teemu Hukkanen <tjhukkan at iki.fi>
+Bug-Debian: http://bugs.debian.org/767400
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott at kitterman.com>
+Last-Update: 2014-11-14
+
+--- websocket-client-0.18.0.orig/setup.py
++++ websocket-client-0.18.0/setup.py
+@@ -36,9 +36,8 @@ setup(
+     keywords='websockets',
+     scripts=["bin/wsdump.py"],
+     install_requires=install_requires,
+-    packages=["tests", "websocket"],
++    packages=["websocket"],
+     package_data={
+-        'tests': ['data/*.txt'],
+         'websocket': ["cacert.pem"]
+     },
+ )

Added: packages/websocket-client/trunk/debian/patches/series
===================================================================
--- packages/websocket-client/trunk/debian/patches/series	                        (rev 0)
+++ packages/websocket-client/trunk/debian/patches/series	2014-11-14 06:00:37 UTC (rev 31442)
@@ -0,0 +1 @@
+no-ship-tests.diff

Modified: packages/websocket-client/trunk/debian/rules
===================================================================
--- packages/websocket-client/trunk/debian/rules	2014-11-14 03:52:02 UTC (rev 31441)
+++ packages/websocket-client/trunk/debian/rules	2014-11-14 06:00:37 UTC (rev 31442)
@@ -8,5 +8,4 @@
 override_dh_install:
 	mv $(CURDIR)/debian/python-websocket/usr/bin/wsdump.py $(CURDIR)/debian/python-websocket/usr/bin/wsdump
 	mv $(CURDIR)/debian/python3-websocket/usr/bin/wsdump.py $(CURDIR)/debian/python3-websocket/usr/bin/wsdump3
-	rm -r $(CURDIR)/debian/python-websocket/usr/lib/python*/dist-packages/tests
 	dh_install