[xml/sgml-commit] r2028 - in /packages/docbook5-defguide/trunk/debian: ./ patches/

dleidert at users.alioth.debian.org dleidert at users.alioth.debian.org
Mon Jun 25 20:07:48 UTC 2012


Author: dleidert
Date: Mon Jun 25 20:07:47 2012
New Revision: 2028

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2028
Log:
* Initial work on the docbook5-defguide package.


Added:
    packages/docbook5-defguide/trunk/debian/
      - copied from r2017, packages/docbook-defguide/trunk/debian/
    packages/docbook5-defguide/trunk/debian/README.Debian
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/README.Debian
    packages/docbook5-defguide/trunk/debian/README.source
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/README.source
    packages/docbook5-defguide/trunk/debian/changelog
      - copied, changed from r2021, packages/docbook-defguide/trunk/debian/changelog
    packages/docbook5-defguide/trunk/debian/control
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/control
    packages/docbook5-defguide/trunk/debian/copyright
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/copyright
    packages/docbook5-defguide/trunk/debian/docbook5-defguide.doc-base
      - copied, changed from r2017, packages/docbook-defguide/trunk/debian/docbook-defguide.doc-base
    packages/docbook5-defguide/trunk/debian/docbook5-defguide.install
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/docbook-defguide.install
    packages/docbook5-defguide/trunk/debian/patches/build-common.properties.patch
    packages/docbook5-defguide/trunk/debian/rules
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/rules
    packages/docbook5-defguide/trunk/debian/watch
      - copied, changed from r2018, packages/docbook-defguide/trunk/debian/watch
Removed:
    packages/docbook5-defguide/trunk/debian/TODO
    packages/docbook5-defguide/trunk/debian/docbook-defguide.dirs
    packages/docbook5-defguide/trunk/debian/docbook-defguide.doc-base
    packages/docbook5-defguide/trunk/debian/docbook-defguide.docs
    packages/docbook5-defguide/trunk/debian/docbook-defguide.install
    packages/docbook5-defguide/trunk/debian/patches/buildtools.patch
    packages/docbook5-defguide/trunk/debian/patches/misc_fixes.patch
Modified:
    packages/docbook5-defguide/trunk/debian/compat
    packages/docbook5-defguide/trunk/debian/patches/series

Copied: packages/docbook5-defguide/trunk/debian/README.Debian (from r2018, packages/docbook-defguide/trunk/debian/README.Debian)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/README.Debian?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/README.Debian (original)
+++ packages/docbook5-defguide/trunk/debian/README.Debian Mon Jun 25 20:07:47 2012
@@ -4,8 +4,4 @@
 NOTE: The book starts with html/docbook.html, NOT with html/index.html.
       See also http://bugs.debian.org/135296.
 
-
-Please feel free to report all issues you find, even if this book can be
-considered to not being actively developed anymore.
-
- -- Daniel Leidert <daniel.leidert at wgdd.de>, 2012.
+ -- Daniel Leidert <dleidert at debian.org>, 2012.

Copied: packages/docbook5-defguide/trunk/debian/README.source (from r2018, packages/docbook-defguide/trunk/debian/README.source)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/README.source?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/README.source (original)
+++ packages/docbook5-defguide/trunk/debian/README.source Mon Jun 25 20:07:47 2012
@@ -1,7 +1,13 @@
-docbook-defguide source for Debian
-----------------------------------
+docbook5-defguide source for Debian
+-----------------------------------
 
 Building the package requires quite some time depending on the Java runtime
 and the hardware used.
 
- -- Daniel Leidert <daniel.leidert at wgdd.de>, 2012.
+The upstream release versions are different to the versions used for Debian.
+Because I cannot track the released versions (e.g. 1.0 and 1.0.1 for TDG5 and
+1.4.8 for TDG5.1) I've chosen to base the version on the last DocBook5
+version released plus the revision of the upstream subversion tree, from
+which the upstream tarball is built.
+
+ -- Daniel Leidert <dleidert at debian.org>, 2012.

