[xml/sgml-commit] r1392 - in /packages/docbook-xsl/trunk/debian: README.source changelog control get-orig-source.sh rules watch
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Mon Mar 30 15:48:55 UTC 2009
Author: dleidert-guest
Date: Mon Mar 30 15:48:55 2009
New Revision: 1392
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1392
Log:
* debian/control (Standards-Version): Bumped to 3.8.1.
* debian/get-orig-source.sh: Added script to replace get-orig-source target
in debian/rules.
* debian/rules (get-orig-source): Use the new script.
* debian/watch: Added script support.
* debian/README.source: Added to comply to our policy. Further document
repackaging.
Added:
packages/docbook-xsl/trunk/debian/README.source
packages/docbook-xsl/trunk/debian/get-orig-source.sh (with props)
Modified:
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/control
packages/docbook-xsl/trunk/debian/rules
packages/docbook-xsl/trunk/debian/watch
Added: packages/docbook-xsl/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/README.source?rev=1392&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/README.source (added)
+++ packages/docbook-xsl/trunk/debian/README.source Mon Mar 30 15:48:55 2009
@@ -1,0 +1,16 @@
+docbook-xsl for Debian
+----------------------
+
+This is the repackaged source of the upstream tarball. The following changes
+are done to the upstream tarball (see also the get-orig-source.sh script):
+
+ - removal of the extensions/ directory - source is missing
+
+ JFTR: There are separate (source) packages docbook-xsl-saxon and
+ docbook-xsl-xalan which provide the extensions and their source.
+
+
+The package uses the dpatch management solution. See
+/usr/share/doc/dpatch/README.source.gz.
+
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, March 2009
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1392&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon Mar 30 15:48:55 2009
@@ -9,7 +9,7 @@
docbook-xsl-ns needs the same documentation files).
* debian/control: Removed docbook-xsl-doc* binary package fields.
- (Standards-Version): Bumped to 3.8.0.
+ (Standards-Version): Bumped to 3.8.1.
(Recommends): Adjusted for doc-packages without .dfsg version part.
(Vcs-Browser): Fixed.
(Depends): Added ruby, xsltproc and zip for dbtoepub.
@@ -25,16 +25,19 @@
becomes a symlink - so remove the directory.
* debian/docbook-xsl.xmlcatalogs: Likewise.
* debian/docbook-xsl-doc*: Removed docbook-xsl-doc* related debhelper files.
+ * debian/get-orig-source.sh: Added script to replace get-orig-source target
+ in debian/rules.
* debian/rules (binary-indep): Removed doc-packages related debhelper calls.
Further exclude .gitignore files. Install the manual page. Fix
permissions.
- (get-orig-source): Adjusted for source split. The doc-tarball is not
- longer necessary. uversion has been adjusted for a dfsg-version without
- period.
- * debian/watch: Fixed after changing to dfsg-version without period.
+ (get-orig-source): Use the new script.
+ * debian/watch: Fixed after changing to dfsg-version without period. Added
+ script support.
* debian/README.Debian: Note the removal of patch
02_use_global_papersize_conf and its reasons (#173093, #382505, #511005).
Further update for the new stylesheet and documentation locations.
+ * debian/README.source: Added to comply to our policy. Further document
+ repackaging.
* debian/examples/foo.1.example_manpage.xml: Fixed encoding declaration.
* debian/patches/7*.dpatch,
debian/patches/8*.dpatch: Removed (applied upstream).
Modified: packages/docbook-xsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/control?rev=1392&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/control (original)
+++ packages/docbook-xsl/trunk/debian/control Mon Mar 30 15:48:55 2009
@@ -5,7 +5,7 @@
Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch
Build-Depends-Indep: xml-core
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/trunk/
Added: 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=1392&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/get-orig-source.sh (added)
+++ packages/docbook-xsl/trunk/debian/get-orig-source.sh Mon Mar 30 15:48:55 2009
@@ -1,0 +1,25 @@
+#!/bin/sh
+
+set -ex
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=$3
+
+REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+
+WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/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}`
+
+#[ -f ${REAL_TARBALL} ] || wget -P ${WORKING_DIR} \
+# http://downloads.sourceforge.net/docbook/${REAL_TARBALL}
+
+mkdir -p ${ORIG_TARBALL_DIR}
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
+rm -rf ${ORIG_TARBALL_DIR}/extensions/
+GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR_STRIP} || exit 1
+
+exit 0
Propchange: packages/docbook-xsl/trunk/debian/get-orig-source.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/docbook-xsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/rules?rev=1392&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/rules (original)
+++ packages/docbook-xsl/trunk/debian/rules Mon Mar 30 15:48:55 2009
@@ -47,23 +47,7 @@
binary: binary-indep binary-arch
-# This following code is used to create the .orig.tar.gz tarball.
-# Use it to prepare it for a new release.
-#
-version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p' )
-uversion=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)+dfsg.*$$/\1/p' )
-
get-orig-source:
- set -ex ; \
- TMPDIR=`mktemp -d docbook-xsl-$(version).orig` ; \
- wget -P "$$TMPDIR" \
- http://downloads.sourceforge.net/docbook/docbook-xsl-$(uversion).tar.bz2 ; \
- tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-$(uversion).tar.bz2 ; \
- rm -rf "$$TMPDIR"/docbook-xsl-$(uversion)/extensions/ ; \
- mv "$$TMPDIR"/docbook-xsl-$(uversion) "$$TMPDIR"/docbook-xsl-$(version).orig ; \
- GZIP=-9 tar --directory="$$TMPDIR" -czf \
- $(CURDIR)/docbook-xsl_$(version).orig.tar.gz \
- docbook-xsl-$(version).orig ; \
- rm -rf "$$TMPDIR"
+ uscan --force-download
.PHONY: build clean binary-indep binary-arch binary get-orig-source
Modified: packages/docbook-xsl/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/watch?rev=1392&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/watch (original)
+++ packages/docbook-xsl/trunk/debian/watch Mon Mar 30 15:48:55 2009
@@ -7,4 +7,5 @@
version=3
opts=dversionmangle=s/\+dfsg$// \
- http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz
+ http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz \
+ debian /bin/sh debian/get-orig-source.sh
More information about the debian-xml-sgml-commit
mailing list