[Python-modules-commits] r2094 - in /packages/genshi/trunk/debian: changelog control control.in rules

[arnau-guest at users.alioth.debian.org]

Author: arnau-guest
Date: Mon Apr 16 16:45:05 2007
New Revision: 2094

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2094
Log:
Ready for upload (0.3.6-2)

Modified:
    packages/genshi/trunk/debian/changelog
    packages/genshi/trunk/debian/control
    packages/genshi/trunk/debian/control.in
    packages/genshi/trunk/debian/rules

Modified: packages/genshi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/genshi/trunk/debian/changelog?rev=2094&op=diff
==============================================================================
--- packages/genshi/trunk/debian/changelog (original)
+++ packages/genshi/trunk/debian/changelog Mon Apr 16 16:45:05 2007
@@ -1,3 +1,11 @@
+genshi (0.3.6-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Remove useless python-markup transition package.
+  * Add Provides against python-markup.
+
+ -- Arnaud Fontaine <arnaud at andesi.org>  Mon, 16 Apr 2007 17:49:03 +0200
+
 genshi (0.3.6-1) experimental; urgency=low
 
   [ Arnaud Fontaine ]

Modified: packages/genshi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/genshi/trunk/debian/control?rev=2094&op=diff
==============================================================================
--- packages/genshi/trunk/debian/control (original)
+++ packages/genshi/trunk/debian/control Mon Apr 16 16:45:05 2007
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Arnaud Fontaine <arnaud at andesi.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.3.2), python-setuptools (>= 0.6b3-1)
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.3.2)
+Build-Depends-Indep: python-setuptools (>= 0.6b3-1)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/genshi/trunk/
 
 Package: python-genshi
 Architecture: all
 Depends: ${python:Depends}
+Provides: python-markup
 Replaces: python-markup (<< 0.3.4)
 Conflicts: python-markup (<< 0.3.4)
 Description: python XML-based template engine
@@ -19,11 +21,3 @@
  language, which is heavily inspired by Kid.
  .
   Homepage: http://genshi.edgewall.org/
-
-Package: python-markup
-Depends: python-genshi
-Architecture: all
-Description: transitional dummy package
- This  dummy package  provides  a transition  from  markup to  genshi,
- renamed by the  upstream author. It may be  removed after the upgrade
- has completed.

Modified: packages/genshi/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/python-modules/packages/genshi/trunk/debian/control.in?rev=2094&op=diff
==============================================================================
--- packages/genshi/trunk/debian/control.in (original)
+++ packages/genshi/trunk/debian/control.in Mon Apr 16 16:45:05 2007
@@ -3,12 +3,14 @@
 Priority: optional
 Maintainer: Arnaud Fontaine <arnaud at andesi.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: @cdbs@, python-setuptools (>= 0.6b3-1)
+Build-Depends: @cdbs@
+Build-Depends-Indep: python-setuptools (>= 0.6b3-1)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/genshi/trunk/
 
 Package: python-genshi
 Architecture: all
+Provides: python-markup
 Depends: ${python:Depends}
 Replaces: python-markup (<< 0.3.4)
 Conflicts: python-markup (<< 0.3.4)
@@ -19,11 +21,3 @@
  language, which is heavily inspired by Kid.
  .
   Homepage: http://genshi.edgewall.org/
-
-Package: python-markup
-Depends: python-genshi
-Architecture: all
-Description: transitional dummy package
- This  dummy package  provides  a transition  from  markup to  genshi,
- renamed by the  upstream author. It may be  removed after the upgrade
- has completed.

Modified: packages/genshi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/genshi/trunk/debian/rules?rev=2094&op=diff
==============================================================================
--- packages/genshi/trunk/debian/rules (original)
+++ packages/genshi/trunk/debian/rules Mon Apr 16 16:45:05 2007
@@ -11,9 +11,7 @@
 
 # Install egg-info directories
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_PYTHON_DEFAULT_VERSION = $$(pyversions -d | sed 's/python//')
-
-DEB_DESTDIR=debian/python-genshi
+DEB_PYTHON_DEFAULT_VERSION = $$(pyversions -vd)
 
 install/$(DEB_PYTHON_MODULE_PACKAGE)::
 	# Rename egg-info directory to share it between several python versions