[xml/sgml-commit] r1363 - /packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch

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

Author: dleidert-guest
Date: Fri Feb 20 15:52:20 2009
New Revision: 1363

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1363
Log:
* debian/patches/514030_debianize_dbtoepub.dpatch: Adjust for 1.74.2.


Modified:
    packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch

Modified: packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch?rev=1363&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch Fri Feb 20 15:52:20 2009
@@ -16,30 +16,32 @@
 ## DP: <URL:http://bugs.debian.org/514030>
 
 @DPATCH@
-diff -urNad experimental~/epub/bin/dbtoepub experimental/epub/bin/dbtoepub
---- experimental~/epub/bin/dbtoepub	2008-06-01 23:37:14.000000000 +0200
-+++ experimental/epub/bin/dbtoepub	2009-02-03 21:50:15.000000000 +0100
-@@ -13,12 +13,9 @@
- #     -h, --help                       Display usage info
- #     -v, --verbose                    Make output verbose
+diff -urNad trunk~/epub/bin/dbtoepub trunk/epub/bin/dbtoepub
+--- trunk~/epub/bin/dbtoepub	2008-07-09 20:01:02.000000000 +0200
++++ trunk/epub/bin/dbtoepub	2009-02-20 16:41:16.000000000 +0100
+@@ -17,13 +17,10 @@
+ #                                        layer (imports epub/docbook.xsl).
+ #     -v, --verbose                    Make output verbose.
  
 -lib = File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
 -$LOAD_PATH.unshift(lib) if File.exist?(lib)
 -
  require 'optparse'
+ require 'tmpdir'
  
 -require 'docbook'
 +require 'dbtoepub/docbook'
  
  verbose = false
  debug = false
-diff -urNad experimental~/epub/bin/lib/docbook.rb experimental/epub/bin/lib/docbook.rb
---- experimental~/epub/bin/lib/docbook.rb	2008-06-01 23:37:07.000000000 +0200
-+++ experimental/epub/bin/lib/docbook.rb	2009-02-03 21:51:49.000000000 +0100
-@@ -1,16 +1,18 @@
+diff -urNad trunk~/epub/bin/lib/docbook.rb trunk/epub/bin/lib/docbook.rb
+--- trunk~/epub/bin/lib/docbook.rb	2009-02-03 19:30:11.000000000 +0100
++++ trunk/epub/bin/lib/docbook.rb	2009-02-20 16:43:17.000000000 +0100
+@@ -1,17 +1,19 @@
+ require 'fileutils'
  require 'rexml/parsers/pullparser'
- require 'fileutils'
 +require 'tmpdir'
+ 
  module DocBook
  
    class Epub
@@ -58,18 +60,18 @@
      MIMETYPE = "application/epub+zip"
      META_DIR = "META-INF"
      OEBPS_DIR = "OEBPS"
-@@ -23,7 +25,7 @@
-       @output_dir = output_dir
-       @meta_dir  = File.join(@output_dir, META_DIR)
-       @oebps_dir = File.join(@output_dir, OEBPS_DIR)
+@@ -27,7 +29,7 @@
+       @css_file = css_file ? File.expand_path(css_file) : css_file
+       @embedded_fonts = embedded_fonts
+       raise NotImplementedError if @embedded_fonts.length > 1
 -      @to_delete = []
 +      @to_delete = [OUTPUT_DIR]
- 
-       unless File.exist?(@docbook_file)
-         raise ArgumentError.new("File #{@docbook_file} does not exist")
-diff -urNad experimental~/epub/docbook.xsl experimental/epub/docbook.xsl
---- experimental~/epub/docbook.xsl	2008-06-01 23:37:14.000000000 +0200
-+++ experimental/epub/docbook.xsl	2009-02-03 21:49:43.000000000 +0100
+       
+       if customization_layer
+         @stylesheet = File.expand_path(customization_layer)
+diff -urNad trunk~/epub/docbook.xsl trunk/epub/docbook.xsl
+--- trunk~/epub/docbook.xsl	2009-02-17 05:53:45.000000000 +0100
++++ trunk/epub/docbook.xsl	2009-02-20 16:40:24.000000000 +0100
 @@ -10,9 +10,9 @@
    extension-element-prefixes="stext xtext"
    exclude-result-prefixes="exsl db ng dc stext xtext">