[xml/sgml-commit] r1002 - in /packages/docbook-xml/trunk/debian: changelog control rules

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

Author: dleidert-guest
Date: Thu Feb  7 23:49:48 2008
New Revision: 1002

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1002
Log:
* debian/control (XS-DM-Upload-Allowed): Removed XS- prefix as of dpkg version
  1.14.16.
* debian/rules (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not
  create a temporary file.


Modified:
    packages/docbook-xml/trunk/debian/changelog
    packages/docbook-xml/trunk/debian/control
    packages/docbook-xml/trunk/debian/rules

Modified: packages/docbook-xml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/changelog?rev=1002&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/changelog (original)
+++ packages/docbook-xml/trunk/debian/changelog Thu Feb  7 23:49:48 2008
@@ -2,9 +2,11 @@
 
   * NOT RELEASED YET
   * debian/compat: Raised to v5.
-  * debian/control: Vcs fields transition. Added XS-DM-Upload-Allowed.
+  * debian/control: Vcs fields transition. Added DM-Upload-Allowed.
     (Build-Depends): Raised debhelper to v5.
     (Standards-Version): Raised to 3.7.3.
+  * debian/rules (debian/docbook-xml.xmlcatalogs): Use `sed -i' and do not
+    create a temporary file.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 27 Sep 2007 00:26:53 +0200
 

Modified: packages/docbook-xml/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/control?rev=1002&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/control (original)
+++ packages/docbook-xml/trunk/debian/control Thu Feb  7 23:49:48 2008
@@ -9,7 +9,7 @@
 Homepage: http://www.oasis-open.org/docbook/xml/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xml/
-XS-DM-Upload-Allowed: yes
+DM-Upload-Allowed: yes
 
 Package: docbook-xml
 Architecture: all

Modified: packages/docbook-xml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xml/trunk/debian/rules?rev=1002&op=diff
==============================================================================
--- packages/docbook-xml/trunk/debian/rules (original)
+++ packages/docbook-xml/trunk/debian/rules Thu Feb  7 23:49:48 2008
@@ -57,29 +57,27 @@
 
 debian/docbook-xml.xmlcatalogs:
 	set -ex ; \
-	touch $@ $@.tmp ; \
-	cat $@.in >> $@.tmp ; \
+	touch $@ ; \
+	cat $@.in >> $@ ; \
 	for dbx in docbook-* ; do \
 		dbxver=`echo $${dbx} | sed -e 's/docbook-//g'` ; \
 		if [ -f $${dbx}/catalog.xml ] ; then \
-			echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+			echo "local;$${dbx}/catalog.xml;/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
 			sysids=`egrep -e "<system systemId=\"[^\"]+\"" $${dbx}/catalog.xml | \
 			        sed -e 's/<system systemId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
 			echo $${sysids} | while read id ; do \
-				echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+				echo "package;system;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
 			done ; \
 			pubids=`egrep -e "<public publicId=\"[^\"]+\"" $${dbx}/catalog.xml | \
 			        sed -e 's/<public publicId=\"\(.*\)\"/\1;/g'` IFS=';' ; \
 			echo $${pubids} | while read id ; do \
-				echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@.tmp ; \
+				echo "package;public;$${id};/usr/share/xml/docbook/schema/dtd/$${dbxver}/catalog.xml" >> $@ ; \
 			done ; \
-			echo >> $@.tmp ; \
+			echo >> $@ ; \
 		fi ; \
 	done ; \
 	fpiregex="s/^.*\-\/\/OASIS\/\/DTD XML Exchange Table Model 19990315\/\/EN.*\/dtd\/4\.[^5].*//g" ; \
-	sed -e 's/\ ;\/usr/;\/usr/g' \
-	    -e $${fpiregex} \
-	    < $@.tmp > $@ && rm -f $@.tmp
+	sed -i -e 's/\ ;\/usr/;\/usr/g' -e $${fpiregex} $@
 
 build: patch-stamp build-stamp
 
@@ -95,7 +93,6 @@
 	      debian/docbook-xml.links \
 	      debian/docbook-xml.sgmlcatalogs \
 	      debian/docbook-xml.xmlcatalogs \
-	      debian/docbook-xml.xmlcatalogs.tmp
 	dh_clean
 
 install: build