[xml/sgml-commit] r1259 - in /packages/docbook-xml/trunk/debian: changelog control rules source.lintian-overrides

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

Author: dleidert-guest
Date: Tue Oct 21 14:34:18 2008
New Revision: 1259

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1259
Log:
* debian/control (Depends): Moved xml-core to Pre-Depends and increased the
  version to 0.12 (closes: #482140).
* debian/rules (debian/docbook-xml.install): Fixed to not put non-existent
  files into the .install file.
* debian/source.lintian-overrides: Adjusted.

Modified:
    packages/docbook-xml/trunk/debian/changelog
    packages/docbook-xml/trunk/debian/control
    packages/docbook-xml/trunk/debian/rules
    packages/docbook-xml/trunk/debian/source.lintian-overrides

Modified: packages/docbook-xml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/changelog?rev=1259&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/changelog (original)
+++ packages/docbook-xml/trunk/debian/changelog Tue Oct 21 14:34:18 2008
@@ -5,9 +5,13 @@
   * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
     (Vcs-Svn): Fixed location.
     (Build-Depends): Raised debhelper to v5.
+    (Depends): Moved xml-core to Pre-Depends and increased the version to 0.12
+    (closes: #482140).
     (Standards-Version): Raised to 3.7.3.
-  * debian/rules (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not
-    create a temporary file.
+  * debian/rules (debian/docbook-xml.install): Fixed to not put non-existent
+    files into the .install file.
+    (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not create a
+    temporary file.
   * debian/source.lintian-overrides: Added to override
     patch-system-but-direct-changes-in-diff warning, because file creation is
     intended.

Modified: packages/docbook-xml/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/control?rev=1259&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/control (original)
+++ packages/docbook-xml/trunk/debian/control Tue Oct 21 14:34:18 2008
@@ -13,6 +13,7 @@
 
 Package: docbook-xml
 Architecture: all
+Pre-Depends: xml-core (>= 0.12)
 Depends: sgml-data (>= 2.0.2), ${misc:Depends}
 Suggests: docbook, docbook-dsssl, docbook-xsl, docbook-defguide
 Provides: docbk-xml

Modified: packages/docbook-xml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/rules?rev=1259&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/rules (original)
+++ packages/docbook-xml/trunk/debian/rules Tue Oct 21 14:34:18 2008
@@ -15,10 +15,12 @@
 	for dbx in docbook-* ; do \
 		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
 		for file in $${dbx}/*.dtd $${dbx}/*.ent $${dbx}/*.mod $${dbx}/*.ver ; do \
-			if [ $${file} != $${dbx}/dbgenent.* ] ; then \
-				echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
-			else \
-				echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+			if [ -f $${file} ] ; then \
+				if [ $${file} != $${dbx}/dbgenent.* ] ; then \
+					echo "$${file} usr/share/xml/docbook/schema/dtd/$${dbxver}" >> $@ ; \
+				else \
+					echo "$${file} etc/sgml/docbook-xml/$${dbxver}" >> $@ ; \
+				fi ; \
 			fi ; \
 		done ; \
 		[ -f $${dbx}/catalog.xml ] && \

Modified: packages/docbook-xml/trunk/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/source.lintian-overrides?rev=1259&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/source.lintian-overrides (original)
+++ packages/docbook-xml/trunk/debian/source.lintian-overrides Tue Oct 21 14:34:18 2008
@@ -1,7 +1,3 @@
 ## Because this is a compilation of upstream sources and because I don't want
 ## to create files by a patch system, I hereby overwrite the lintian warnings:
-docbook-xml source: patch-system-but-direct-changes-in-diff catalog
-docbook-xml source: patch-system-but-direct-changes-in-diff catalog.xml
-docbook-xml source: patch-system-but-direct-changes-in-diff docbook-4.0/catalog.xml
-docbook-xml source: patch-system-but-direct-changes-in-diff docbook-4.0/docbook.cat
-docbook-xml source: patch-system-but-direct-changes-in-diff docbook-4.1.2/catalog.xml
+docbook-xml source: patch-system-but-direct-changes-in-diff