[xml/sgml-commit] r951 - in /packages/docbook-defguide/trunk/debian: changelog control copyright patches/ patches/00list patches/01_misc_fixes.dpatch rules

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sat Dec 15 11:52:24 UTC 2007


Author: dleidert-guest
Date: Sat Dec 15 11:52:23 2007
New Revision: 951

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=951
Log:
* debian/control (Build-Depends, Build-Depends-Indep): Updated/adjusted (NOT
  COMPLETE YET).
* debian/copyright: Updated. Added information about newly added source
  files (xml2po/entities/docbook-xml/sgml-data).
* debian/rules: Added dpatch infrastructure. Removed obsolete stuff (cleanup)
  (NOT COMPLETE YET).
* debian/patches/01_misc_fixes.dpatch: Added. Fixes to make the package
  build (we are not inside the projects SVN).
* debian/patches/00list: Added.


Added:
    packages/docbook-defguide/trunk/debian/patches/
    packages/docbook-defguide/trunk/debian/patches/00list
    packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch   (with props)
Modified:
    packages/docbook-defguide/trunk/debian/changelog
    packages/docbook-defguide/trunk/debian/control
    packages/docbook-defguide/trunk/debian/copyright
    packages/docbook-defguide/trunk/debian/rules

Modified: packages/docbook-defguide/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/changelog?rev=951&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/changelog (original)
+++ packages/docbook-defguide/trunk/debian/changelog Sat Dec 15 11:52:23 2007
@@ -16,9 +16,15 @@
   * 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 (NOT COMPLETE YET)..
+    (Build-Depends, Build-Depends-Indep): Updated/adjusted (NOT COMPLETE YET).
     (Description): Updated.
+  * debian/copyright: Updated. Added information about newly added source
+    files (xml2po/entities/docbook-xml/sgml-data).
   * debian/rules: Added get-orig-source target to retreive the source via SVN.
+    Added dpatch infrastructure. Removed obsolete stuff (cleanup).
+  * 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>  Sat, 15 Dec 2007 00:56:41 +0100
 

Modified: packages/docbook-defguide/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/control?rev=951&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/control (original)
+++ packages/docbook-defguide/trunk/debian/control Sat Dec 15 11:52:23 2007
@@ -2,10 +2,10 @@
 Section: doc
 Priority: optional
 Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: docbook-ebnf, docbook-xsl,
+Build-Depends: debhelper (>= 5), dpatch
+Build-Depends-Indep: docbook-ebnf (>= 1.2~cr1-5), docbook-xsl,
  libsaxon-java (>> 1:6.5), libxml-commons-resolver1.1-java,
- sun-java5-jre, xml-core
+ sun-java5-jre, xml-core, xsltproc
 Standards-Version: 3.7.3
 Homepage: http://docbook.org/tdg/
 

Modified: packages/docbook-defguide/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/copyright?rev=951&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/copyright (original)
+++ packages/docbook-defguide/trunk/debian/copyright Sat Dec 15 11:52:23 2007
@@ -1,442 +1,139 @@
-This package was debianized by Yann Dirson <dirson at debian.org> in May
-2002.
+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>.
 
-It was downloaded from the "defguide" module in the CVS repository
-rooted at
-:pserver:anonymous at cvs.docbook.sourceforge.net:/cvsroot/docbook
+It was downloaded from the docbook SVN repository at
 
-Upstream Authors: Norman Walsh <ndw at nwalsh.com>
-		  Leonard Muellner
-		  Bob Stayton
+  http://docbook.svn.sourceforge.net
+
+  To prepare the source tarball, the get-orig-source target in debian/rules
+  should be used.
+
+Upstream Authors: 
+
+  Norman Walsh <ndw at nwalsh.com>
+  Leonard Muellner
+  Bob Stayton
+
+  Dongsheng Song <dongsheng.song at gmail.com> (Chinese translator)
+  Dorian Deng <doriandeng at gmail.com> (Chinese translator)
 
 Copyright:
 
-Copyright (C) 1999, 2000, 2001 O'Reilly & Associates, Inc.
+  Copyright (C) 2004-2006 Norman Walsh.
+  Portions Copyright (C) 1999-2003 O'Reilly & Associates, Inc.
 
-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; with the Back-Cover Texts as stated below.
+License: GFDL 1.1 or any later version
 
-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.
+  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'. A copy
+of the GFDL 1.1 is also included in the book in Appendix H.
 
-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.
+  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.
 
-Back Cover Text:
-Visit O'Reilly on the Web at http://www.oreilly.com/
+  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. 
 
