Author: bddebian-guest Date: 2007-11-07 03:07:17 +0000 (Wed, 07 Nov 2007) New Revision: 4583
Added: packages/trunk/libtpclient-py/debian/patches/ packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff packages/trunk/libtpclient-py/debian/patches/02_no_pkg_resources.diff packages/trunk/libtpclient-py/debian/patches/series Modified: packages/trunk/libtpclient-py/debian/changelog packages/trunk/libtpclient-py/debian/control packages/trunk/libtpclient-py/debian/rules Log: Packaging cleanup and fixes * 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 Modified: packages/trunk/libtpclient-py/debian/changelog =================================================================== --- packages/trunk/libtpclient-py/debian/changelog 2007-11-06 22:41:15 UTC (rev 4582) +++ packages/trunk/libtpclient-py/debian/changelog 2007-11-07 03:07:17 UTC (rev 4583) @@ -2,6 +2,9 @@ [ Barry deFreese ] * Initial release + * 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 * Work in progress.. -- Barry deFreese <[EMAIL PROTECTED]> Mon, 05 Nov 2007 21:33:27 -0500 Modified: packages/trunk/libtpclient-py/debian/control =================================================================== --- packages/trunk/libtpclient-py/debian/control 2007-11-06 22:41:15 UTC (rev 4582) +++ packages/trunk/libtpclient-py/debian/control 2007-11-07 03:07:17 UTC (rev 4583) @@ -3,13 +3,15 @@ Priority: extra Maintainer: Debian Games Team <[EMAIL PROTECTED]> Uploaders: Barry deFreese <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), python-all-dev, python-support (>= 0.6.4), python-setuptools (>= 0.6) +Build-Depends: debhelper (>= 5), quilt (>= 0.40), python-all-dev +Build-Depends-Indep: python-support (>= 0.6.4) XS-Python-Version: all Standards-Version: 3.7.2 +Homepage: http://www.thousandparsec.net/tp/ Package: python-tp-clientlib -Architecture: any -Depends: ${python:Depends} +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} XB-Python-Version: ${python:Versions} Description: Thousand Parsec python client library A library of Python code for Clients to support Thousand Parsec. Added: packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff =================================================================== --- packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff (rev 0) +++ packages/trunk/libtpclient-py/debian/patches/01_setuptools.diff 2007-11-07 03:07:17 UTC (rev 4583) @@ -0,0 +1,12 @@ +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 + +-from setuptools import setup ++from distutils.core import setup + + setup( + name ="libtpclient-py", Added: packages/trunk/libtpclient-py/debian/patches/02_no_pkg_resources.diff =================================================================== --- packages/trunk/libtpclient-py/debian/patches/02_no_pkg_resources.diff (rev 0) +++ packages/trunk/libtpclient-py/debian/patches/02_no_pkg_resources.diff 2007-11-07 03:07:17 UTC (rev 4583) @@ -0,0 +1,13 @@ +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:34:06.000000000 -0500 +@@ -1,7 +1,7 @@ + #!/usr/bin/env python + +-import pkg_resources +-pkg_resources.require('libtpclient-py') ++#import pkg_resources ++#pkg_resources.require('libtpclient-py') + + from tp.client import version + version = "%s.%s.%s" % version Added: packages/trunk/libtpclient-py/debian/patches/series =================================================================== --- packages/trunk/libtpclient-py/debian/patches/series (rev 0) +++ packages/trunk/libtpclient-py/debian/patches/series 2007-11-07 03:07:17 UTC (rev 4583) @@ -0,0 +1,3 @@ +01_setuptools.diff +02_no_pkg_resources.diff + Modified: packages/trunk/libtpclient-py/debian/rules =================================================================== --- packages/trunk/libtpclient-py/debian/rules 2007-11-06 22:41:15 UTC (rev 4582) +++ packages/trunk/libtpclient-py/debian/rules 2007-11-07 03:07:17 UTC (rev 4583) @@ -4,11 +4,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -PYDEF=$(shell pyversions -d) +include /usr/share/quilt/quilt.make + PYVERS=$(shell pyversions -r) build: build-stamp -build-stamp: +build-stamp: patch dh_testdir set -e; \ @@ -18,15 +19,21 @@ touch $@ -clean: +_clean: $(QUILT_STAMPFN) dh_testdir dh_testroot rm -rf build-stamp - -find debian -name '*.pyc' | xargs rm -f - -find debian -name '*.pyo' | xargs rm -f + set -e; \ + for PYTHON in $(PYVERS); do \ + $$PYTHON setup.py clean; \ + done + find ./ -name '*.py[co]' -delete + + +clean: _clean unpatch dh_clean rm -rf build @@ -34,37 +41,28 @@ dh_testdir dh_testroot dh_clean -k - dh_installdirs set -e; \ for PYTHON in $(PYVERS); do \ - $$PYTHON ./setup.py install --root=debian/python-tp-clientlib \ - --single-version-externally-managed ; \ + $$PYTHON ./setup.py install --root=debian/python-tp-clientlib ; \ done - -find debian -name '*.pyc' | xargs rm -f - -find debian -name '*.pyo' | xargs rm -f - binary-indep: build install -# We have nothing to do by default. - -binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs - dh_installexamples - dh_link - dh_strip dh_compress dh_fixperms dh_pysupport dh_installdeb - dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb +binary-arch: build install +# We have nothing to do by default. + binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
