[Python-modules-commits] r1792 - in /packages/quixote/trunk/debian: changelog control patches/00list patches/02-egg_support.dpatch rules

pox-guest at users.alioth.debian.org pox-guest at users.alioth.debian.org
Thu Feb 8 14:17:54 CET 2007


Author: pox-guest
Date: Thu Feb  8 14:17:54 2007
New Revision: 1792

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1792
Log:
* Egg support added:
* Build for all supported Python versions

Added:
    packages/quixote/trunk/debian/patches/02-egg_support.dpatch   (with props)
Modified:
    packages/quixote/trunk/debian/changelog
    packages/quixote/trunk/debian/control
    packages/quixote/trunk/debian/patches/00list
    packages/quixote/trunk/debian/rules

Modified: packages/quixote/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/debian/changelog?rev=1792&op=diff
==============================================================================
--- packages/quixote/trunk/debian/changelog (original)
+++ packages/quixote/trunk/debian/changelog Thu Feb  8 14:17:54 2007
@@ -1,3 +1,12 @@
+quixote (2.4-8) UNRELEASED; urgency=low
+
+  * Egg support added:
+    - Added python-setuptools to Build-Depends
+    - Added 02-egg_support patch
+  * Build for all supported Python versions
+
+ -- Piotr Ozarowski <ozarow at gmail.com>  Thu,  8 Feb 2007 13:31:54 +0100
+
 quixote (2.4-7) unstable; urgency=low
 
   * debian/control:

Modified: packages/quixote/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/debian/control?rev=1792&op=diff
==============================================================================
--- packages/quixote/trunk/debian/control (original)
+++ packages/quixote/trunk/debian/control Thu Feb  8 14:17:54 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Oleksandr Moskalenko <malex at debian.org>
 Uploaders: Neil Schemenauer <nas at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: dpatch, debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3)
+Build-Depends: dpatch, debhelper (>= 5.0.37.1), python-all-dev (>= 2.3.5-11), python-support (>= 0.5.3), python-setuptools (>= 0.6b3-1)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/quixote/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/?op=log

Modified: packages/quixote/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/debian/patches/00list?rev=1792&op=diff
==============================================================================
--- packages/quixote/trunk/debian/patches/00list (original)
+++ packages/quixote/trunk/debian/patches/00list Thu Feb  8 14:17:54 2007
@@ -1,1 +1,2 @@
 01-ptl_compile.py.dpatch
+02-egg_support.dpatch

Added: packages/quixote/trunk/debian/patches/02-egg_support.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/debian/patches/02-egg_support.dpatch?rev=1792&op=file
==============================================================================
--- packages/quixote/trunk/debian/patches/02-egg_support.dpatch (added)
+++ packages/quixote/trunk/debian/patches/02-egg_support.dpatch Thu Feb  8 14:17:54 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-egg_support.dpatch by Piotr Ożarowski <ozarow at gmail.com>
+
+ at DPATCH@
+diff -urNad quixote-2.4~/setup.py quixote-2.4/setup.py
+--- quixote-2.4~/setup.py	2007-01-25 20:26:49.000000000 +0100
++++ quixote-2.4/setup.py	2007-02-08 13:30:45.000000000 +0100
+@@ -6,6 +6,7 @@
+ 
+ import sys, os
+ from distutils import core
++from setuptools import setup
+ from distutils.extension import Extension
+ from ptl.qx_distutils import qx_build_py
+ 
+@@ -60,4 +61,4 @@
+         kw['download_url'] = ('http://www.mems-exchange.org/software/files'
+                               '/quixote/Quixote-%s.tar.gz' % kw['version'])
+ 
+-core.setup(**kw)
++setup(**kw)

Propchange: packages/quixote/trunk/debian/patches/02-egg_support.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/quixote/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/quixote/trunk/debian/rules?rev=1792&op=diff
==============================================================================
--- packages/quixote/trunk/debian/rules (original)
+++ packages/quixote/trunk/debian/rules Thu Feb  8 14:17:54 2007
@@ -4,6 +4,11 @@
 
 package=python-quixote
 DEBIAN_DIR = $(shell pwd)/debian
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
+	| grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+PYVER=$(shell pyversions -vd)
+PYVERS=$(shell pyversions -vr)
+
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -18,9 +23,11 @@
 	dpatch apply-all
 	touch patch-stamp
 
-build-stamp:
+build-stamp: $(PYVERS:%=build-ext-%)
+	touch $@
+build-ext-%:
 	dh_testdir
-	python setup.py build -g
+	python$* setup.py build -g
 	touch $@
 
 unpatch:
@@ -31,7 +38,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -rf build
+	rm -rf build build-ext-*
+	-rm -rf Quixote.egg-info
 	find . -name '*.pyc' -exec rm {} \;
 	dh_clean
 
@@ -44,7 +52,11 @@
 install: build install-prereq
 	python setup.py install \
 		--no-compile \
+		--single-version-externally-managed \
 		--root $(DEBIAN_DIR)/$(package)
+	# share Egg dir
+	mv debian/$(package)/usr/lib/python$(PYVER)/site-packages/Quixote-${DEB_UPSTREAM_VERSION}-py$(PYVER).egg-info \
+	   debian/$(package)/usr/lib/python$(PYVER)/site-packages/Quixote-${DEB_UPSTREAM_VERSION}.egg-info
 
 binary-indep: build install
 




More information about the Python-modules-commits mailing list