[xml/sgml-commit] r1613 - in /packages/docbook-xsl/trunk/debian: changelog patches/514030_debianize_dbtoepub.dpatch

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

Author: dleidert-guest
Date: Wed Nov  4 00:09:22 2009
New Revision: 1613

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1613
Log:
* debian/patches/514030_debianize_dbtoepub.dpatch: Adjusted.
  - Removed patchset according to scripts. This is stuff for dbtoepub.

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

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1613&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Wed Nov  4 00:09:22 2009
@@ -1,6 +1,8 @@
 docbook-xsl (1.75.2+dfsg-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * debian/patches/514030_debianize_dbtoepub.dpatch: Adjusted.
+    - Removed patchset according to scripts. This is stuff for dbtoepub.
   * 8530_manpages_lists_indentation_fix.dpatch: Added.
     - manpages/lists.xsl: Fix two indentation issues (closes: #519438,
       #527309).

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=1613&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch (original)
+++ packages/docbook-xsl/trunk/debian/patches/514030_debianize_dbtoepub.dpatch Wed Nov  4 00:09:22 2009
@@ -5,71 +5,11 @@
 ## DP: The dbtoepub script and its modules need to be debianized. This is a
 ## DP: first draft.
 ## DP:
-## DP: - epub/bin/dbtoepub: The modules are installed into
-## DP:   /usr/lib/ruby/1.8/dbtoepub.
-## DP:
-## DP: - epub/bin/lib/docbook.rb: Create temporary directory with Dir::tmpdir.
-## DP:   Use local stylesheet path. Delete output directory.
-## DP:   
 ## DP: - epub/docbook.xsl: Use local stylesheet paths.
 ## DP:   
 ## DP: <URL:http://bugs.debian.org/514030>
 
 @DPATCH@
-diff -urNad trunk~/epub/bin/dbtoepub trunk/epub/bin/dbtoepub
---- trunk~/epub/bin/dbtoepub	2009-07-17 06:41:34.000000000 +0200
-+++ trunk/epub/bin/dbtoepub	2009-07-21 10:42:07.000000000 +0200
-@@ -17,14 +17,11 @@
- #                                        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 'fileutils'
- require 'optparse'
- require 'tmpdir'
- 
--require 'docbook'
-+require 'dbtoepub/docbook'
- 
- verbose = false
- debug = false
-diff -urNad trunk~/epub/bin/lib/docbook.rb trunk/epub/bin/lib/docbook.rb
---- trunk~/epub/bin/lib/docbook.rb	2009-07-17 06:46:27.000000000 +0200
-+++ trunk/epub/bin/lib/docbook.rb	2009-07-21 10:41:34.000000000 +0200
-@@ -1,17 +1,19 @@
- require 'fileutils'
- require 'rexml/parsers/pullparser'
-+require 'tmpdir'
- 
- module DocBook
- 
-   class Epub
-     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"))
-     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))
-     CALLOUT_LIMIT = 15
-     CALLOUT_EXT = ".png"
-     XSLT_PROCESSOR = "xsltproc"
--    OUTPUT_DIR = ".epubtmp#{Time.now.to_f.to_s}"
-+    OUTPUT_DIR = File.expand_path(File.join(Dir::tmpdir, ".epubtmp#{Time.now.to_f.to_s}"))
-     MIMETYPE = "application/epub+zip"
-     META_DIR = "META-INF"
-     OEBPS_DIR = "OEBPS"
-@@ -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]
-       
-       if customization_layer
-         @stylesheet = File.expand_path(customization_layer)
 diff -urNad trunk~/epub/docbook.xsl trunk/epub/docbook.xsl
 --- trunk~/epub/docbook.xsl	2009-06-16 04:59:35.000000000 +0200
 +++ trunk/epub/docbook.xsl	2009-07-21 10:41:34.000000000 +0200