Copied: packages/docbook5-defguide/trunk/debian/changelog (from r2021, packages/docbook-defguide/trunk/debian/changelog)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/changelog?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/changelog (original)
+++ packages/docbook5-defguide/trunk/debian/changelog Mon Jun 25 20:07:47 2012
@@ -1,177 +1,5 @@
-docbook-defguide (2.0.17+svn9047-2) UNRELEASED; urgency=low
+docbook5-defguide (5.0+svn9047-1) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * Initial packaging (closes: #617193).
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 20 Jun 2012 00:21:42 +0200
-
-docbook-defguide (2.0.17+svn9047-1) unstable; urgency=low
-
-  * New snapshot from upstream VCS revision 9047.
-  * debian/control (Standards-Version): Bumped to 3.9.3.
-    (Build-Depends-Indep): Use default-jre-headless by default or
-    gcj-jre-headless alternatively.
-  * debian/copyright: Minor update.
-  * debian/docbook-defguide.docs: Adjusted for source layout change.
-  * debian/docbook-defguide.install: Ditto.
-  * debian/rules: Adjust for minor source layout change. Removed
-    get-orig-source target. Use default JRE.
-  * debian/watch: Changed to download via ViewVC interface.
-  * debian/README.Debian: Minor update.
-  * debian/README.source: Ditto.
-  * debian/patches/buildtools.patch: Adjusted.
-    - Patch fixes. Further fix en/Makefile.
-  * debian/patches/misc_fixes.patch: Adjusted.
-    - Path fixes. Change to en/stylesheets/html-titlepage.xml obsoleted.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 20 Jun 2012 00:10:40 +0200
-
-docbook-defguide (2.0.17+svn7549-4) unstable; urgency=low
-
-  * buildtools/saxon.sh (DEFAULT_CLASSPATH): Fix catalog resolver jar name
-    (closes: #642256).
-  * buildtools/Makefile.incl,
-    buildtools/saxon.sh: Moved into debian/patches/buildtools.patch.
-  * debian/compat: Increased dh compatibility level.
-  * debian/control (Build-Depends): Removed dpatch. Increased dh version.
-    Fixed debhelper-but-no-misc-depends.
-    (Standards-Version): Bumped to 3.9.2.
-  * debian/docbook-defguide.dirs: Added.
-  * debian/docbook-defguide.docs: Ditto.
-  * debian/docbook-defguide.install: Ditto.
-  * debian/rules: Rewritten for dh 7.
-  * debian/source.lintian-overrides: Dropped.
-  * debian/source/format: Added for version 3.0 (quilt).
-  * debian/README.Debian: Moved a comment to debian/README.source.
-  * debian/README.source: Added with a note from debian/README.Debian.
-  * debian/patches/01_misc_fixes.dpatch: Transformed to quilt and renamed to
-    debian/patches/misc_fixes.patch.
-  * debian/patches/00list: Renamed to debian/patches/series and adjusted.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 23 Nov 2011 18:52:38 +0100
-
-docbook-defguide (2.0.17+svn7549-3) unstable; urgency=low
-
-  * debian/control (Build-Depends-Indep): java-gcj-compat is not available
-    anymore on alpha, arm, hppa and hurd-i386.
-  * debian/docbook-defguide.doc-base (Section): Fixed accordingly to version
-    0.8.10 of the doc-base manual.
-  * debian/rules (install): Fixed bashism.
-  * debian/source.lintian-overrides: Added to override
-    patch-system-but-direct-changes-in-diff warning, because file creation is
-    intended.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 01 May 2008 03:55:09 +0200
-
-docbook-defguide (2.0.17+svn7549-2) unstable; urgency=low
-
-  * debian/control: Added Vcs fields. Added DM-Upload-Allowed for DM status.
-    (Build-Depends-Indep): Build-depend on the recently introduced -gcj
-    packages with native code to speed up the build process (closes: #459043).
-  * debian/watch: Slightly improved to ignore the SVN version part.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Tue, 05 Feb 2008 02:20:50 +0100
-
-docbook-defguide (2.0.17+svn7549-1) unstable; urgency=low
-
-  * New upstream release 2.0.17 (finally closes: #257715).
-    - Creates missing pages (closes: #208031).
-    - Fixes several broken links (closes: #248364, #280740).
-    - Drops printing glyphs via external URIs (closes: #173710).
-    - Norman Walsh relicensed the TDG as of version 2.0.17 without the
-      back-cover text clause (closes: #280485). Many thanks to you, Norm!
-
-  * buildtools/Makefile.incl: Added my own small and custom build system to
-    not rely on upstreams one. This should also reduce the size of necessary
-    changes to the build system.
-  * buildtools/saxon.sh: Ditto.
-
-  * debian/compat: Update to newer compatibility level 5.
-  * debian/control: Added Homepage field.
-    (Maintainer): New maintainer (closes: #295579).
-    (Standards-Version): Updated to latest 3.7.3.
-    (Build-Depends, Build-Depends-Indep): Updated/adjusted.
-    (Description): Updated.
-  * debian/copyright: Updated. Added information about newly added source
-    files (xml2po/entities/docbook-xml/sgml-data).
-  * debian/docbook-defguide.doc-base (Abstract): Updated.
-    (Section): Fixed to apply to latest menu spec.
-  * debian/rules: Added get-orig-source target to retreive the source via SVN.
-    Added dpatch infrastructure. Removed obsolete stuff and fixed the build
-    system (cleanup).
-    (install): Added  .htaccess file - provide docbook.html as directory index
-    (closes: #135296).
-  * debian/watch: Added (crude, but it should work).
-  * debian/README.Debian: Updated.
-  * debian/patches/01_misc_fixes.dpatch: Added. Fixes to make the package
-    build (we are not inside the projects SVN).
-  * debian/patches/00list: Added.
-
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 16 Dec 2007 14:25:22 +0100
-
-docbook-defguide (2.0.8-2) unstable; urgency=low
-
-  * QA Group upload orphaning this package
-  * debian/copyright: Updated the address of the FSF
-  * debian/docbook-defguide.doc-base: removed bogus sentence (closes: #217408)
-
- -- Andrew Pollock <apollock at debian.org>  Wed,  1 Mar 2006 11:17:59 -0800
-
-docbook-defguide (2.0.8-1.1) unstable; urgency=high
-
-  * NMU.
-  * High-urgency upload for sarge-targetted RC bugfix
-  * Add the complete FDL license text to debian/copyright
-    (closes: #280807).
-  * Add %use-id-as-filename% and %html-ext%=".html" dssl directives to
-    defguide.dsl to get the nice filenames.html available in the 
-    previous version of the package; thanks to Paul Brossier for the fix.
-
- -- Steve Langasek <vorlon at debian.org>  Fri,  3 Dec 2004 18:31:00 -0800
-
-docbook-defguide (2.0.8-1) unstable; urgency=low
-
-  * Fixed generation of xrefs to elements (Closes: #187963).
-
- -- Yann Dirson <dirson at debian.org>  Mon,  7 Apr 2003 21:06:47 +0200
-
-docbook-defguide (2.0.8) unstable; urgency=low
-
-  * New upstream release.
-  * Requires docbook-ebnf 1.1CR1.
-  * Add build-dep on docbook-ebnf.
-  * Added "-O -D`pwd`" to docbook-2-html invocation.
-  * Override (parse-starttag-pi) from dblib.dsl with a stub, since
-    (parse-pi-attribute) makes far too many assumptions to be fixed
-    rapidly.
-  * All the above closes: #165300.  Thanks to Roland Mas and Ray Dassen
-    for their work on this package.
-  * Override %callout-graphics-path% and %callout-graphics-extension% to
-    find callout graphics (Closes: #178929).
-  * Override %admon-graphics% and %admon-graphics-path% to get graphics
-    for admonitions.
-  * Prevent docbook-defguide/html/changelog.html from being compressed,
-    since that's part of the book.
-
- -- Yann Dirson <dirson at debian.org>  Thu,  3 Apr 2003 12:16:41 +0200
-
-docbook-defguide (2.0.3-2) unstable; urgency=low
-
-  * Use Build-depends-indep instead of Build-depends.
-  * Run tidy(1) on generated HTML.
-  * Install figures.
-  * Made the stylesheet display in the ToC the glyphs matching the
-    "revision" attribute from refentries.
-  * Fixed doc-base section.
-  * Install docs into subdir named html/, not book-html/.
-
- -- Yann Dirson <dirson at debian.org>  Sat, 18 May 2002 18:47:55 +0200
-
-docbook-defguide (2.0.3-1) unstable; urgency=low
-
-  * Initial release - indeed a brand new package to replace former
-    docbook-book (Closes: #144109).
-  * Format using an ad-hoc customization layer above the DocBook modular
-    stylesheets.  Only creates cross-refs to element reference-pages for
-    now.
-
- -- Yann Dirson <dirson at debian.org>  Fri, 17 May 2002 01:17:36 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 23 Aug 2009 02:15:33 +0200

Modified: packages/docbook5-defguide/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/compat?rev=2028&op=diff
==============================================================================
--- packages/docbook5-defguide/trunk/debian/compat (original)
+++ packages/docbook5-defguide/trunk/debian/compat Mon Jun 25 20:07:47 2012
@@ -1,1 +1,1 @@
-7
+8

Copied: packages/docbook5-defguide/trunk/debian/control (from r2018, packages/docbook-defguide/trunk/debian/control)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/control?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/control (original)
+++ packages/docbook5-defguide/trunk/debian/control Mon Jun 25 20:07:47 2012
@@ -1,36 +1,45 @@
-Source: docbook-defguide
+Source: docbook5-defguide
 Section: doc
 Priority: optional
-Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>> 7.0.50~)
-Build-Depends-Indep: default-jre-headless | gcj-jre-headless,
-                     docbook-ebnf (>> 1.2~cr1),
-                     docbook-xml (>= 4.5),
-                     docbook-xsl,
-                     docbook-xsl-saxon-gcj,
-                     libsaxon-java-gcj (>> 1:6.5),
-                     libxerces2-java-gcj,
-                     libxml-commons-resolver1.1-java-gcj,
+Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
+Uploaders: Daniel Leidert <dleidert at debian.org>
+Build-Depends: ant (>> 1.7),
+               debhelper (>> 8),
+               default-jre-headless (>> 1.6),
+               libjing-java
+Build-Depends-Indep: bsh (>> 2.0b4),
+                     docbook-xsl-ns,
+                     docbook-xsl-saxon,
+                     docbook5-xml (>> 5),
+                     libbsf-java (>> 2.4),
+                     libcommons-logging-java,
+                     libsaxon-java (>> 1:6.5),
+                     libsaxonb-java (>> 9.1),
+                     libxml-commons-resolver1.1-java,
                      xml-core,
                      xsltproc
 Standards-Version: 3.9.3
-Homepage: http://docbook.org/tdg/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-defguide/trunk/
-DM-Upload-Allowed: yes
+Homepage: http://docbook.org/tdg5/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook5-defguide/trunk/
 
-Package: docbook-defguide
+Package: docbook5-defguide
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: docbook, docbook-xml
-Replaces: docbook-book
-Provides: docbook-book
-Conflicts: docbook-book
-Description: DocBook: The Definitive Guide - HTML version
- The official reference manual for the DocBook 4.x SGML and XML DTD,
- by Norman Walsh, Leonard Muellner, and Bob Stayton.  This version is
- an evolution of the book of the same name published by O'Reilly
- (which documented DocBook 3.1).
+Suggests: docbook5-xml
+Description: DocBook 5.x: The Definitive Guide - HTML version
+ The official clear, concise, normative reference manual for the
+ DocBook 5.x XML schemas, by Norman Walsh and contributions by
+ Leonard Muellner. It hopefully answers all the questions about
+ all the elements and attributes in DocBook. In particular, the
+ following subjects are covered:
  .
- This is a work in progress, which attempts to fully document DocBook
- 4.5, but may be inconsistent in some places.
+  * The general nature of DocBook.
+  * How to write DocBook documents.
+  * Parsing and validation.
+  * How to publish DocBook documents.
+  * Customizing the schema.
+  * Understanding all of the elements.
+ .
+ It also partly covers the DocBook XSL Stylesheets you'll find
+ in the docbook-xsl and docbook-xsl-ns packages.

Copied: packages/docbook5-defguide/trunk/debian/copyright (from r2018, packages/docbook-defguide/trunk/debian/copyright)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/copyright?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/copyright (original)
+++ packages/docbook5-defguide/trunk/debian/copyright Mon Jun 25 20:07:47 2012
@@ -1,136 +1,44 @@
-This package was debianized by Yann Dirson <dirson at debian.org> in May 2002.
-It maintained since late 2007 by Daniel Leidert <daniel.leidert at wgdd.de>.
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: DocBook 5.x: The Definitive Guide
+Upstream-Contact: Norman Walsh <ndw at nwalsh.com>
+Source: http://docbook.svn.sf.net/viewvc/docbook/trunk/defguide5/
+Copyright: 2010, O’Reilly Media, Inc.
+Comment: This package was debianized by Daniel Leidert <dleidert at debian.org>
+ during June 2012.
 
-It was downloaded from the docbook SVN repository at
+Files: *
+Copyright: 2010, O’Reilly Media, Inc.
+           2010, Norman Walsh
+License: GFDL-1.1+
+ Permission is granted to copy, distribute and/or modify this document under
+ the terms of the GNU Free Documentation License, Version 1.1 or any later
+ version published by the Free Software Foundation.
+Comment: On Debian systems the text of the GNU Free Documentation License GFDL
+ version 1.2 is available in the file `/usr/share/common-licenses/GFDL-1.2'. A
+ copy of the GFDL 1.1 is also included in the book in Appendix H.
 
-  http://docbook.svn.sourceforge.net
+Files: zh/xml2po/*
+Copyright: 2004, 2005, 2006, Danilo Å egan <danilo at gnome.org>
+License: GPL2+
 
-Upstream Authors: 
 
-  Norman Walsh <ndw at nwalsh.com>
-  Leonard Muellner
-  Bob Stayton
+Files: debian/*
+Copyright: 2007-2012, Daniel Leidert
+License: GPL2+
 
-  Dongsheng Song <dongsheng.song at gmail.com> (Chinese translator)
-  Dorian Deng <doriandeng at gmail.com> (Chinese translator)
 
-Copyright:
-
-  Copyright (C) 2004-2006 Norman Walsh.
-  Portions Copyright (C) 1999-2003 O'Reilly & Associates, Inc.
-
-License: GFDL 1.1 or any later version
-
-  Permission is granted to copy, distribute and/or modify this document under
-  the terms of the GNU Free Documentation License, Version 1.1 or any later
-  version published by the Free Software Foundation.
-  
-On Debian systems the text of the GNU Free Documentation License (GFDL)
-Version 1.2 is available in the file `/usr/share/common-licenses/GFDL-1.2'. A
-copy of the GFDL 1.1 is also included in the book in Appendix H.
-
-  Nutshell Handbook, the Nutshell Handbook logo, and the O'Reilly logo are
-  registered trademarks of O'Reilly & Associates, Inc. The association between
-  the image of a duck and the topic of DocBook is a trademark of
-  O'Reilly & Associates, Inc. Java and all Java-based trademarks and logos are
-  trademarks or registered trademarks of Sun Microsystems, Inc., in the United
-  States and other countries. O'Reilly & Associates, Inc. is independent of
-  Sun Microsystems.
-
-  Many of the designations used by manufacturers and sellers to distinguish
-  their products are claimed as trademarks. Where those designations appear in
-  this book, and O'Reilly & Associates, Inc. was aware of a trademark claim,
-  the designations have been printed in caps or initial caps. While every
-  precaution has been taken in the preparation of this book, the publisher
-  assumes no responsibility for errors or omissions, or for damages resulting
-  from the use of the information contained herein. 
-
-===== en/schema/dbebnf.dtd ==========================================
-
-  Copyright (C) 2000, 2001, 2002, 2003, 2004 Organization for the Advancement
-  of Structured Information Standards (OASIS).
-
-  Permission to use, copy, modify and distribute the DocBook EBNF
-  Module and its accompanying documentation for any purpose and
-  without fee is hereby granted in perpetuity, provided that the
-  above copyright notice and this paragraph appear in all copies.
-  The copyright holders make no representation about the
-  suitability of the DTD for any purpose.  It is provided "as is"
-  without expressed or implied warranty.
-  
-  If you modify the DocBook EBNF Module in any way, label your DTD
-  as a variant of DocBook.  See the maintenance documentation for
-  more information.
-
-These files are also shipped as part of the docbook-ebnf package.
-http://packages.debian.org/changelogs/pool/main/d/docbook-ebnf/current/copyright
-
-===== en/schema/$(DocBook 4.5 copy) =================================
-
-  Copyright 1992-2006 HaL Computer Systems, Inc.,
-  O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the
-  Organization for the Advancement of Structured Information
-  Standards (OASIS).
-
-  Permission to use, copy, modify and distribute the DocBook XML DTD
-  and its accompanying documentation for any purpose and without fee
-  is hereby granted in perpetuity, provided that the above copyright
-  notice and this paragraph appear in all copies.  The copyright
-  holders make no representation about the suitability of the DTD for
-  any purpose.  It is provided "as is" without expressed or implied
-  warranty.
-  
-  If you modify the DocBook DTD in any way, except for declaring and
-  referencing additional sets of general entities and declaring
-  additional notations, label your DTD as a variant of DocBook. See
-  the maintenance documentation for more information.
-
-These files are also shipped as part of the docbook-xml package.
-http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/copyright
-
-===== zh/xml2po/* ===================================================
-
-  Copyright (c) 2004, 2005, 2006 Danilo Å egan <danilo at gnome.org>.
-  
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-  
-On Debian systems, the complete text of the GNU General Public License can be
-found in the file `/usr/share/common-licenses/GPL'.
-
-These files are also shipped as part of the the gnome-doc-utils package.
-http://packages.debian.org/changelogs/pool/main/g/gnome-doc-utils/current/copyright
-
-===== */build/lib/*.ent =============================================
-
-  Copyright (C) 2001, 2002 Organization for the Advancement of Structured
-                           Information Standards (OASIS).
-  
-  Permission to use, copy, modify and distribute this entity set
-  and its accompanying documentation for any purpose and without
-  fee is hereby granted in perpetuity, provided that the above
-  copyright notice and this paragraph appear in all copies. The
-  copyright holders make no representation about the suitability of
-  the entities for any purpose. It is provided "as is" without
-  expressed or implied warranty.
-
-  Portions Copyright (C) 1986 International Organization for Standardization
-
-  Permission to copy in any form is granted for use with
-  conforming SGML systems and applications as defined in
-  ISO 8879, provided this notice is included in all copies.
-
-These files are also shipped as part of the sgml-data package.
-http://packages.debian.org/changelogs/pool/main/s/sgml-data/current/copyright
+License: GPL2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+Comment: On Debian systems the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".

Copied: packages/docbook5-defguide/trunk/debian/docbook5-defguide.doc-base (from r2017, packages/docbook-defguide/trunk/debian/docbook-defguide.doc-base)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/docbook5-defguide.doc-base?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/docbook-defguide.doc-base (original)
+++ packages/docbook5-defguide/trunk/debian/docbook5-defguide.doc-base Mon Jun 25 20:07:47 2012
@@ -1,14 +1,11 @@
-Document: docbook-defguide
-Title: DocBook: The Definitive Guide
-Author: Norman Walsh, Leonard Muellner, and Bob Stayton
-Abstract: The official reference manual for the DocBook 4.x SGML and XML DTD.
- This version is an evolution of the book of the same name published
- by O'Reilly (which documented DocBook 3.1).
- .
- This is a work in progress, which attempts to fully document DocBook
- 4.5, but may be inconsistent in some places.
+Document: docbook5-defguide
+Title: DocBook 5.0: The Definitive Guide
+Author: Norman Walsh and Leonard Muellner
+Abstract: The official clear, concise, normative reference manual for
+ the DocBook 5.x XML schemas. It hopefully answers all the questions
+ about all the elements and attributes in DocBook.
 Section: Text
 
 Format: HTML
-Index: /usr/share/doc/docbook-defguide/html/docbook.html
-Files: /usr/share/doc/docbook-defguide/html/*.html
+Index: /usr/share/doc/docbook5-defguide/html/docbook.html
+Files: /usr/share/doc/docbook5-defguide/html/*.html

Copied: packages/docbook5-defguide/trunk/debian/docbook5-defguide.install (from r2018, packages/docbook-defguide/trunk/debian/docbook-defguide.install)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/docbook5-defguide.install?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/docbook-defguide.install (original)
+++ packages/docbook5-defguide/trunk/debian/docbook5-defguide.install Mon Jun 25 20:07:47 2012
@@ -1,2 +1,3 @@
-en/html usr/share/doc/docbook-defguide/
+en/html   usr/share/doc/docbook-defguide/
+en/script usr/share/doc/docbook-defguide/html/
 en/figures/100dpi/* usr/share/doc/docbook-defguide/html/figures/

Added: packages/docbook5-defguide/trunk/debian/patches/build-common.properties.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/patches/build-common.properties.patch?rev=2028&op=file
==============================================================================
--- packages/docbook5-defguide/trunk/debian/patches/build-common.properties.patch (added)
+++ packages/docbook5-defguide/trunk/debian/patches/build-common.properties.patch Mon Jun 25 20:07:47 2012
@@ -1,0 +1,34 @@
+--- /dev/null
++++ b/build-common.properties
+@@ -0,0 +1,21 @@
++#
++# Debian build environment
++#
++
++docbook5.home=/usr/share/xml/docbook/schema/rng/5.0/
++docbook.xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
++
++usr.share.java = /usr/share/java
++
++#xep.home=
++
++ant.home=/usr/share/ant/lib/
++
++fop.home=${usr.share.java}
++fop.class=org.apache.fop.cli.Main
++
++fop.title.font.family=Arial,Calibri,FZCuYaSong,sans-serif,SimHei
++fop.body.font.family=Times New Roman,Cambria,Cambria Math,FZBoYaSong,serif,SimSun
++fop.sans.font.family=Arial,Calibri,FZCuYaSong,sans-serif,SimHei
++fop.dingbat.font.family=Times New Roman,Cambria,Cambria Math,FZBoYaSong,serif,SimSun
++fop.monospace.font.family=Courier New,FZFangSong,monospace,FangSong
+--- a/en/refpages/build.xml
++++ b/en/refpages/build.xml
+@@ -143,6 +143,7 @@
+         <java classname="net.sf.saxon.Transform" fork="true"
+                 dir="${basedir}${file.separator}elements${file.separator}build" maxmemory="512m">
+             <classpath refid="lib.classpath"/>
++            <arg value="-ext:on"/>
+             <arg value="-o"/>
+             <arg value="${file.db}"/>
+             <arg value="${file.db}.xi"/>

Modified: packages/docbook5-defguide/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/patches/series?rev=2028&op=diff
==============================================================================
--- packages/docbook5-defguide/trunk/debian/patches/series (original)
+++ packages/docbook5-defguide/trunk/debian/patches/series Mon Jun 25 20:07:47 2012
@@ -1,2 +1,1 @@
-buildtools.patch
-misc_fixes.patch
+build-common.properties.patch

Copied: packages/docbook5-defguide/trunk/debian/rules (from r2018, packages/docbook-defguide/trunk/debian/rules)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/rules?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/rules (original)
+++ packages/docbook5-defguide/trunk/debian/rules Mon Jun 25 20:07:47 2012
@@ -1,16 +1,18 @@
 #!/usr/bin/make -f
 
-JAVA    = /usr/lib/jvm/default-java/bin/java
-BASEDIR = html/
-PACKAGE = docbook-defguide
+export DH_VERBOSE=1
+
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/bsf.jar:/usr/share/java/bsh.jar:/usr/share/java/commons-logging.jar:/usr/share/java/jing.jar:/usr/share/java/saxonb.jar:/usr/share/java/xml-resolver.jar:/etc/xml/resolver/CatalogManager.properties
 
 %:
-	dh $@ --parallel
+	dh $@ --buildsystem ant --parallel
 
-override_dh_auto_configure:
-override_dh_auto_install:
+override_dh_auto_clean:
+
 override_dh_auto_build:
-	$(MAKE) -C en tdg.xml all JAVA=$(JAVA) BASEDIR=$(BASEDIR)
+	dh_auto_build -- validate
+	dh_auto_build -- en
 
 override_dh_installdirs:
 	dh_installdirs
@@ -19,11 +21,8 @@
 	echo "DirectoryIndex docbook.html" >> \
 	    debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/.htaccess
 
+override_dh_clean:
+	dh_clean en/refpages/list-elements.xml
+
 override_dh_compress:
-	dh_compress -i -Xusr/share/doc/docbook-defguide/html
-
-override_dh_clean:
-	$(MAKE) -C en clean
-	(cd en && $(RM) $(BASEDIR)/*.html stylesheets/html-titlepage.xsl bookinfo.xml)
-	dh_clean
-
+	dh_compress -i -Xusr/share/doc/docbook5-defguide/html

Copied: packages/docbook5-defguide/trunk/debian/watch (from r2018, packages/docbook-defguide/trunk/debian/watch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/watch?rev=2028&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/watch (original)
+++ packages/docbook5-defguide/trunk/debian/watch Mon Jun 25 20:07:47 2012
@@ -4,15 +4,5 @@
 # NOTE: uupdate will *NOT* work, because we need to get the source from SVN.
 
 version=3
-opts=\
-uversionmangle=s/^/2.0.17+svn/,\
-downloadurlmangle=s#\?view.*$#/trunk/defguide.tar.gz\?view=tar#,\
-filenamemangle=s#^.*revision=(\d+)$#docbook-defguide-2.0.17+svn$1.tar.gz# \
- http://docbook.svn.sourceforge.net/viewvc/docbook/trunk/defguide/ .*revision=(\d+)$
-
-# TODO: parent=1 auf en/
-# http://viewvc.tigris.org/source/browse/*checkout*/viewvc/trunk/docs/url-reference.html#tarball-view
-# debian /bin/sh debian/get-orig-source.sh
-#
-#opts=dversionmangle=s/\+svn.*$//g \
-#  http://docbook.org/tdg/ en/tdg-en-html-([\d\.]+).zip
+opts=uversionmangle=s/^/5.0\+svn/g,downloadurlmangle=s/\?view.*$/\/trunk\/defguide5.tar.gz\?view=tar/,filenamemangle=s/^.*revision=(\d+)$/docbook5-defguide-5.0+svn$1.tar.gz/ \
+ http://docbook.svn.sourceforge.net/viewvc/docbook/trunk/defguide5/ .*revision=(\d+)$




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