[xml/sgml-commit] r1887 - in /packages/docbook-xsl/trunk/debian: README.source changelog get-orig-source.sh watch

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

Author: dleidert-guest
Date: Thu Nov 17 10:02:33 2011
New Revision: 1887

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1887
Log:
* debian/get-orig-source.sh: Create one source package for docbook-xsl and
  docbook-xsl-ns.
* debian/watch: Added line for docbook-xsl-ns.
* debian/README.source: Added information about multiple upstream tarballs.

Modified:
    packages/docbook-xsl/trunk/debian/README.source
    packages/docbook-xsl/trunk/debian/changelog
    packages/docbook-xsl/trunk/debian/get-orig-source.sh
    packages/docbook-xsl/trunk/debian/watch

Modified: packages/docbook-xsl/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/README.source?rev=1887&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/README.source (original)
+++ packages/docbook-xsl/trunk/debian/README.source Thu Nov 17 10:02:33 2011
@@ -4,6 +4,8 @@
 This is the repackaged source of the upstream tarballs of docbook-xsl and
 docbook-xsl-ns. The following changes are done to the upstream tarballs
 (see also the get-orig-source.sh script):
+
+  - call uscan with --no-symlink
 
   - removal of the extensions/ directories - source is missing
 

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1887&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Thu Nov 17 10:02:33 2011
@@ -33,9 +33,11 @@
     check of DocBook 5 example (copied from docbook-xsl-ns).
     (override_dh_installchangelogs): Adjusted source paths.
     (.PHONY): Added the check-xml target.
+  * debian/watch: Added line for docbook-xsl-ns.
   * debian/README.Debian: Renamed to debian/docbook-xsl.README.Debian.
   * debian/README.source: Adjusted after dropping dpatch and after merging
-    docbook-xsl and docbook-xsl-ns.
+    docbook-xsl and docbook-xsl-ns. Added information about multiple upstream
+    tarballs.
   * debian/bugs/docbook-xsl-ns/presubj: Copied and renamed. Typo fix.
   * debian/examples/foo.1.example_manpage.xml: Renamed to
     debian/examples/docbook-xsl/foo.1.example_manpage.xml.

Modified: packages/docbook-xsl/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/get-orig-source.sh?rev=1887&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/get-orig-source.sh (original)
+++ packages/docbook-xsl/trunk/debian/get-orig-source.sh Thu Nov 17 10:02:33 2011
@@ -12,8 +12,9 @@
 WORKING_DIR=`dirname ${ORIG_TARBALL}`
 
 [ -f ${REAL_TARBALL_NS} ] || wget -P ${WORKING_DIR} http://downloads.sourceforge.net/docbook/${REAL_TARBALL_NS_STRIP}
+[ -f ${REAL_TARBALL_NS} ] || exit 1
 
-ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
+ORIG_TARBALL_DFSG=`echo ${REAL_TARBALL} | sed -e "s/-\(${UPSTREAM_VERSION}\)/_\1+dfsg.orig/g"`
 ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
 ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
 

Modified: packages/docbook-xsl/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/watch?rev=1887&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/watch (original)
+++ packages/docbook-xsl/trunk/debian/watch Thu Nov 17 10:02:33 2011
@@ -7,5 +7,8 @@
 
 version=3
 opts=dversionmangle=s/\+dfsg$// \
+ http://sf.net/docbook/docbook-xsl-ns-([\d\.]+)\.tar\.gz
+
+opts=dversionmangle=s/\+dfsg$// \
  http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz \
  debian /bin/sh debian/get-orig-source.sh