[xml/sgml-commit] r1056 - in /packages/xmlroff/trunk/debian: changelog compat control rules xmlroff.xmlcatalogs

Mon Mar 17 01:42:46 UTC 2008

Author: dleidert-guest
Date: Mon Mar 17 01:42:46 2008
New Revision: 1056

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1056
Log:
* debian/compat: Added.
* debian/control (Build-Depends): Increased to debhelper v5. Added xml-core
  for catalog registration.
* Depends: Added ${misc:Depends} for xml-core.
* debian/rules: Call dh_installxmlcatalogs.
  (DEB_INSTALL_MANPAGES_xmlroff, common-build-arch, clean): Rewrote manpage
  (creation) related parts, to avoid running the target twice. Remove the
  manpage in the clean target.
  (DEB_MAKE_INSTALL_TARGET): Don't append version to catalog path.
  (install): Also remove the examples from /usr/share/xml/libfo.
* debian/xmlroff.xmlcatalogs: Added for catalog registration.

Added:
    packages/xmlroff/trunk/debian/compat
    packages/xmlroff/trunk/debian/xmlroff.xmlcatalogs
Modified:
    packages/xmlroff/trunk/debian/changelog
    packages/xmlroff/trunk/debian/control
    packages/xmlroff/trunk/debian/rules

Modified: packages/xmlroff/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/changelog?rev=1056&op=diff
==============================================================================

--- packages/xmlroff/trunk/debian/changelog (original)
+++ packages/xmlroff/trunk/debian/changelog Mon Mar 17 01:42:46 2008
@@ -1,6 +1,17 @@
 xmlroff (0.5.5-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/compat: Added.
+  * debian/control (Build-Depends): Increased to debhelper v5. Added xml-core
+    for catalog registration.
+  * Depends: Added ${misc:Depends} for xml-core.
+  * debian/rules: Call dh_installxmlcatalogs.
+    (DEB_INSTALL_MANPAGES_xmlroff, common-build-arch, clean): Rewrote manpage
+    (creation) related parts, to avoid running the target twice. Remove the
+    manpage in the clean target.
+    (DEB_MAKE_INSTALL_TARGET): Don't append version to catalog path.
+    (install): Also remove the examples from /usr/share/xml/libfo.
+  * debian/xmlroff.xmlcatalogs: Added for catalog registration.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 14 Mar 2008 23:01:10 +0100
 

Added: packages/xmlroff/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/compat?rev=1056&op=file
==============================================================================
--- packages/xmlroff/trunk/debian/compat (added)
+++ packages/xmlroff/trunk/debian/compat Mon Mar 17 01:42:46 2008
@@ -1,0 +1,1 @@
+5

Modified: packages/xmlroff/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/control?rev=1056&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/control (original)
+++ packages/xmlroff/trunk/debian/control Mon Mar 17 01:42:46 2008
@@ -5,9 +5,9 @@
 Uploaders: W. Martin Borgert <debacle at debian.org>,
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>
 Standards-Version: 3.7.3
-Build-Depends: autotools-dev, debhelper (>= 4), cdbs, libxslt1-dev,
+Build-Depends: autotools-dev, debhelper (>= 5), cdbs, libxslt1-dev,
  libgtk2.0-dev, libcairo2-dev, libpango1.0-dev, libgnomeprint2.2-dev,
- xsltproc, docbook-xsl, libcunit1-dev
+ xsltproc, docbook-xsl, libcunit1-dev, xml-core
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/xmlroff/trunk/
 Homepage: http://xmlroff.org/
@@ -15,7 +15,7 @@
 
 Package: xmlroff
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: XSL formatter mainly for DocBook
  xmlroff is a fast, free, high-quality, multi-platform XSL formatter
  that aims to excel at DocBook formatting and that integrates easily

Modified: packages/xmlroff/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/rules?rev=1056&op=diff
==============================================================================
--- packages/xmlroff/trunk/debian/rules (original)
+++ packages/xmlroff/trunk/debian/rules Mon Mar 17 01:42:46 2008
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-DB2MAN=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-DEB_INSTALL_MANPAGES_xmlroff := xmlroff.1
+DB2MAN = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -9,11 +8,21 @@
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-cunit
 DEB_INSTALL_CHANGELOGS_ALL := NEWS
+DEB_INSTALL_MANPAGES_xmlroff := debian/xmlroff.1
+DEB_MAKE_INSTALL_TARGET += xmldir="\$$(datadir)/xml/libfo"
 
-common-build-arch::
-	xsltproc --nonet --novalid $(DB2MAN) docs/xmlroff.xml
+debian/%.1 : docs/%.xml
+	xsltproc --nonet --novalid -o $(@D)/ $(DB2MAN) $<
+
+clean::
+	rm -f $(DEB_INSTALL_MANPAGES_xmlroff)
+
+common-build-arch:: $(DEB_INSTALL_MANPAGES_xmlroff)
+
+binary-install/xmlroff::
+	dh_installxmlcatalogs
 
 # remove libfo stuff - ATM no other package needs it
 install/xmlroff::
 	rm -r debian/xmlroff/usr/include/ debian/xmlroff/usr/lib/
-
+	rm debian/xmlroff/usr/share/xml/libfo/xmlroff.*

Added: packages/xmlroff/trunk/debian/xmlroff.xmlcatalogs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xmlroff/trunk/debian/xmlroff.xmlcatalogs?rev=1056&op=file
==============================================================================
--- packages/xmlroff/trunk/debian/xmlroff.xmlcatalogs (added)
+++ packages/xmlroff/trunk/debian/xmlroff.xmlcatalogs Mon Mar 17 01:42:46 2008
@@ -1,0 +1,1 @@
+root-and-package;uri;http://xmlroff.org/release/libfo/;/usr/share/xml/libfo/catalog.xml


