r5897 - in packages/trunk/libtpclient-py/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-02-22 14:21:49 +0000 (Fri, 22 Feb 2008)
New Revision: 5897

Modified:
   packages/trunk/libtpclient-py/debian/changelog
   packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff
   packages/trunk/libtpclient-py/debian/patches/series
   packages/trunk/libtpclient-py/debian/rules
Log:
Update for new upstream


Modified: packages/trunk/libtpclient-py/debian/changelog
===================================================================
--- packages/trunk/libtpclient-py/debian/changelog	2008-02-22 08:32:08 UTC (rev 5896)
+++ packages/trunk/libtpclient-py/debian/changelog	2008-02-22 14:21:49 UTC (rev 5897)
@@ -1,10 +1,9 @@
-libtpclient-py (0.2.2-1) unstable; urgency=low
+libtpclient-py (0.3.0-1) unstable; urgency=low
 
   [ Barry deFreese ]
   * Initial release. (Closes: #463272).
   * Add quilt patch system.
   * 01_setuptools.diff - Use distutils.core for setup instead of setuptools.
-  * 02_no_pkg_resources.diff - Remove pkg_resources calls from setup.py.
   * Add VCS tags in control.
 
  -- Barry deFreese <bddebian at comcast.net>  Mon, 05 Nov 2007 21:33:27 -0500

Modified: packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff
===================================================================
--- packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff	2008-02-22 08:32:08 UTC (rev 5896)
+++ packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff	2008-02-22 14:21:49 UTC (rev 5897)
@@ -1,9 +1,9 @@
-diff -urN libtpclient-py-0.2.2.orig/setup.py libtpclient-py-0.2.2/setup.py
---- libtpclient-py-0.2.2.orig/setup.py	2007-11-06 21:29:14.000000000 -0500
-+++ libtpclient-py-0.2.2/setup.py	2007-11-06 21:31:34.000000000 -0500
-@@ -6,7 +6,7 @@
- from tp.client import version
- version = "%s.%s.%s" % version
+diff -urN libtpclient-py-0.3.0.orig/setup.py libtpclient-py-0.3.0/setup.py
+--- libtpclient-py-0.3.0.orig/setup.py	2008-01-31 21:57:28.000000000 -0500
++++ libtpclient-py-0.3.0/setup.py	2008-02-13 20:39:30.000000000 -0500
+@@ -12,7 +12,7 @@
+ from tp.client import __version__
+ version = "%s.%s.%s" % __version__[0:3]
  
 -from setuptools import setup
 +from distutils.core import setup

Modified: packages/trunk/libtpclient-py/debian/patches/series
===================================================================
--- packages/trunk/libtpclient-py/debian/patches/series	2008-02-22 08:32:08 UTC (rev 5896)
+++ packages/trunk/libtpclient-py/debian/patches/series	2008-02-22 14:21:49 UTC (rev 5897)
@@ -1,3 +1 @@
 01_setuptools.diff
-02_no_pkg_resources.diff
-

Modified: packages/trunk/libtpclient-py/debian/rules
===================================================================
--- packages/trunk/libtpclient-py/debian/rules	2008-02-22 08:32:08 UTC (rev 5896)
+++ packages/trunk/libtpclient-py/debian/rules	2008-02-22 14:21:49 UTC (rev 5897)
@@ -47,6 +47,8 @@
 		$$PYTHON ./setup.py install --no-compile --root=debian/python-tp-clientlib ; \
 	done
 
+	#Don't ship tp/__init__.py it is in libtpproto which this depends on.
+	rm -f $(CURDIR)/debian/python-tp-clientlib/usr/lib/python*/site-packages/tp/__init__.py
 
 binary-indep: build install
 	dh_testdir