[Python-apps-commits] r7290 - in packages/archivemail/trunk/debian (5 files)

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

    Date: Sunday, July 10, 2011 @ 12:27:12
  Author: nikolaus-guest
Revision: 7290

Import archivemail 0.9.0

* Drop patch for manpage installation path, which is now applied upstream.
* Use xsltproc instead of docbook2man to build the manpage from source,
  which has been ported from SGML to XML. Adjust dependencies accordingly.

Modified:
  packages/archivemail/trunk/debian/changelog
  packages/archivemail/trunk/debian/control
  packages/archivemail/trunk/debian/patches/series
  packages/archivemail/trunk/debian/rules
Deleted:
  packages/archivemail/trunk/debian/patches/fix-manpage-path.diff

Modified: packages/archivemail/trunk/debian/changelog
===================================================================
--- packages/archivemail/trunk/debian/changelog	2011-07-10 10:41:57 UTC (rev 7289)
+++ packages/archivemail/trunk/debian/changelog	2011-07-10 12:27:12 UTC (rev 7290)
@@ -1,3 +1,12 @@
+archivemail (0.9.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Drop patch for manpage installation path, which is now applied upstream.
+    - Use xsltproc instead of docbook2man to build the manpage from source,
+      which has been ported from SGML to XML. Adjust dependencies accordingly.
+
+ -- Nikolaus Schulz <microschulz at web.de>  Sun, 10 Jul 2011 12:35:49 +0200
+
 archivemail (0.8.2-1) unstable; urgency=low
 
   * New maintainer. Closes: #553592.

Modified: packages/archivemail/trunk/debian/control
===================================================================
--- packages/archivemail/trunk/debian/control	2011-07-10 10:41:57 UTC (rev 7289)
+++ packages/archivemail/trunk/debian/control	2011-07-10 12:27:12 UTC (rev 7290)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Nikolaus Schulz <microschulz at web.de>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python, docbook, docbook-utils, python-support (>= 0.90)
+Build-Depends: debhelper (>= 7.0.50~), python, xsltproc, docbook-xml,
+ docbook-xsl, python-support (>= 0.90)
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/archivemail/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/archivemail/trunk/

Deleted: packages/archivemail/trunk/debian/patches/fix-manpage-path.diff
===================================================================
--- packages/archivemail/trunk/debian/patches/fix-manpage-path.diff	2011-07-10 10:41:57 UTC (rev 7289)
+++ packages/archivemail/trunk/debian/patches/fix-manpage-path.diff	2011-07-10 12:27:12 UTC (rev 7290)
@@ -1,20 +0,0 @@
-commit 393f08bb2edd764c2810b2b88e6eef80952f44bd
-Author: Nikolaus Schulz <microschulz at web.de>
-Date:   Sun Nov 28 02:02:51 2010 +0100
-
-    setup.py: install manpage into share/man/man1 instead of man/man1
-    
-    This change aims to comply with the FHS, which puts manpages into
-    /usr/share/man, not /usr/man.
-
-diff --git a/setup.py b/setup.py
-index 33eab7c..a1449db 100755
---- a/setup.py
-+++ b/setup.py
-@@ -29,5 +29,5 @@ setup(name="archivemail",
-       maintainer="Nikolaus Schulz, Peter Poeml",
-       maintainer_email="nikosch at users.sourceforge.net, poeml at users.sourceforge.net",
-       scripts=["archivemail"],
--      data_files=[("man/man1", ["archivemail.1"])],
-+      data_files=[("share/man/man1", ["archivemail.1"])],
-       )

Modified: packages/archivemail/trunk/debian/patches/series
===================================================================
--- packages/archivemail/trunk/debian/patches/series	2011-07-10 10:41:57 UTC (rev 7289)
+++ packages/archivemail/trunk/debian/patches/series	2011-07-10 12:27:12 UTC (rev 7290)
@@ -1,2 +1 @@
 fix-path-in-example.diff
-fix-manpage-path.diff

Modified: packages/archivemail/trunk/debian/rules
===================================================================
--- packages/archivemail/trunk/debian/rules	2011-07-10 10:41:57 UTC (rev 7289)
+++ packages/archivemail/trunk/debian/rules	2011-07-10 12:27:12 UTC (rev 7290)
@@ -10,7 +10,7 @@
 
 override_dh_auto_build:
 	mv archivemail.1 archivemail.1.orig
-	docbook2man archivemail.sgml
+	xsltproc db2man.xsl archivemail.xml
 
 override_dh_clean:
 	if [ -f archivemail.1.orig ]; then \