[Python-modules-commits] r3437 - in /packages/pygments/trunk/debian: changelog control patches/ patches/disable_ez_setup.patch patches/series rules

[piotr at users.alioth.debian.org]

Author: piotr
Date: Mon Oct 15 22:02:03 2007
New Revision: 3437

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3437
Log:
* New upstream release
* Add patch that disables ez_setup at build time
  - quilt added to Build-Depends

Added:
    packages/pygments/trunk/debian/patches/
    packages/pygments/trunk/debian/patches/disable_ez_setup.patch
    packages/pygments/trunk/debian/patches/series
Modified:
    packages/pygments/trunk/debian/changelog
    packages/pygments/trunk/debian/control
    packages/pygments/trunk/debian/rules

Modified: packages/pygments/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pygments/trunk/debian/changelog?rev=3437&op=diff
==============================================================================
--- packages/pygments/trunk/debian/changelog (original)
+++ packages/pygments/trunk/debian/changelog Mon Oct 15 22:02:03 2007
@@ -1,9 +1,12 @@
-pygments (0.8.1-2) UNRELEASED; urgency=low
+pygments (0.9-1) unstable; urgency=low
 
+  * New upstream release
+  * Add patch that disables ez_setup at build time
+    - quilt added to Build-Depends
   * Homepage field added
   * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now)
 
- -- Piotr Ożarowski <piotr at debian.org>  Sat,  6 Oct 2007 23:46:51 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 15 Oct 2007 22:37:08 +0200
 
 pygments (0.8.1-1) unstable; urgency=low
 

Modified: packages/pygments/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pygments/trunk/debian/control?rev=3437&op=diff
==============================================================================
--- packages/pygments/trunk/debian/control (original)
+++ packages/pygments/trunk/debian/control Mon Oct 15 22:02:03 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38)
+Build-Depends: debhelper (>= 5.0.38), quilt (>=0.40-1)
 Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-central (>= 0.5.6),
  python-setuptools (>= 0.6b3-1), python-docutils, python-jinja (>= 1.0)
 Standards-Version: 3.7.2

Added: packages/pygments/trunk/debian/patches/disable_ez_setup.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/pygments/trunk/debian/patches/disable_ez_setup.patch?rev=3437&op=file
==============================================================================
--- packages/pygments/trunk/debian/patches/disable_ez_setup.patch (added)
+++ packages/pygments/trunk/debian/patches/disable_ez_setup.patch Mon Oct 15 22:02:03 2007
@@ -1,0 +1,14 @@
+Index: pygments-0.9/setup.py
+===================================================================
+--- pygments-0.9.orig/setup.py
++++ pygments-0.9/setup.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
++#import ez_setup
++#ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
+ 
+ import pygments

Added: packages/pygments/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/python-modules/packages/pygments/trunk/debian/patches/series?rev=3437&op=file
==============================================================================
--- packages/pygments/trunk/debian/patches/series (added)
+++ packages/pygments/trunk/debian/patches/series Mon Oct 15 22:02:03 2007
@@ -1,0 +1,1 @@
+disable_ez_setup.patch

Modified: packages/pygments/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pygments/trunk/debian/rules?rev=3437&op=diff
==============================================================================
--- packages/pygments/trunk/debian/rules (original)
+++ packages/pygments/trunk/debian/rules Mon Oct 15 22:02:03 2007
@@ -3,18 +3,19 @@
 #export DH_VERBOSE=1
 
 UPSTREAM_VERSION ?= $(shell dpkg-parsechangelog \
-	| grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1 | cut -d '~' -f 1)
-
+	| sed -rne 's,^Version: ([^-]+).*,\1,p')
 PYVERS ?= $(shell pyversions -vr)
 
-clean:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf build Pygments.egg-info build-indep
-	find . -name "*\.py[co]" -exec rm {} \;
+	find . -name "*\.py[co]" -delete
 	dh_clean
 
-build: build-indep
+build: patch build-indep
 
 build-indep:
 	dh_testdir