Hi,

Attached is the diff for my htmlgen 2.2.2-10.2 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
reverted:
--- htmlgen-2.2.2/debian/python2.3-htmlgen.dirs
+++ htmlgen-2.2.2.orig/debian/python2.3-htmlgen.dirs
@@ -1 +0,0 @@
-usr/lib/python2.3/site-packages/HTMLgen
diff -u htmlgen-2.2.2/debian/control htmlgen-2.2.2/debian/control
--- htmlgen-2.2.2/debian/control
+++ htmlgen-2.2.2/debian/control
@@ -2,40 +2,19 @@
 Section: python
 Priority: optional
 Maintainer: Peter Hawkins <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0)
-Build-Depends-Indep: python, python-all-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends-Indep: python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
+Standards-Version: 3.7.2
 
 Package: python-htmlgen
 Architecture: all
 Depends: ${python:Depends}
-Replaces: htmlgen (<< 2.2.2-8.2)
-Description: Python library for the generation of HTML
- This is package that depends on the default version of HTMLgen,
- and contains its documentation.
-
-Package: python2.3-htmlgen
-Architecture: all
-Depends: ${python:Depends}
+Provides: ${python:Provides}
+Replaces: htmlgen (<< 2.2.2-8.2), python2.3-htmlgen (<< 2.2.2-10.2), 
python2.4-htmlgen (<< 2.2.2-10.2)
+Conflicts: htmlgen (<< 2.2.2-8.2), python2.3-htmlgen (<< 2.2.2-10.2), 
python2.4-htmlgen (<< 2.2.2-10.2)
+XB-Python-Version: ${python:Versions}
 Recommends: python2.3-imaging
-Description: Generation of HTML documents with Python scripts
- HTMLgen is a class library for the generation of HTML documents with
- Python scripts. It's used when you want to create HTML pages
- containing information which changes from time to time. For example
- you might want to have a page which provides an overall system summary
- of data collected nightly. Or maybe you have a catalog of data and
- images that you would like formed into a spiffy set of web pages for
- the world to browse. Python is a great scripting language for these
- tasks and with HTMLgen it's very straightforward to construct objects
- which are rendered into consistently structured web pages. Of course,
- CGI scripts written in Python can take advantage of these classes as
- well.
-
-Package: python2.4-htmlgen
-Architecture: all
-Depends: ${python:Depends}
-Recommends: python2.4-imaging
-Description: Generation of HTML documents with Python scripts
+Description: Python library for the generation of HTML
  HTMLgen is a class library for the generation of HTML documents with
  Python scripts. It's used when you want to create HTML pages
  containing information which changes from time to time. For example
diff -u htmlgen-2.2.2/debian/rules htmlgen-2.2.2/debian/rules
--- htmlgen-2.2.2/debian/rules
+++ htmlgen-2.2.2/debian/rules
@@ -2,15 +2,12 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-#package               = htmlgen
-#pyversion     = 2.2
-#pysitedir     = usr/lib/python$(pyversion)/site-packages
-#i             = ./debian/tmp
-
 export DH_COMPAT=4
 
 exe_scripts = HTMLcalendar.py HTMLutil.py barchart.py colorcube.py
 
+PYVERS := $(shell pyversions -r)
+
 build:
        dh_testdir
        chmod -x *H.py
@@ -35,25 +32,24 @@
        dh_testroot
        dh_clean -k
        dh_installdirs 
-
-       $(MAKE) debinstall 
PYLIBDIR=debian/python2.3-htmlgen/usr/lib/python2.3/site-packages/HTMLgen
-       install -m 644 debian/HTMLgen.pth 
debian/python2.3-htmlgen/usr/lib/python2.3/site-packages/
-
-       $(MAKE) debinstall 
PYLIBDIR=debian/python2.4-htmlgen/usr/lib/python2.4/site-packages/HTMLgen
-       install -m 644 debian/HTMLgen.pth 
debian/python2.4-htmlgen/usr/lib/python2.4/site-packages/
        
+       set -e; \
+       for py in $(PYVERS); do                  \
+           mkdir -p debian/python-htmlgen/usr/lib/$$py/site-packages/HTMLgen;  
   \
+           $(MAKE) debinstall                   \
+               
PYLIBDIR=debian/python-htmlgen/usr/lib/$$py/site-packages/HTMLgen; \
+           install -m 644 debian/HTMLgen.pth    \
+               debian/python-htmlgen/usr/lib/$$py/site-packages/; \
+       done
 
 #      install -m 755 HTMLtest.py StickyForm.py 
$(i)/usr/share/doc/$(package)/examples/
 
-#      cp -pr data html image $(i)/usr/share/doc/$(package)
-       
        dh_installdocs -A README HTML.rc HTMLgen.rc appt.txt
        dh_installdocs -ppython-htmlgen data html image
-       dh_installexamples -A -ppython2.3-htmlgen -ppython2.4-htmlgen 
HTMLtest.py StickyForm.py
+       dh_installexamples -A -ppython-htmlgen HTMLtest.py StickyForm.py
        dh_installchangelogs ChangeLog
-#      -find $(i) -name '*.py[co]' -o -name '*?~' | xargs rm -f
-#      install -m 644 debian/doc-base $(i)/usr/share/doc-base/$(package)
        dh_fixperms
+       dh_pysupport
        dh_python
        dh_compress -X.py -X.jpg
        dh_installdeb
diff -u htmlgen-2.2.2/debian/changelog htmlgen-2.2.2/debian/changelog
--- htmlgen-2.2.2/debian/changelog
+++ htmlgen-2.2.2/debian/changelog
@@ -1,3 +1,10 @@
+htmlgen (2.2.2-10.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update package for new python policy (Closes: #373443).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Fri, 30 Jun 2006 16:02:06 +0200
+
 htmlgen (2.2.2-10.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- htmlgen-2.2.2/debian/python2.4-htmlgen.dirs
+++ htmlgen-2.2.2.orig/debian/python2.4-htmlgen.dirs
@@ -1 +0,0 @@
-usr/lib/python2.4/site-packages/HTMLgen
only in patch2:
unchanged:
--- htmlgen-2.2.2.orig/debian/pycompat
+++ htmlgen-2.2.2/debian/pycompat
@@ -0,0 +1 @@
+2

Attachment: signature.asc
Description: Digital signature

Reply via email to