[Python-modules-commits] r4667 - in packages/pygments/trunk/debian (changelog control rules)

[piotr at users.alioth.debian.org]

    Date: Saturday, March 1, 2008 @ 12:54:45
  Author: piotr
Revision: 4667

* Switch to python-support
* Replace python-setuptools runtime dependency with new python-pkg-resources
  (closes: 468710)
* Compress binary package with bzip2
* Strip the "-1" from quilt's and setuptools' required build versions

Modified:
  packages/pygments/trunk/debian/changelog
  packages/pygments/trunk/debian/control
  packages/pygments/trunk/debian/rules

Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog	2008-03-01 12:33:43 UTC (rev 4666)
+++ packages/pygments/trunk/debian/changelog	2008-03-01 12:54:45 UTC (rev 4667)
@@ -1,10 +1,18 @@
-pygments (0.9-3) UNRELEASED; urgency=low
+pygments (0.9-3) unstable; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - uniforming Vcs-Browser field
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Thu, 03 Jan 2008 11:53:38 +0100
+  [ Piotr Ożarowski ]
+  * Switch to python-support
+  * Replace python-setuptools runtime dependency with new python-pkg-resources
+    (closes: 468710)
+  * Compress binary package with bzip2
+  * Strip the "-1" from quilt's and setuptools' required build versions
 
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 01 Mar 2008 13:37:39 +0100
+
 pygments (0.9-2) unstable; urgency=low
 
   * Install original pygmentize script (not touched by setuptools)

Modified: packages/pygments/trunk/debian/control
===================================================================
--- packages/pygments/trunk/debian/control	2008-03-01 12:33:43 UTC (rev 4666)
+++ packages/pygments/trunk/debian/control	2008-03-01 12:54:45 UTC (rev 4667)
@@ -3,9 +3,9 @@
 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), 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)
+Build-Depends: debhelper (>= 5), quilt (>=0.40)
+Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev, python-support (>= 0.6.4),
+ python-setuptools (>= 0.6b3), python-docutils, python-jinja (>= 1.0)
 Standards-Version: 3.7.3
 Homepage: http://pygments.pocoo.org/
 XS-Python-Version: >= 2.3
@@ -15,7 +15,7 @@
 Package: python-pygments
 Architecture: all
 Depends: ${python:Depends}
-Recommends: python-chardet, python-setuptools (>= 0.6b3-1)
+Recommends: python-chardet, python-pkg-resources
 XB-Python-Version: ${python:Versions}
 Description: syntax highlighting package written in Python
  Pygments aims to be a generic syntax highlighter for general use in all kinds

Modified: packages/pygments/trunk/debian/rules
===================================================================
--- packages/pygments/trunk/debian/rules	2008-03-01 12:33:43 UTC (rev 4666)
+++ packages/pygments/trunk/debian/rules	2008-03-01 12:54:45 UTC (rev 4667)
@@ -2,8 +2,6 @@
 
 #export DH_VERBOSE=1
 
-UPSTREAM_VERSION ?= $(shell dpkg-parsechangelog \
-	| sed -rne 's,^Version: ([^-]+).*,\1,p')
 PYVERS ?= $(shell pyversions -vr)
 
 include /usr/share/quilt/quilt.make
@@ -11,9 +9,9 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -rf build Pygments.egg-info build-indep
+	rm -rf build Pygments.egg-info
 	find . -name "*\.py[co]" -delete
-	dh_clean
+	dh_clean build-indep $(PYVERS:%=install-python%)
 
 build: patch build-indep
 
@@ -27,27 +25,25 @@
 install-python%:
 	python$* setup.py install --single-version-externally-managed \
 		--root debian/python-pygments
-	mv debian/python-pygments/usr/lib/python$*/site-packages/Pygments-${UPSTREAM_VERSION}-py$*.egg-info \
-	   debian/python-pygments/usr/lib/python$*/site-packages/Pygments-${UPSTREAM_VERSION}.egg-info
-	sed -i -e '1 s/python.*/python/' debian/python-pygments/usr/bin/pygmentize
+	touch $@
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installman
-	dh_install pygmentize /usr/bin/
-	dh_pycentral
-	dh_compress -X.py
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -i CHANGES
+	dh_installdocs -i
+	dh_installman -i
+	dh_install -i pygmentize /usr/bin/
+	dh_pysupport -i
+	dh_compress -i -X.py
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i -- -Z bzip2
 
 binary-arch:
 
 binary: binary-indep binary-arch
 
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install