[xml/sgml-commit] r1430 - in /packages/dbtoepub/trunk/debian: dbtoepub.install get-orig-source.sh patches/514030_debianize_dbtoepub.dpatch watch

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

Author: dleidert-guest
Date: Sun May 10 03:42:25 2009
New Revision: 1430

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1430
Log:
* debian/dbtoepub.install,
  debian/get-orig-source.sh,
  debian/watch,
  debian/patches/514030_debianize_dbtoepub.dpatch: Don't download and include
  the stylesheet. The stylesheet should be installed from docbook-xsl(-ns).
  Adjust all affected files.


Modified:
    packages/dbtoepub/trunk/debian/dbtoepub.install
    packages/dbtoepub/trunk/debian/get-orig-source.sh
    packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch
    packages/dbtoepub/trunk/debian/watch

Modified: packages/dbtoepub/trunk/debian/dbtoepub.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/dbtoepub.install?rev=1430&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/dbtoepub.install (original)
+++ packages/dbtoepub/trunk/debian/dbtoepub.install Sun May 10 03:42:25 2009
@@ -1,3 +1,2 @@
-*.xsl		usr/share/xml/docbook/stylesheet/docbook-xsl/epub/
-bin/dbtoepub	usr/bin/
-bin/lib/*	usr/lib/ruby/1.8/dbtoepub/
+dbtoepub	usr/bin/
+lib/*		usr/lib/ruby/1.8/dbtoepub/

Modified: packages/dbtoepub/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/get-orig-source.sh?rev=1430&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/get-orig-source.sh (original)
+++ packages/dbtoepub/trunk/debian/get-orig-source.sh Sun May 10 03:42:25 2009
@@ -15,7 +15,7 @@
 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}/bin/spec/
+rm -rf ${ORIG_TARBALL_DIR}/spec/
 GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL} ${ORIG_TARBALL_DIR_STRIP} || exit 1
 
 exit 0

Modified: packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch?rev=1430&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch (original)
+++ packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch Sun May 10 03:42:25 2009
@@ -16,9 +16,9 @@
 ## DP: <URL:http://bugs.debian.org/514030>
 
 @DPATCH@
-diff -urNad trunk~/bin/dbtoepub trunk/bin/dbtoepub
---- trunk~/bin/dbtoepub	2009-04-05 01:13:24.000000000 +0200
-+++ trunk/bin/dbtoepub	2009-05-10 04:54:44.000000000 +0200
+diff -urNad trunk~/dbtoepub trunk/dbtoepub
+--- trunk~/dbtoepub	2009-04-05 01:13:24.000000000 +0200
++++ trunk/dbtoepub	2009-05-10 05:37:40.000000000 +0200
 @@ -17,13 +17,10 @@
  #                                        layer (imports epub/docbook.xsl).
  #     -v, --verbose                    Make output verbose.
@@ -34,9 +34,9 @@
  
  verbose = false
  debug = false
-diff -urNad trunk~/bin/lib/docbook.rb trunk/bin/lib/docbook.rb
---- trunk~/bin/lib/docbook.rb	2009-05-09 19:06:45.000000000 +0200
-+++ trunk/bin/lib/docbook.rb	2009-05-10 04:54:44.000000000 +0200
+diff -urNad trunk~/lib/docbook.rb trunk/lib/docbook.rb
+--- trunk~/lib/docbook.rb	2009-05-09 19:06:45.000000000 +0200
++++ trunk/lib/docbook.rb	2009-05-10 05:37:40.000000000 +0200
 @@ -1,17 +1,19 @@
  require 'fileutils'
  require 'rexml/parsers/pullparser'
@@ -69,19 +69,3 @@
        
        if customization_layer
          @stylesheet = File.expand_path(customization_layer)
-diff -urNad trunk~/docbook.xsl trunk/docbook.xsl
---- trunk~/docbook.xsl	2009-05-07 03:03:07.000000000 +0200
-+++ trunk/docbook.xsl	2009-05-10 04:54:44.000000000 +0200
-@@ -17,9 +17,9 @@
- 
-   version="1.0">
- 
--  <xsl:import href="../xhtml-1_1/docbook.xsl" />
--  <xsl:import href="../xhtml-1_1/chunk-common.xsl" />
--  <xsl:include href="../xhtml-1_1/chunk-code.xsl" />
-+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/docbook.xsl" />
-+  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/chunk-common.xsl" />
-+  <xsl:include href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/chunk-code.xsl" />
- 
- 
-   <!-- We want a separate TOC file, please -->

Modified: packages/dbtoepub/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/watch?rev=1430&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/watch (original)
+++ packages/dbtoepub/trunk/debian/watch Sun May 10 03:42:25 2009
@@ -1,4 +1,4 @@
 version=3
-opts=uversionmangle=s/^/0+svn/,downloadurlmangle=s/\?view.*$/\/trunk\/xsl\/epub.tar.gz\?view=tar/,filenamemangle=s/^.*revision=(\d+)$/epub-0+svn$1.tar.gz/ \
- http://xmds.svn.sourceforge.net/viewvc/docbook/trunk/xsl/epub/ .*revision=(\d+)$ \
+opts=uversionmangle=s/^/0+svn/,downloadurlmangle=s/\?view.*$/\/trunk\/xsl\/epub\/bin.tar.gz\?view=tar/,filenamemangle=s/^.*revision=(\d+)$/epub-0+svn$1.tar.gz/ \
+ http://xmds.svn.sourceforge.net/viewvc/docbook/trunk/xsl/epub/bin/ .*revision=(\d+)$ \
  debian /bin/sh debian/get-orig-source.sh