-License: 
+===== defguide/en/schema/dbebnf.dtd ==========================================
 
-		GNU Free Documentation License
-		  Version 1.2, November 2002
+  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.
 
- Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02111-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+These files are also shipped as part of the docbook-ebnf package.
+http://packages.debian.org/changelogs/pool/main/d/docbook-ebnf/current/copyright
 
+===== defguide/en/schema/$(DocBook 4.5 copy) =================================
 
-0. PREAMBLE
+  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).
 
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
+  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.
 
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
+These files are also shipped as part of the docbook-xml package.
+http://packages.debian.org/changelogs/pool/main/d/docbook-xml/current/copyright
 
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
+===== defguide/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'.
 
-1. APPLICABILITY AND DEFINITIONS
+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
 
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
+===== defguide/*/build/lib/*.ent =============================================
 
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
+  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.
 
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (Thus, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
+  Portions Copyright (C) 1986 International Organization for Standardization
 
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
+  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.
 
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.2
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
-
+These files are also shipped as part of the sgml-data package.
+http://packages.debian.org/changelogs/pool/main/s/sgml-data/current/copyright

Added: packages/docbook-defguide/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/patches/00list?rev=951&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/00list (added)
+++ packages/docbook-defguide/trunk/debian/patches/00list Sat Dec 15 11:52:23 2007
@@ -1,0 +1,1 @@
+01_misc_fixes

Added: packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch?rev=951&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch (added)
+++ packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch Sat Dec 15 11:52:23 2007
@@ -1,0 +1,186 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_misc_fixes.dpatch by Daniel Leidert <daniel.leidert at wgdd.de>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the generic resources, not local copies shipped with the source:
+## DP:
+## DP: * defguide/en/schema/tdg.dtd: The TDG should be DocBook XML v4.5. Also
+## DP:     use the Public ID for DocBook EBNF.
+## DP: * defguide/ru/stylesheets/identity.xsl: Ditto. Do not use a System ID
+## DP:     that points to the local copy.
+## DP:
+## DP: * defguide/en/stylesheets/htmlhelp.xsl: Use the online location for the
+## DP:     current docbook-xsl distribution. The references directory only
+## DP:     exists in SVN and not in our tarball.
+## DP: * defguide/ru/stylesheets/htmlhelp.xsl: Ditto.
+## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
+## DP: * defguide/stylesheets/defguide.xsl: Ditto.
+## DP:
+## DP: * defguide/en/stylesheets/chunk.xsl: Enable output indentation.
+## DP: * defguide/en/stylesheets/identity.xsl: Ditto.
+## DP: * defguide/ru/stylesheets/chunk.xsl: Ditto.
+## DP: * defguide/ru/stylesheets/identity.xsl: Ditto.
+## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
+## DP:
+## DP: * defguide/en/stylesheets/chunk.xsl: Fixed pi-template names.
+## DP: * defguide/ru/stylesheets/chunk.xsl: Ditto.
+## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
+
+ at DPATCH@
+diff -urNad trunk~/defguide/en/schema/tdg.dtd trunk/defguide/en/schema/tdg.dtd
+--- trunk~/defguide/en/schema/tdg.dtd	2005-04-15 16:26:14.000000000 +0200
++++ trunk/defguide/en/schema/tdg.dtd	2007-12-15 04:25:47.000000000 +0100
+@@ -1,5 +1,6 @@
+-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
++<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                    "docbookx.dtd">
+-<!ENTITY % dbebnf SYSTEM "dbebnf.dtd">
++<!ENTITY % dbebnf PUBLIC "-//OASIS//DTD DocBook EBNF Module V1.2CR1//EN"
++                   "dbebnf.dtd">
+ 
+ %dbebnf;
+diff -urNad trunk~/defguide/en/stylesheets/chunk.xsl trunk/defguide/en/stylesheets/chunk.xsl
+--- trunk~/defguide/en/stylesheets/chunk.xsl	2003-01-01 22:39:36.000000000 +0100
++++ trunk/defguide/en/stylesheets/chunk.xsl	2007-12-15 04:28:27.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ <xsl:output method="html"
+             encoding="ISO-8859-1"
+-            indent="no"/>
++            indent="yes"/>
+ 
+ <xsl:param name="html.ext" select="'.html'"/>
+ <xsl:param name="root.filename" select="'docbook'"/>
+@@ -111,10 +111,10 @@
+   <!-- returns the filename of a chunk -->
+   <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
+   <xsl:variable name="filename">
+-    <xsl:call-template name="dbhtml-filename"/>
++    <xsl:call-template name="pi.dbhtml_filename"/>
+   </xsl:variable>
+   <xsl:variable name="dir">
+-    <xsl:call-template name="dbhtml-dir"/>
++    <xsl:call-template name="pi.dbhtml_dir"/>
+   </xsl:variable>
+ 
+   <xsl:choose>
+diff -urNad trunk~/defguide/en/stylesheets/htmlhelp.xsl trunk/defguide/en/stylesheets/htmlhelp.xsl
+--- trunk~/defguide/en/stylesheets/htmlhelp.xsl	2007-03-20 22:16:16.000000000 +0100
++++ trunk/defguide/en/stylesheets/htmlhelp.xsl	2007-12-15 04:27:22.000000000 +0100
+@@ -11,7 +11,7 @@
+      ******************************************************************** -->
+ 
+ <xsl:import href="chunk.xsl"/>
+-<xsl:import href="../../../xsl/htmlhelp/htmlhelp-common.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp-common.xsl"/>
+ <xsl:include href="manifest.xsl"/>
+ 
+ <xsl:param name="use.extensions" select="1"/>
+diff -urNad trunk~/defguide/en/stylesheets/identity.xsl trunk/defguide/en/stylesheets/identity.xsl
+--- trunk~/defguide/en/stylesheets/identity.xsl	2005-04-15 17:18:32.000000000 +0200
++++ trunk/defguide/en/stylesheets/identity.xsl	2007-12-15 04:28:51.000000000 +0100
+@@ -4,7 +4,7 @@
+                 exclude-result-prefixes="saxon"
+                 version="1.0">
+ 
+-  <xsl:output method="xml" indent="no"
++  <xsl:output method="xml" indent="yes"
+               doctype-system="schema/tdg.dtd"/>
+ 
+   <xsl:preserve-space elements="*"/>
+diff -urNad trunk~/defguide/ru/stylesheets/chunk.xsl trunk/defguide/ru/stylesheets/chunk.xsl
+--- trunk~/defguide/ru/stylesheets/chunk.xsl	2004-02-23 15:25:58.000000000 +0100
++++ trunk/defguide/ru/stylesheets/chunk.xsl	2007-12-15 04:29:05.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ <xsl:output method="html"
+             encoding="ISO-8859-1"
+-            indent="no"/>
++            indent="yes"/>
+ 
+ <xsl:param name="html.ext" select="'.html'"/>
+ <xsl:param name="root.filename" select="'docbook'"/>
+@@ -111,10 +111,10 @@
+   <!-- returns the filename of a chunk -->
+   <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
+   <xsl:variable name="filename">
+-    <xsl:call-template name="dbhtml-filename"/>
++    <xsl:call-template name="pi.dbhtml_filename"/>
+   </xsl:variable>
+   <xsl:variable name="dir">
+-    <xsl:call-template name="dbhtml-dir"/>
++    <xsl:call-template name="pi.dbhtml_dir"/>
+   </xsl:variable>
+ 
+   <xsl:choose>
+diff -urNad trunk~/defguide/ru/stylesheets/htmlhelp.xsl trunk/defguide/ru/stylesheets/htmlhelp.xsl
+--- trunk~/defguide/ru/stylesheets/htmlhelp.xsl	2004-02-23 15:25:58.000000000 +0100
++++ trunk/defguide/ru/stylesheets/htmlhelp.xsl	2007-12-15 04:27:42.000000000 +0100
+@@ -11,8 +11,8 @@
+      ******************************************************************** -->
+ 
+ <xsl:import href="chunk.xsl"/>
+-<xsl:import href="../../../xsl/htmlhelp/htmlhelp-common.xsl"/>
+-<xsl:include href="../../../xsl/html/manifest.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp-common.xsl"/>
++<xsl:include href="http://docbook.sourceforge.net/release/xsl/current/html/manifest.xsl"/>
+ 
+ <xsl:param name="use.extensions" select="1"/>
+ <xsl:param name="base.dir" select="'htmlhelp/'"/>
+diff -urNad trunk~/defguide/ru/stylesheets/identity.xsl trunk/defguide/ru/stylesheets/identity.xsl
+--- trunk~/defguide/ru/stylesheets/identity.xsl	2004-02-23 15:25:58.000000000 +0100
++++ trunk/defguide/ru/stylesheets/identity.xsl	2007-12-15 04:29:16.000000000 +0100
+@@ -4,8 +4,9 @@
+                 exclude-result-prefixes="saxon"
+                 version="1.0">
+ 
+-  <xsl:output method="xml" indent="no"
+-              doctype-system="../../docbook/ebnf/dbebnf.dtd"/>
++  <xsl:output method="xml" indent="yes"
++              doctype-public="-//OASIS//DTD DocBook EBNF Module V1.2CR1//EN"
++              doctype-system="http://www.oasis-open.org/docbook/xml/ebnf/1.2CR1/dbebnf.dtd"/>
+ 
+   <xsl:preserve-space elements="*"/>
+ 
+diff -urNad trunk~/defguide/stylesheets/defchunk.xsl trunk/defguide/stylesheets/defchunk.xsl
+--- trunk~/defguide/stylesheets/defchunk.xsl	2001-08-03 13:56:41.000000000 +0200
++++ trunk/defguide/stylesheets/defchunk.xsl	2007-12-15 04:29:28.000000000 +0100
+@@ -12,11 +12,11 @@
+      to avoid chunking. -->
+ 
+ <xsl:import href="defguide.xsl"/>
+-<xsl:include href="../../xsl/html/chunker.xsl"/>
++<xsl:include href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/>
+ 
+ <xsl:output method="html"
+             encoding="ISO-8859-1"
+-            indent="no"/>
++            indent="yes"/>
+ 
+ <!-- ==================================================================== -->
+ 
+@@ -118,10 +118,10 @@
+   <!-- returns the filename of a chunk -->
+   <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
+   <xsl:variable name="filename">
+-    <xsl:call-template name="dbhtml-filename"/>
++    <xsl:call-template name="pi.dbhtml_filename"/>
+   </xsl:variable>
+   <xsl:variable name="dir">
+-    <xsl:call-template name="dbhtml-dir"/>
++    <xsl:call-template name="pi.dbhtml_dir"/>
+   </xsl:variable>
+ 
+   <xsl:choose>
+diff -urNad trunk~/defguide/stylesheets/defguide.xsl trunk/defguide/stylesheets/defguide.xsl
+--- trunk~/defguide/stylesheets/defguide.xsl	2001-08-03 15:28:54.000000000 +0200
++++ trunk/defguide/stylesheets/defguide.xsl	2007-12-15 04:28:11.000000000 +0100
+@@ -5,7 +5,7 @@
+                 exclude-result-prefixes="scvs xcvs"
+                 version="1.0">
+ 
+-<xsl:import href="../../xsl/html/autoidx.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/autoidx.xsl"/>
+ <xsl:include href="html-titlepage.xsl"/>
+ 
+ <xsl:param name="output.media" select="'online'"/>

Propchange: packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/docbook-defguide/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/rules?rev=951&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/rules (original)
+++ packages/docbook-defguide/trunk/debian/rules Sat Dec 15 11:52:23 2007
@@ -1,27 +1,19 @@
 #!/usr/bin/make -f
 
-build: build-stamp
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
-
-	cd en && docbook-2-html -O -Vhtml-index -O -D`pwd` --style local=../defguide.dsl book.xml
-	-tidy -m en/book-html/*.html
-
+	$(MAKE) -C defguide/en tdg.xml
+	$(MAKE) -C defguide/en JAVA=/usr/lib/jvm/java-1.5.0-sun/jre/bin/java BASEDIR=html/
 	touch build-stamp
 
-reindex:
-	dh_testdir
-
-	docbook-2-html -O -Vhtml-index --style local book.xml
-	collateindex.pl -tIndex -iindex -f -o en/index.xml book-html/HTML.index
-
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	rm -rf en/book-html
-
+	$(MAKE) -C defguide/en clean
+	rm -f build-stamp patch-stamp
 	dh_clean
 
 install: build
@@ -30,27 +22,21 @@
 	dh_clean -k
 	dh_installdirs
 
-	mkdir -p debian/docbook-defguide/usr/share/doc/docbook-defguide
-	cp -a en/book-html debian/docbook-defguide/usr/share/doc/docbook-defguide/html
-	cd debian/docbook-defguide/usr/share/doc/docbook-defguide/html && \
-		rm -f HTML.index index.sgml
-	cp -a en/figures/100dpi debian/docbook-defguide/usr/share/doc/docbook-defguide/html/figures
-	find debian/docbook-defguide/usr/share/doc/docbook-defguide/html/figures -name CVS | xargs rm -rf
-
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs en/README
-#	dh_installinfo
-	dh_installchangelogs 
-	dh_compress -Xdocbook-defguide/html/changelog.html
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i
+	dh_installdocs -i defguide/en/README
+#	dh_installinfo -i
+	dh_compress -i -Xdocbook-defguide/html/changelog.html
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch:
+# Nothing to do here.
 
 binary: binary-indep binary-arch
 




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