Hi,

Attached is the diff for my python-gendoc 0.73-10.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -u python-gendoc-0.73/debian/rules python-gendoc-0.73/debian/rules
--- python-gendoc-0.73/debian/rules
+++ python-gendoc-0.73/debian/rules
@@ -2,12 +2,11 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-export SHELL = /bin/bash
+export DH_COMPAT = 5
 
-package          =  python-gendoc
-pyversion := $(shell /usr/bin/python -c 'import sys; print sys.version[:3]')
-pysitedir =  usr/lib/python$(pyversion)/site-packages
-i        := $(shell pwd)/debian/tmp
+package           :=  python-gendoc
+pyversions := $(shell pyversions -r)
+i         := $(shell pwd)/debian/${package}
 
 build:
        dh_testdir
@@ -23,7 +22,7 @@
 instdirs = \
        usr/bin \
        usr/share/man/man1 \
-       $(pysitedir)/gendoc/formatters \
+       $(foreach py,$(pyversions),usr/lib/$(py)/site-packages) \
        usr/share/doc/$(package)
 
 binary-indep: build
@@ -32,17 +31,23 @@
        dh_clean -k
        dh_installdirs $(instdirs)
 
-       $(MAKE) install PYTHON_BIN=$(i)/usr/bin \
-               PYTHON_LIB=$(i)/$(pysitedir)
-#      install -m 644 rand.py $(i)/$(pysitedir)/
+       set -e; \
+       for py in $(pyversions); do                                       \
+           rm -f $(i)/usr/bin/gendoc;                                    \
+           libdir=$(i)/usr/lib/$$py/site-packages;                       \
+           $(MAKE) install PYTHON_BIN=$(i)/usr/bin PYTHON_LIB=$$libdir;  \
+           chmod a+x $$libdir/gendoc/StructuredText.py;                  \
+           chmod a+x $$libdir/gendoc/gendoc.py;                          \
+       done
        install -m 644 debian/gendoc.1 $(i)/usr/share/man/man1/
-       chmod a+x $(i)/$(pysitedir)/gendoc/{StructuredText.py,gendoc.py}
 
        dh_installdocs ANNOUNCE.docco README README.docco TODO gendoc_test.py
        dh_installchangelogs
 #      dh_installmanpages
        -find $(i) -name '*.py[co]' | xargs rm -f
 #      install -m 644 debian/doc-base $(i)/usr/share/doc-base/$(package)
+       dh_pysupport
+       dh_python
        dh_fixperms
        dh_compress -X.py -X.jpg -X.gif
        dh_installdeb
diff -u python-gendoc-0.73/debian/changelog python-gendoc-0.73/debian/changelog
--- python-gendoc-0.73/debian/changelog
+++ python-gendoc-0.73/debian/changelog
@@ -1,3 +1,14 @@
+python-gendoc (0.73-10.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix dependencies and make python-gendoc installable again
+    (Closes: #372764).
+  * Update package to the last python policy (Closes: #373539).
+  * Fix description phrasing.
+  * avoid to use bashisms.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Fri, 30 Jun 2006 16:43:36 +0200
+
 python-gendoc (0.73-10) unstable; urgency=low
 
   * Update {Build-,}Depends to python 2.3
diff -u python-gendoc-0.73/debian/control python-gendoc-0.73/debian/control
--- python-gendoc-0.73/debian/control
+++ python-gendoc-0.73/debian/control
@@ -2,13 +2,16 @@
 Section: python
 Priority: optional
 Maintainer:  Steve Kowalik <[EMAIL PROTECTED]>
-Standards-Version: 3.6.0
-Build-Depends-Indep: debhelper (>= 3.0.0.), python (>= 2.3), python (<< 2.4)
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2)
+Build-Depends-Indep: python-all-dev (>= 2.3.5-11), python-support (>= 0.3)
 
 Package: python-gendoc
 Architecture: all
-Depends: python (>= 2.3), python (<< 2.4), htmlgen
-Description: Documentation generation from Python source files.
+Depends: ${python:Depends}, python-htmlgen
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Documentation generation from Python source files
  Gendoc generates documentation from Python source code in different
  formats. Currently it can generate HTML, MIF, MML and plain old ascii
  (MIF and MML are FrameMaker formats). If you want to generate HTML
only in patch2:
unchanged:
--- python-gendoc-0.73.orig/debian/pycompat
+++ python-gendoc-0.73/debian/pycompat
@@ -0,0 +1 @@
+2

Attachment: signature.asc
Description: Digital signature

Reply via email to