r4582 - in packages/trunk/libtpproto-py/debian: . patches
Barry deFreese
bddebian-guest at alioth.debian.org
Tue Nov 6 22:41:15 UTC 2007
Author: bddebian-guest
Date: 2007-11-06 22:41:15 +0000 (Tue, 06 Nov 2007)
New Revision: 4582
Added:
packages/trunk/libtpproto-py/debian/patches/
packages/trunk/libtpproto-py/debian/patches/01_setuptools.diff
packages/trunk/libtpproto-py/debian/patches/02_no_pkg_resources.diff
packages/trunk/libtpproto-py/debian/patches/series
Modified:
packages/trunk/libtpproto-py/debian/changelog
packages/trunk/libtpproto-py/debian/control
packages/trunk/libtpproto-py/debian/rules
Log:
Package clean-up
* 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/libtpproto-py/debian/changelog
===================================================================
--- packages/trunk/libtpproto-py/debian/changelog 2007-11-06 21:27:26 UTC (rev 4581)
+++ packages/trunk/libtpproto-py/debian/changelog 2007-11-06 22:41:15 UTC (rev 4582)
@@ -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 <bddebian at comcast.net> Mon, 05 Nov 2007 21:33:27 -0500
Modified: packages/trunk/libtpproto-py/debian/control
===================================================================
--- packages/trunk/libtpproto-py/debian/control 2007-11-06 21:27:26 UTC (rev 4581)
+++ packages/trunk/libtpproto-py/debian/control 2007-11-06 22:41:15 UTC (rev 4582)
@@ -3,13 +3,16 @@
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>
-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-netlib
-Architecture: any
-Depends: ${python:Depends}
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core
+Recommends: python-pyopenssl
XB-Python-Version: ${python:Versions}
Description: Thousand Parsec python protocol library
A library of Python code for both Servers and Clients to support
Added: packages/trunk/libtpproto-py/debian/patches/01_setuptools.diff
===================================================================
--- packages/trunk/libtpproto-py/debian/patches/01_setuptools.diff (rev 0)
+++ packages/trunk/libtpproto-py/debian/patches/01_setuptools.diff 2007-11-06 22:41:15 UTC (rev 4582)
@@ -0,0 +1,12 @@
+diff -urN libtpproto-py-0.2.2.orig/setup.py libtpproto-py-0.2.2/setup.py
+--- libtpproto-py-0.2.2.orig/setup.py 2007-11-06 14:04:00.000000000 -0500
++++ libtpproto-py-0.2.2/setup.py 2007-11-06 14:04:44.000000000 -0500
+@@ -6,7 +6,7 @@
+ from tp.netlib import version
+ version = "%s.%s.%s" % version
+
+-from setuptools import setup
++from distutils.core import setup
+
+ setup(
+ name ="libtpproto-py",
Added: packages/trunk/libtpproto-py/debian/patches/02_no_pkg_resources.diff
===================================================================
--- packages/trunk/libtpproto-py/debian/patches/02_no_pkg_resources.diff (rev 0)
+++ packages/trunk/libtpproto-py/debian/patches/02_no_pkg_resources.diff 2007-11-06 22:41:15 UTC (rev 4582)
@@ -0,0 +1,13 @@
+diff -urN libtpproto-py-0.2.2.orig/setup.py libtpproto-py-0.2.2/setup.py
+--- libtpproto-py-0.2.2.orig/setup.py 2007-11-06 16:07:43.000000000 -0500
++++ libtpproto-py-0.2.2/setup.py 2007-11-06 16:08:26.000000000 -0500
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+
+-import pkg_resources
+-pkg_resources.require('libtpproto-py')
++#import pkg_resources
++#pkg_resources.require('libtpproto-py')
+
+ from tp.netlib import version
+ version = "%s.%s.%s" % version
Added: packages/trunk/libtpproto-py/debian/patches/series
===================================================================
--- packages/trunk/libtpproto-py/debian/patches/series (rev 0)
+++ packages/trunk/libtpproto-py/debian/patches/series 2007-11-06 22:41:15 UTC (rev 4582)
@@ -0,0 +1,3 @@
+01_setuptools.diff
+02_no_pkg_resources.diff
+
Modified: packages/trunk/libtpproto-py/debian/rules
===================================================================
--- packages/trunk/libtpproto-py/debian/rules 2007-11-06 21:27:26 UTC (rev 4581)
+++ packages/trunk/libtpproto-py/debian/rules 2007-11-06 22:41:15 UTC (rev 4582)
@@ -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,20 @@
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 +40,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-netlib \
- --single-version-externally-managed ; \
+ $$PYTHON ./setup.py install --root=debian/python-tp-netlib ; \
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
More information about the Pkg-games-commits
mailing list