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

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sun May 10 14:10:55 UTC 2009 

Author: dleidert-guest
Date: Sun May 10 14:10:55 2009
New Revision: 1436

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1436
Log:
* debian/dbtoepub.install,
  debian/get-orig-source.sh,
  debian/watch,
  debian/patches/514030_debianize_dbtoepub.dpatch: Revert commit 1430.
* debian/dbtoepub.install: Just don't install the stylesheet.
* debian/patches/514030_debianize_dbtoepub.dpatch: Try the docbook-xsl and the
  docbook-xsl-ns paths and error out, if the stylesheet is not found for some
  reason.

* debian/examples/test.xml: Added small testcase.


Added:
    packages/dbtoepub/trunk/debian/examples/
    packages/dbtoepub/trunk/debian/examples/test.xml
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=1436&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/dbtoepub.install (original)
+++ packages/dbtoepub/trunk/debian/dbtoepub.install Sun May 10 14:10:55 2009
@@ -1,2 +1,2 @@
-dbtoepub	usr/bin/
-lib/*		usr/lib/ruby/1.8/dbtoepub/
+bin/dbtoepub	usr/bin/
+bin/lib/*	usr/lib/ruby/1.8/dbtoepub/

Added: packages/dbtoepub/trunk/debian/examples/test.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/examples/test.xml?rev=1436&op=file
==============================================================================
--- packages/dbtoepub/trunk/debian/examples/test.xml (added)
+++ packages/dbtoepub/trunk/debian/examples/test.xml Sun May 10 14:10:55 2009
@@ -1,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE article PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
+'http://www.docbook.org/xml/4.5/docbookx.dtd'>
+<article>
+	<title>Title</title>
+	<para>Test</para>
+</article>

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=1436&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/get-orig-source.sh (original)
+++ packages/dbtoepub/trunk/debian/get-orig-source.sh Sun May 10 14:10:55 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}/spec/
+rm -rf ${ORIG_TARBALL_DIR}/bin/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=1436&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch (original)
+++ packages/dbtoepub/trunk/debian/patches/514030_debianize_dbtoepub.dpatch Sun May 10 14:10:55 2009
@@ -16,9 +16,9 @@
 ## DP: <URL:http://bugs.debian.org/514030>
 
 @DPATCH@
-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
+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 16:01:27.000000000 +0200
 @@ -17,13 +17,10 @@
  #                                        layer (imports epub/docbook.xsl).
  #     -v, --verbose                    Make output verbose.
@@ -34,10 +34,10 @@
  
  verbose = false
  debug = false
-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 @@
+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 16:05:13.000000000 +0200
+@@ -1,17 +1,27 @@
  require 'fileutils'
  require 'rexml/parsers/pullparser'
 +require 'tmpdir'
@@ -48,7 +48,15 @@
      CHECKER = "epubcheck"
 -    STYLESHEET = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "docbook.xsl"))
 +    STYLESHEET_PATH = File.join('usr/share/xml/docbook/stylesheet', 'docbook-xsl')
-+    STYLESHEET = File.expand_path(File.join(File::Separator, STYLESHEET_PATH, 'epub', "docbook.xsl"))
++    STYLESHEET_NS_PATH = File.join('usr/share/xml/docbook/stylesheet', 'docbook-xsl-ns')
++    if File.directory?(File.expand_path(File.join(File::Separator, STYLESHEET_PATH)))
++      STYLESHEET = File.expand_path(File.join(File::Separator, STYLESHEET_PATH, 'epub', "docbook.xsl"))
++    elsif File.directory?(File.expand_path(File.join(File::Separator, STYLESHEET_NS_PATH)))
++      STYLESHEET = File.expand_path(File.join(File::Separator, STYLESHEET_NS_PATH, 'epub', "docbook.xsl"))
++    else
++      fail "Stylesheet path not found. Use the -s switch."
++    end
++    fail "Stylesheet #{STYLESHEET} not found. Use the -s switch." unless File.exist?(STYLESHEET)
      CALLOUT_PATH = File.join('images', 'callouts')
 -    CALLOUT_FULL_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', CALLOUT_PATH))
 +    CALLOUT_FULL_PATH = File.expand_path(File.join(File::Separator, STYLESHEET_PATH, CALLOUT_PATH))
@@ -60,7 +68,7 @@
      MIMETYPE = "application/epub+zip"
      META_DIR = "META-INF"
      OEBPS_DIR = "OEBPS"
-@@ -27,7 +29,7 @@
+@@ -27,7 +37,7 @@
        @css_file = css_file ? File.expand_path(css_file) : css_file
        @embedded_fonts = embedded_fonts
        raise NotImplementedError if @embedded_fonts.length > 1

Modified: packages/dbtoepub/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/dbtoepub/trunk/debian/watch?rev=1436&op=diff
==============================================================================
--- packages/dbtoepub/trunk/debian/watch (original)
+++ packages/dbtoepub/trunk/debian/watch Sun May 10 14:10:55 2009
@@ -1,4 +1,4 @@
 version=3
-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+)$ \
+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+)$ \
  debian /bin/sh debian/get-orig-source.sh

More information about the debian-xml-sgml-commit mailing list