r10533 - packages/trunk/libtpclient-py/debian

Mon Nov 16 02:43:36 UTC 2009

Author: bdefreese
Date: 2009-11-16 02:43:35 +0000 (Mon, 16 Nov 2009)
New Revision: 10533

Added:
   packages/trunk/libtpclient-py/debian/README.source
Modified:
   packages/trunk/libtpclient-py/debian/changelog
   packages/trunk/libtpclient-py/debian/control
   packages/trunk/libtpclient-py/debian/rules
Log:
  * Fix up debian/rules to build with Python2.6. (Closes: #547830).
    + Thanks to Jonathan Wiltshire for the patch.
  * Add README.source for quilt.
  * Bump Standards Version to 3.8.3. (No changes needed).


Added: packages/trunk/libtpclient-py/debian/README.source
===================================================================

--- packages/trunk/libtpclient-py/debian/README.source	                        (rev 0)
+++ packages/trunk/libtpclient-py/debian/README.source	2009-11-16 02:43:35 UTC (rev 10533)
@@ -0,0 +1,58 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+                break
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

Modified: packages/trunk/libtpclient-py/debian/changelog
===================================================================
--- packages/trunk/libtpclient-py/debian/changelog	2009-11-15 15:33:14 UTC (rev 10532)
+++ packages/trunk/libtpclient-py/debian/changelog	2009-11-16 02:43:35 UTC (rev 10533)
@@ -1,3 +1,13 @@
+libtpclient-py (0.3.2-2) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Fix up debian/rules to build with Python2.6. (Closes: #547830).
+    + Thanks to Jonathan Wiltshire for the patch.
+  * Add README.source for quilt.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+ -- Barry deFreese <bdefreese at debian.org>  Sun, 15 Nov 2009 21:40:39 -0500
+
 libtpclient-py (0.3.2-1) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/libtpclient-py/debian/control
===================================================================
--- packages/trunk/libtpclient-py/debian/control	2009-11-15 15:33:14 UTC (rev 10532)
+++ packages/trunk/libtpclient-py/debian/control	2009-11-16 02:43:35 UTC (rev 10533)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 5), quilt (>= 0.40)
 Build-Depends-Indep: python-support (>= 0.6.4), python-all-dev, python-tp-netlib (>= 0.2.4), python-pkg-resources
 XS-Python-Version: all
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.thousandparsec.net/tp/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/libtpclient-py/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/libtpclient-py/?op=log

Modified: packages/trunk/libtpclient-py/debian/rules
===================================================================
--- packages/trunk/libtpclient-py/debian/rules	2009-11-15 15:33:14 UTC (rev 10532)
+++ packages/trunk/libtpclient-py/debian/rules	2009-11-16 02:43:35 UTC (rev 10533)
@@ -5,6 +5,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
+-include /usr/share/python/python.mk
 
 PYVERS=$(shell pyversions -r)
 
@@ -37,19 +38,19 @@
 	dh_clean 
 	rm -rf build
 
-install: build
+install-%-stamp: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
 
-	set -e; \
-	for PYTHON in $(PYVERS); do \
-		$$PYTHON ./setup.py install --no-compile --root=debian/python-tp-client ; \
-	done
-
+	$* ./setup.py install --no-compile --root=debian/python-tp-client \
+		--prefix=/usr --install-lib=/usr/lib/$*/$(call py_sitename, $*)
 	#Don't ship tp/__init__.py it is in libtpproto which this depends on.
-	rm -f $(CURDIR)/debian/python-tp-client/usr/lib/python*/site-packages/tp/__init__.py
+	rm -f $(CURDIR)/debian/python-tp-client/usr/lib/$*/$(call py_sitename, $*)/tp/__init__.py
 
+	touch $@
+
+install: $(PYVERS:%=install-%-stamp)
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot


