[Python-modules-commits] r4029 - in packages/genshi/trunk/debian (8 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Sun Dec 23 19:33:29 UTC 2007


    Date: Sunday, December 23, 2007 @ 19:33:28
  Author: arnau
Revision: 4029

* New email address.
* Drop useless dependency on python-setuptools, use distutils instead.
  + Add debian/patches/01_no_setuptools.patch.
* Remove useless debian/control.in.
* debian/control:
  + Update Standards-Version to 3.7.3. No changes needed.
  + Remove useless field against old dummy package (python-genshi is
    already in etch).
* debian/copyright:
  + Update copyright years.

Added:
  packages/genshi/trunk/debian/patches/
  packages/genshi/trunk/debian/patches/01_no_setuptools.patch
  packages/genshi/trunk/debian/patches/series
Modified:
  packages/genshi/trunk/debian/changelog
  packages/genshi/trunk/debian/control
  packages/genshi/trunk/debian/copyright
  packages/genshi/trunk/debian/rules
Deleted:
  packages/genshi/trunk/debian/control.in

Modified: packages/genshi/trunk/debian/changelog
===================================================================
--- packages/genshi/trunk/debian/changelog	2007-12-23 15:02:19 UTC (rev 4028)
+++ packages/genshi/trunk/debian/changelog	2007-12-23 19:33:28 UTC (rev 4029)
@@ -1,13 +1,28 @@
-genshi (0.4.4-2) UNRELEASED; urgency=low
+genshi (0.4.4-3) UNRELEASED; urgency=low
 
+  * NOT RELEASED YET
+
+ -- Arnaud Fontaine <arnau at debian.org>  Sun, 23 Dec 2007 15:01:25 +0000
+
+genshi (0.4.4-2) unstable; urgency=low
+
   [ Arnaud Fontaine ]
   * New email address.
+  * Drop useless dependency on python-setuptools, use distutils instead.
+    + Add debian/patches/01_no_setuptools.patch.
+  * Remove useless debian/control.in.
+  * debian/control:
+    + Update Standards-Version to 3.7.3. No changes needed.
+    + Remove useless field against old dummy package (python-genshi is
+      already in etch).
+  * debian/copyright:
+    + Update copyright years.
 
   [ Piotr Ożarowski ]
-  * Homepage field added.
+  * Homepage field added (dpkg supports it now).
   * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now).
 
- -- Arnaud Fontaine <arnau at debian.org>  Fri, 07 Dec 2007 21:28:05 +0000
+ -- Arnaud Fontaine <arnau at debian.org>  Sun, 23 Dec 2007 14:25:43 +0000
 
 genshi (0.4.4-1) unstable; urgency=low
 

Modified: packages/genshi/trunk/debian/control
===================================================================
--- packages/genshi/trunk/debian/control	2007-12-23 15:02:19 UTC (rev 4028)
+++ packages/genshi/trunk/debian/control	2007-12-23 19:33:28 UTC (rev 4029)
@@ -3,9 +3,12 @@
 Priority: optional
 Maintainer: Arnaud Fontaine <arnau at debian.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.6.4)
-Build-Depends-Indep: python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2),
+               cdbs (>= 0.4.43),
+               python-dev (>= 2.3.5-11),
+               python-support (>= 0.7.1),
+	       quilt
+Standards-Version: 3.7.3
 Homepage: http://genshi.edgewall.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/genshi/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/genshi/?op=log
@@ -13,10 +16,7 @@
 Package: python-genshi
 Architecture: all
 Depends: ${python:Depends}, python-xml (>= 0.6.6-3)
-Suggests: doc-base, python-setuptools
-Provides: python-markup
-Replaces: python-markup (<< 0.3.4)
-Conflicts: python-markup (<< 0.3.4)
+Suggests: doc-base
 Description: python XML-based template engine
  Genshi  is  a Python  library  that  provides  an integrated  set  of
  components  for  parsing,  generating,  and processing  HTML  or  XML

Deleted: packages/genshi/trunk/debian/control.in
===================================================================
--- packages/genshi/trunk/debian/control.in	2007-12-23 15:02:19 UTC (rev 4028)
+++ packages/genshi/trunk/debian/control.in	2007-12-23 19:33:28 UTC (rev 4029)
@@ -1,24 +0,0 @@
-Source: genshi
-Section: python
-Priority: optional
-Maintainer: Arnaud Fontaine <arnau at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: @cdbs@
-Build-Depends-Indep: python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
-Homepage: http://genshi.edgewall.org/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/genshi/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/genshi/?op=log
-
-Package: python-genshi
-Architecture: all
-Depends: ${python:Depends}, python-xml (>= 0.6.6-3)
-Suggests: doc-base, python-setuptools
-Provides: python-markup
-Replaces: python-markup (<< 0.3.4)
-Conflicts: python-markup (<< 0.3.4)
-Description: python XML-based template engine
- Genshi  is  a Python  library  that  provides  an integrated  set  of
- components  for  parsing,  generating,  and processing  HTML  or  XML
- content  in  a uniform  manner.   The  major  feature is  a  template
- language, which is heavily inspired by Kid.

Modified: packages/genshi/trunk/debian/copyright
===================================================================
--- packages/genshi/trunk/debian/copyright	2007-12-23 15:02:19 UTC (rev 4028)
+++ packages/genshi/trunk/debian/copyright	2007-12-23 19:33:28 UTC (rev 4029)
@@ -5,7 +5,7 @@
 
 Author: Edgewall Software <info at edgewall.org>
 
-Copyright: 2006 Edgewall Software
+Copyright: 2006-2007 Edgewall Software
    All rights reserved.
 
    Redistribution and use in source  and binary forms, with or without
@@ -36,7 +36,7 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY  WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The Debian packaging is (C) 2006,  Arnaud Fontaine <arnau at debian.org>
-and is licensed under the GPL. On Debian systems, the complete text of
-the GNU General Public License can be found in
+The   Debian    packaging   is   (C)    2006-2007,   Arnaud   Fontaine
+<arnau at debian.org> and  is licensed under the GPL.  On Debian systems,
+the complete  text of the GNU  General Public License can  be found in
 `/usr/share/common-licenses/GPL'.

Added: packages/genshi/trunk/debian/patches/01_no_setuptools.patch
===================================================================
--- packages/genshi/trunk/debian/patches/01_no_setuptools.patch	                        (rev 0)
+++ packages/genshi/trunk/debian/patches/01_no_setuptools.patch	2007-12-23 19:33:28 UTC (rev 4029)
@@ -0,0 +1,34 @@
+Index: genshi-0.4.4/setup.py
+===================================================================
+--- genshi-0.4.4.orig/setup.py	2007-12-22 01:15:19.000000000 +0000
++++ genshi-0.4.4/setup.py	2007-12-22 01:15:50.000000000 +0000
+@@ -16,11 +16,8 @@
+ import doctest
+ from glob import glob
+ import os
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
+-import sys
++
++from distutils.core import setup
+ 
+ 
+ class build_doc(Command):
+@@ -143,15 +140,6 @@
+         'i18n': ['Babel>=0.8'],
+         'plugin': ['setuptools>=0.6a2']
+     },
+-    entry_points = """
+-    [babel.extractors]
+-    genshi = genshi.filters.i18n:extract[i18n]
+-    
+-    [python.templating.engines]
+-    genshi = genshi.template.plugin:MarkupTemplateEnginePlugin[plugin]
+-    genshi-markup = genshi.template.plugin:MarkupTemplateEnginePlugin[plugin]
+-    genshi-text = genshi.template.plugin:TextTemplateEnginePlugin[plugin]
+-    """,
+ 
+     cmdclass = {'build_doc': build_doc, 'test_doc': test_doc}
+ )

Added: packages/genshi/trunk/debian/patches/series
===================================================================
--- packages/genshi/trunk/debian/patches/series	                        (rev 0)
+++ packages/genshi/trunk/debian/patches/series	2007-12-23 19:33:28 UTC (rev 4029)
@@ -0,0 +1 @@
+01_no_setuptools.patch

Modified: packages/genshi/trunk/debian/rules
===================================================================
--- packages/genshi/trunk/debian/rules	2007-12-23 15:02:19 UTC (rev 4028)
+++ packages/genshi/trunk/debian/rules	2007-12-23 19:33:28 UTC (rev 4029)
@@ -5,12 +5,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 # Don't compress .py files
 DEB_COMPRESS_EXCLUDE := .py .txt .cfg
-
-# Install egg-info directories
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-
-clean::
-	-rm -rf Genshi.egg-info




More information about the Python-modules-commits mailing list