Hi,

Attached is the diff for my pyrite-publisher 2.1.1-5.1 NMU.

-- 
·O·  Pierre Habouzit
··O                                                [EMAIL PROTECTED]
OOO                                                http://www.madism.org
diff -u pyrite-publisher-2.1.1/debian/control 
pyrite-publisher-2.1.1/debian/control
--- pyrite-publisher-2.1.1/debian/control
+++ pyrite-publisher-2.1.1/debian/control
@@ -2,17 +2,16 @@
 Section: otherosfs
 Priority: extra
 Maintainer: Daniel Martin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), python2.3-dev
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>= 5), python-dev, python-support
+Standards-Version: 3.7.2
 
 Package: pyrite-publisher
 Architecture: any
-Depends: python2.3
+Depends: ${python:Depends}
 Suggests: python-wxgtk2.6
 Description: Convert html and text documents to palm DOC format
  Pyrite Publisher can convert a variety of input formats into several
- different variations on the palm doc format.  This package requires
- python 2.3.
+ different variations on the palm doc format.
  .
  This version includes support for a gui interface; see
  /usr/share/doc/pyrite-publisher/README.GUI for details.
diff -u pyrite-publisher-2.1.1/debian/rules pyrite-publisher-2.1.1/debian/rules
--- pyrite-publisher-2.1.1/debian/rules
+++ pyrite-publisher-2.1.1/debian/rules
@@ -6,8 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-export PYTHONVERCMD=python2.3
+export DH_COMPAT=5
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -g
@@ -28,11 +27,7 @@
 build-stamp: configure-stamp 
        dh_testdir
 
-       # Using python2.3 here means that the script will begin with
-       # /usr/bin/python2.3 - this is actually what we want, since
-       # that way the python that can find the modules will be invoked
-       # even when /usr/bin/python points somewhere else.
-       $(PYTHONVERCMD) ./setup.py build 
--build-base=debian/pyrite-publisher-build --force
+       python ./setup.py build --build-base=debian/pyrite-publisher-build 
--force
 
        touch build-stamp
 
@@ -52,7 +47,7 @@
 
        # Add here commands to install the package into debian/pyrite-publisher.
 
-       $(PYTHONVERCMD) ./setup.py build 
--build-base=debian/pyrite-publisher-build install 
--prefix=debian/pyrite-publisher/usr --no-compile
+       python ./setup.py build --build-base=debian/pyrite-publisher-build 
install --prefix=debian/pyrite-publisher/usr --no-compile
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -78,6 +73,8 @@
        dh_installchangelogs ChangeLog
        dh_link
        dh_strip
+       dh_pysupport
+       dh_python
        dh_compress
        dh_fixperms
 #      dh_makeshlibs
diff -u pyrite-publisher-2.1.1/debian/changelog 
pyrite-publisher-2.1.1/debian/changelog
--- pyrite-publisher-2.1.1/debian/changelog
+++ pyrite-publisher-2.1.1/debian/changelog
@@ -1,3 +1,14 @@
+pyrite-publisher (2.1.1-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Bump DH_COMPAT to 5.
+  * Compile for current python instead of hardcoding python2.3.
+  * Bump Standards-Version to 3.7.2.
+  * Update package for the new python policy (Closes: #380916).
+  * Fix various lintian warnings (especialy wrong doc-base).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]>  Wed,  2 Aug 2006 19:31:34 +0200
+
 pyrite-publisher (2.1.1-5) unstable; urgency=low
 
   * New wxwindows and python package. (closes: Bug#328408)
diff -u pyrite-publisher-2.1.1/debian/copyright 
pyrite-publisher-2.1.1/debian/copyright
--- pyrite-publisher-2.1.1/debian/copyright
+++ pyrite-publisher-2.1.1/debian/copyright
@@ -3,7 +3,7 @@
 
 It was downloaded from <http://www.pyrite.org/dist/>
 
-Upstream Author(s): Rob Tillotson <[EMAIL PROTECTED]>
+Upstream Author: Rob Tillotson <[EMAIL PROTECTED]>
 
 Copyright:
 
diff -u pyrite-publisher-2.1.1/debian/pyrite-publisher.doc-base 
pyrite-publisher-2.1.1/debian/pyrite-publisher.doc-base
--- pyrite-publisher-2.1.1/debian/pyrite-publisher.doc-base
+++ pyrite-publisher-2.1.1/debian/pyrite-publisher.doc-base
@@ -10,3 +10,3 @@
 Index: /usr/share/doc/pyrite-publisher/pyrite-publisher/index.html
-Files: 
/usr/share/doc/pyrite-publisher/pyrite-publisher/*.html,/usr/share/doc/pyrite-publisher/pyrite-publisher/*.css
+Files: /usr/share/doc/pyrite-publisher/pyrite-publisher/*.html 
/usr/share/doc/pyrite-publisher/pyrite-publisher/*.css
 
only in patch2:
unchanged:
--- pyrite-publisher-2.1.1.orig/debian/pycompat
+++ pyrite-publisher-2.1.1/debian/pycompat
@@ -0,0 +1 @@
+2

Attachment: signature.asc
Description: Digital signature

Reply via email to