[xml/sgml-commit] r1143 - in /packages/docbook-xsl-doc/branches/experimental/debian: ./ examples/ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Tue Aug 26 20:06:47 UTC 2008
Author: dleidert-guest
Date: Tue Aug 26 20:06:44 2008
New Revision: 1143
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1143
Log:
* Source split into the docbook-xsl and docbook-xsl-doc (because
docbook-xsl-ns needs the same documentation files).
* debian/control: Removed docbook-xsl binary package fields.
(Source): Source split. This is now docbook-xsl-doc.
(Build-Depends-Indep): Removed docbook-xsl related dependencies.
(Standards-Version): Bumped to 3.8.0.
(Homepage): Adjusted.
(Vcs-Browser, Vcs-Svn): Fixed to point to docbook-xsl-doc repository.
(Enhances): Adjusted.
* debian/copyright: Adjusted for split source. Removed docbook-xsl related
stuff.
* debian/docbook-xsl.*: Removed docbook-xsl related debhelper files.
* debian/presubj: Ditto.
* debian/NEWS: Ditto.
* debian/README.Debian: Ditto.
* debian/docbook-xsl-doc-*.copyright: Replaced by debian/copyright.
* debian/docbook-xsl-doc-*.docs: Removed. Installed by debian/rules.
* debian/rules: Cleanup for source split.
* debian/watch: Adjusted for new docbook-xsl-doc source package.
* debian/examples/: Removed docbook-xsl binary package related stuff.
* debian/patches/7436_html_fo_fix_empty_index_entries.dpatch: Ditto.
* debian/patches/7440_fo_normalize_space.dpatch: Ditto.
* debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch: Ditto.
* debian/patches/7528_common_fix_too_many_nested_elements.dpatch: Ditto.
* debian/patches/7564_fo_fix_typo.dpatch: Ditto.
* debian/patches/7623_man_support_for_processing_structfield.dpatch: Ditto.
* debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch: Ditto.
* debian/patches/7656_html_component_title_in_info_elements.dpatch: Ditto.
* debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Ditto.
* debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch: Ditto.
* debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Ditto.
* debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Ditto.
* debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Ditto.
* debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
Ditto.
* debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Ditto.
* debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Ditto.
* debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Ditto.
* debian/patches/02_use_global_papersize_conf.dpatch: Adjusted.
* debian/patches/00list: Adjusted.
Removed:
packages/docbook-xsl-doc/branches/experimental/debian/NEWS
packages/docbook-xsl-doc/branches/experimental/debian/README.Debian
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-html.copyright
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-html.docs
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-pdf.copyright
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-pdf.docs
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-text.copyright
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl-doc-text.docs
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.dirs
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.docs
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.examples
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.install
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.links
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.postinst
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.preinst
packages/docbook-xsl-doc/branches/experimental/debian/docbook-xsl.xmlcatalogs
packages/docbook-xsl-doc/branches/experimental/debian/examples/
packages/docbook-xsl-doc/branches/experimental/debian/patches/00options
packages/docbook-xsl-doc/branches/experimental/debian/patches/00template
packages/docbook-xsl-doc/branches/experimental/debian/patches/7436_html_fo_fix_empty_index_entries.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7440_fo_normalize_space.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7528_common_fix_too_many_nested_elements.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7564_fo_fix_typo.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7623_man_support_for_processing_structfield.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7656_html_component_title_in_info_elements.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7806_man_fix_non_breaking_space_output.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7901_fo_fix_inline_or_block_template.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/presubj
Modified:
packages/docbook-xsl-doc/branches/experimental/debian/changelog
packages/docbook-xsl-doc/branches/experimental/debian/control
packages/docbook-xsl-doc/branches/experimental/debian/copyright
packages/docbook-xsl-doc/branches/experimental/debian/patches/00list
packages/docbook-xsl-doc/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch
packages/docbook-xsl-doc/branches/experimental/debian/rules
packages/docbook-xsl-doc/branches/experimental/debian/watch
Modified: packages/docbook-xsl-doc/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/changelog?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/changelog (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/changelog Tue Aug 26 20:06:44 2008
@@ -2,7 +2,47 @@
* NOT RELEASED YET
* New upstream release 1.74.0.
- * Source split into the docbook-xsl and docbook-xsl-doc.
+ * Source split into the docbook-xsl and docbook-xsl-doc (because
+ docbook-xsl-ns needs the same documentation files).
+
+ * debian/control: Removed docbook-xsl binary package fields.
+ (Source): Source split. This is now docbook-xsl-doc.
+ (Build-Depends-Indep): Removed docbook-xsl related dependencies.
+ (Standards-Version): Bumped to 3.8.0.
+ (Homepage): Adjusted.
+ (Vcs-Browser, Vcs-Svn): Fixed to point to docbook-xsl-doc repository.
+ (Enhances): Adjusted.
+ * debian/copyright: Adjusted for split source. Removed docbook-xsl related
+ stuff.
+ * debian/docbook-xsl.*: Removed docbook-xsl related debhelper files.
+ * debian/presubj: Ditto.
+ * debian/NEWS: Ditto.
+ * debian/README.Debian: Ditto.
+ * debian/docbook-xsl-doc-*.copyright: Replaced by debian/copyright.
+ * debian/docbook-xsl-doc-*.docs: Removed. Installed by debian/rules.
+ * debian/rules: Cleanup for source split.
+ * debian/watch: Adjusted for new docbook-xsl-doc source package.
+ * debian/examples/: Removed docbook-xsl binary package related stuff.
+ * debian/patches/7436_html_fo_fix_empty_index_entries.dpatch: Ditto.
+ * debian/patches/7440_fo_normalize_space.dpatch: Ditto.
+ * debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch: Ditto.
+ * debian/patches/7528_common_fix_too_many_nested_elements.dpatch: Ditto.
+ * debian/patches/7564_fo_fix_typo.dpatch: Ditto.
+ * debian/patches/7623_man_support_for_processing_structfield.dpatch: Ditto.
+ * debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch: Ditto.
+ * debian/patches/7656_html_component_title_in_info_elements.dpatch: Ditto.
+ * debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Ditto.
+ * debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch: Ditto.
+ * debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Ditto.
+ * debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Ditto.
+ * debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Ditto.
+ * debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
+ Ditto.
+ * debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Ditto.
+ * debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Ditto.
+ * debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Ditto.
+ * debian/patches/02_use_global_papersize_conf.dpatch: Adjusted.
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Tue, 26 Aug 2008 16:22:48 +0200
Modified: packages/docbook-xsl-doc/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/control?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/control (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/control Tue Aug 26 20:06:44 2008
@@ -1,34 +1,14 @@
-Source: docbook-xsl
+Source: docbook-xsl-doc
Section: text
Priority: optional
Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: xml-core
-Standards-Version: 3.7.3
-Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/trunk/
+Standards-Version: 3.8.0
+Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheetDocs
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl-doc/trunk/
DM-Upload-Allowed: yes
-
-Package: docbook-xsl
-Section: text
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: docbook-xml (>= 4.1.2-4), docbook-xsl-doc-html (= ${source:Version}) | docbook-xsl-doc-pdf (= ${source:Version}) | docbook-xsl-doc-text (= ${source:Version}) | docbook-xsl-doc
-Suggests: xsltproc, xalan, fop, libsaxon-java, libxalan2-java
-Description: stylesheets for processing DocBook XML files to various output formats
- These are modular XSL stylesheets for processing documents composed
- with the DocBook XML DTD and its derivatives ("Simplified" DocBook
- XML, JRefEntry DTD, etc.).
- .
- The stylesheets provide XSLT transformations for (X)HTML, WordML, HTML Help,
- JavaHelp, Man page (nroff), Website, Eclipse Platform Help file and Formatting
- Object (FO) output. The latter can be further processed to a number of print
- formats using FOP or TeX-based tools.
- .
- The stylesheets are modular in the sense that you can extend and, to some
- extent, customize them. The documentation is included in a separate package.
Package: docbook-xsl-doc-html
Section: doc
@@ -37,7 +17,7 @@
Provides: docbook-xsl-doc
Conflicts: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
Replaces: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
-Enhances: docbook-xsl (= ${source:Version})
+Enhances: docbook-xsl (>= ${source:Version})
Description: stylesheets for processing DocBook XML files (HTML documentation)
The package contains the documentation for the DocBook XSL stylesheets and
explanations for the parameters you can use in HTML format.
@@ -47,7 +27,7 @@
Architecture: all
Recommends: gv | xpdf-reader| pdf-viewer
Provides: docbook-xsl-doc
-Enhances: docbook-xsl (= ${source:Version})
+Enhances: docbook-xsl (>= ${source:Version})
Description: stylesheets for processing DocBook XML files (PDF documentation)
The package contains the documentation for the DocBook XSL stylesheets and
explanations for the parameters you can use in PDF format.
@@ -57,7 +37,7 @@
Architecture: all
Recommends: less
Provides: docbook-xsl-doc
-Enhances: docbook-xsl (= ${source:Version})
+Enhances: docbook-xsl (>= ${source:Version})
Description: stylesheets for processing DocBook XML files (ASCII documentation)
The package contains the documentation for the DocBook XSL stylesheets and
explanations for the parameters you can use in simple ASCII text format.
Modified: packages/docbook-xsl-doc/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/copyright?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/copyright (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/copyright Tue Aug 26 20:06:44 2008
@@ -11,38 +11,12 @@
Copyright (C) 1999-2007 Norman Walsh.
Copyright (C) 2003 Jiřà Kosek.
Copyright (C) 2004-2007 Steve Ball.
- Copyright (C) 2005-2007 The DocBook Project.
-
- Several files in the
- /usr/share/xml/docbook/stylesheet/nwalsh/highlighting directory are
- copyright:
-
- delphi-hl.xml, ini-hl.xml, java-hl.xml, m2-hl.xml, myxml-hl.xml,
- php-hl.xml:
- Copyright (C) 2005 Michal Molhanec.
-
- Several JavaScript files in the
- /usr/share/xml/docbook/stylesheet/nwalsh/slides/browser directory are
- copyright:
-
- xbLibrary.js:
- Copyright (C) 2000 Bob Clary.
- ua.js, xbDebug.js, xbDOM.js, xbStyle.js, xbStyle-css.js, xbStyle-nn4.js,
- xbStyle-not-supported.js:
- Copyright (C) 2001 The Netscape Corporation.
- CTOCWidget.js:
- Copyright (C) 2003 The Netscape Corporation.
- xbCollapsibleLists.js:
- Copyright (C) 1997 Michael Bostock (Netscape Communications).
- Copyright (C) 2001 Bob Clary (Netscape Communications).
- Copyright (C) 2001 Seth Dillingham (Macrobyte Resources).
- Copyright (C) 2002 Mark Filanowicz (Amdahl IT Services).
+ Copyright (C) 2005-2008 The DocBook Project.
Upstream Author:
- Norman Walsh <ndw at nwalsh.com> and other docbook developers at
- the Sourceforge DocBook Open Repository. As you can see above, code was
- also derived from other sources.
+ Norman Walsh <ndw at nwalsh.com> and and members of the DocBook Project
+ <docbook-developers at sf.net>.
License and warranty for most parts of the package: MIT/X Consortium License
@@ -74,528 +48,3 @@
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-License and warranty for delphi-hl.xml, ini-hl.xml, java-hl.xml, m2-hl.xml,
- myxml-hl.xml, php-hl.xml:
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source
- distribution.
-
- THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED WARRANTY.
- IN NO EVENT WILL THE AUTHORS BE HELD LIABLE FOR ANY DAMAGE ARISING FROM THE
- USE OF THIS SOFTWARE.
-
-License and warranty for slides.js: All-Permissive
-
- You are free to use, modify and distribute this software without limitation.
-
- THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT A WARRANTY OF ANY KIND.
-
-License and warranty for xbCollapsibleLists.js: All-Permissive
-
- Netscape grants you a royalty free license to use, modify or
- distribute this software provided that this copyright notice
- appears on all copies.
-
- THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT A WARRANTY OF ANY KIND.
-
-License and warranty for CTOCWidget.js, ua.js, xbDebug.js, xbDOM.js,
- xbLibrary.js, xbStyle.js, xbStyle-css.js, xbStyle-nn4.js,
- xbStyle-not-supported.js: MPL 1.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
-
-==============================================================================
-
-The Mozilla Public License (MPL) Version 1.1 follows:
-
- MOZILLA PUBLIC LICENSE
- Version 1.1
-
- ---------------
-
- 1. Definitions.
-
- 1.0.1. "Commercial Use" means distribution or otherwise making the
- Covered Code available to a third party.
-
- 1.1. "Contributor" means each entity that creates or contributes to
- the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original
- Code, prior Modifications used by a Contributor, and the Modifications
- made by that particular Contributor.
-
- 1.3. "Covered Code" means the Original Code or Modifications or the
- combination of the Original Code and Modifications, in each case
- including portions thereof.
-
- 1.4. "Electronic Distribution Mechanism" means a mechanism generally
- accepted in the software development community for the electronic
- transfer of data.
-
- 1.5. "Executable" means Covered Code in any form other than Source
- Code.
-
- 1.6. "Initial Developer" means the individual or entity identified
- as the Initial Developer in the Source Code notice required by Exhibit
- A.
-
- 1.7. "Larger Work" means a work which combines Covered Code or
- portions thereof with code not governed by the terms of this License.
-
- 1.8. "License" means this document.
-
- 1.8.1. "Licensable" means having the right to grant, to the maximum
- extent possible, whether at the time of the initial grant or
- subsequently acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means any addition to or deletion from the
- substance or structure of either the Original Code or any previous
- Modifications. When Covered Code is released as a series of files, a
- Modification is:
- A. Any addition to or deletion from the contents of a file
- containing Original Code or previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
- previous Modifications.
-
- 1.10. "Original Code" means Source Code of computer software code
- which is described in the Source Code notice required by Exhibit A as
- Original Code, and which, at the time of its release under this
- License is not already Covered Code governed by this License.
-
- 1.10.1. "Patent Claims" means any patent claim(s), now owned or
- hereafter acquired, including without limitation, method, process,
- and apparatus claims, in any patent Licensable by grantor.
-
- 1.11. "Source Code" means the preferred form of the Covered Code for
- making modifications to it, including all modules it contains, plus
- any associated interface definition files, scripts used to control
- compilation and installation of an Executable, or source code
- differential comparisons against either the Original Code or another
- well known, available Covered Code of the Contributor's choice. The
- Source Code can be in a compressed or archival form, provided the
- appropriate decompression or de-archiving software is widely available
- for no charge.
-
- 1.12. "You" (or "Your") means an individual or a legal entity
- exercising rights under, and complying with all of the terms of, this
- License or a future version of this License issued under Section 6.1.
- For legal entities, "You" includes any entity which controls, is
- controlled by, or is under common control with You. For purposes of
- this definition, "control" means (a) the power, direct or indirect,
- to cause the direction or management of such entity, whether by
- contract or otherwise, or (b) ownership of more than fifty percent
- (50%) of the outstanding shares or beneficial ownership of such
- entity.
-
- 2. Source Code License.
-
- 2.1. The Initial Developer Grant.
- The Initial Developer hereby grants You a world-wide, royalty-free,
- non-exclusive license, subject to third party intellectual property
- claims:
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Initial Developer to use, reproduce,
- modify, display, perform, sublicense and distribute the Original
- Code (or portions thereof) with or without Modifications, and/or
- as part of a Larger Work; and
-
- (b) under Patents Claims infringed by the making, using or
- selling of Original Code, to make, have made, use, practice,
- sell, and offer for sale, and/or otherwise dispose of the
- Original Code (or portions thereof).
-
- (c) the licenses granted in this Section 2.1(a) and (b) are
- effective on the date Initial Developer first distributes
- Original Code under the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
- granted: 1) for code that You delete from the Original Code; 2)
- separate from the Original Code; or 3) for infringements caused
- by: i) the modification of the Original Code or ii) the
- combination of the Original Code with other software or devices.
-
- 2.2. Contributor Grant.
- Subject to third party intellectual property claims, each Contributor
- hereby grants You a world-wide, royalty-free, non-exclusive license
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Contributor, to use, reproduce, modify,
- display, perform, sublicense and distribute the Modifications
- created by such Contributor (or portions thereof) either on an
- unmodified basis, with other Modifications, as Covered Code
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or
- selling of Modifications made by that Contributor either alone
- and/or in combination with its Contributor Version (or portions
- of such combination), to make, use, sell, offer for sale, have
- made, and/or otherwise dispose of: 1) Modifications made by that
- Contributor (or portions thereof); and 2) the combination of
- Modifications made by that Contributor with its Contributor
- Version (or portions of such combination).
-
- (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
- effective on the date Contributor first makes Commercial Use of
- the Covered Code.
-
- (d) Notwithstanding Section 2.2(b) above, no patent license is
- granted: 1) for any code that Contributor has deleted from the
- Contributor Version; 2) separate from the Contributor Version;
- 3) for infringements caused by: i) third party modifications of
- Contributor Version or ii) the combination of Modifications made
- by that Contributor with other software (except as part of the
- Contributor Version) or other devices; or 4) under Patent Claims
- infringed by Covered Code in the absence of Modifications made by
- that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Application of License.
- The Modifications which You create or to which You contribute are
- governed by the terms of this License, including without limitation
- Section 2.2. The Source Code version of Covered Code may be
- distributed only under the terms of this License or a future version
- of this License released under Section 6.1, and You must include a
- copy of this License with every copy of the Source Code You
- distribute. You may not offer or impose any terms on any Source Code
- version that alters or restricts the applicable version of this
- License or the recipients' rights hereunder. However, You may include
- an additional document offering the additional rights described in
- Section 3.5.
-
- 3.2. Availability of Source Code.
- Any Modification which You create or to which You contribute must be
- made available in Source Code form under the terms of this License
- either on the same media as an Executable version or via an accepted
- Electronic Distribution Mechanism to anyone to whom you made an
- Executable version available; and if made available via Electronic
- Distribution Mechanism, must remain available for at least twelve (12)
- months after the date it initially became available, or at least six
- (6) months after a subsequent version of that particular Modification
- has been made available to such recipients. You are responsible for
- ensuring that the Source Code version remains available even if the
- Electronic Distribution Mechanism is maintained by a third party.
-
- 3.3. Description of Modifications.
- You must cause all Covered Code to which You contribute to contain a
- file documenting the changes You made to create that Covered Code and
- the date of any change. You must include a prominent statement that
- the Modification is derived, directly or indirectly, from Original
- Code provided by the Initial Developer and including the name of the
- Initial Developer in (a) the Source Code, and (b) in any notice in an
- Executable version or related documentation in which You describe the
- origin or ownership of the Covered Code.
-
- 3.4. Intellectual Property Matters
- (a) Third Party Claims.
- If Contributor has knowledge that a license under a third party's
- intellectual property rights is required to exercise the rights
- granted by such Contributor under Sections 2.1 or 2.2,
- Contributor must include a text file with the Source Code
- distribution titled "LEGAL" which describes the claim and the
- party making the claim in sufficient detail that a recipient will
- know whom to contact. If Contributor obtains such knowledge after
- the Modification is made available as described in Section 3.2,
- Contributor shall promptly modify the LEGAL file in all copies
- Contributor makes available thereafter and shall take other steps
- (such as notifying appropriate mailing lists or newsgroups)
- reasonably calculated to inform those who received the Covered
- Code that new knowledge has been obtained.
-
- (b) Contributor APIs.
- If Contributor's Modifications include an application programming
- interface and Contributor has knowledge of patent licenses which
- are reasonably necessary to implement that API, Contributor must
- also include this information in the LEGAL file.
-
- (c) Representations.
- Contributor represents that, except as disclosed pursuant to
- Section 3.4(a) above, Contributor believes that Contributor's
- Modifications are Contributor's original creation(s) and/or
- Contributor has sufficient rights to grant the rights conveyed by
- this License.
-
- 3.5. Required Notices.
- You must duplicate the notice in Exhibit A in each file of the Source
- Code. If it is not possible to put such notice in a particular Source
- Code file due to its structure, then You must include such notice in a
- location (such as a relevant directory) where a user would be likely
- to look for such a notice. If You created one or more Modification(s)
- You may add your name as a Contributor to the notice described in
- Exhibit A. You must also duplicate this License in any documentation
- for the Source Code where You describe recipients' rights or ownership
- rights relating to Covered Code. You may choose to offer, and to
- charge a fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Code. However, You
- may do so only on Your own behalf, and not on behalf of the Initial
- Developer or any Contributor. You must make it absolutely clear than
- any such warranty, support, indemnity or liability obligation is
- offered by You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred by the
- Initial Developer or such Contributor as a result of warranty,
- support, indemnity or liability terms You offer.
-
- 3.6. Distribution of Executable Versions.
- You may distribute Covered Code in Executable form only if the
- requirements of Section 3.1-3.5 have been met for that Covered Code,
- and if You include a notice stating that the Source Code version of
- the Covered Code is available under the terms of this License,
- including a description of how and where You have fulfilled the
- obligations of Section 3.2. The notice must be conspicuously included
- in any notice in an Executable version, related documentation or
- collateral in which You describe recipients' rights relating to the
- Covered Code. You may distribute the Executable version of Covered
- Code or ownership rights under a license of Your choice, which may
- contain terms different from this License, provided that You are in
- compliance with the terms of this License and that the license for the
- Executable version does not attempt to limit or alter the recipient's
- rights in the Source Code version from the rights set forth in this
- License. If You distribute the Executable version under a different
- license You must make it absolutely clear that any terms which differ
- from this License are offered by You alone, not by the Initial
- Developer or any Contributor. You hereby agree to indemnify the
- Initial Developer and every Contributor for any liability incurred by
- the Initial Developer or such Contributor as a result of any such
- terms You offer.
-
- 3.7. Larger Works.
- You may create a Larger Work by combining Covered Code with other code
- not governed by the terms of this License and distribute the Larger
- Work as a single product. In such a case, You must make sure the
- requirements of this License are fulfilled for the Covered Code.
-
- 4. Inability to Comply Due to Statute or Regulation.
-
- If it is impossible for You to comply with any of the terms of this
- License with respect to some or all of the Covered Code due to
- statute, judicial order, or regulation then You must: (a) comply with
- the terms of this License to the maximum extent possible; and (b)
- describe the limitations and the code they affect. Such description
- must be included in the LEGAL file described in Section 3.4 and must
- be included with all distributions of the Source Code. Except to the
- extent prohibited by statute or regulation, such description must be
- sufficiently detailed for a recipient of ordinary skill to be able to
- understand it.
-
- 5. Application of this License.
-
- This License applies to code to which the Initial Developer has
- attached the notice in Exhibit A and to related Covered Code.
-
- 6. Versions of the License.
-
- 6.1. New Versions.
- Netscape Communications Corporation ("Netscape") may publish revised
- and/or new versions of the License from time to time. Each version
- will be given a distinguishing version number.
-
- 6.2. Effect of New Versions.
- Once Covered Code has been published under a particular version of the
- License, You may always continue to use it under the terms of that
- version. You may also choose to use such Covered Code under the terms
- of any subsequent version of the License published by Netscape. No one
- other than Netscape has the right to modify the terms applicable to
- Covered Code created under this License.
-
- 6.3. Derivative Works.
- If You create or use a modified version of this License (which you may
- only do in order to apply it to code which is not already Covered Code
- governed by this License), You must (a) rename Your license so that
- the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
- "MPL", "NPL" or any confusingly similar phrase do not appear in your
- license (except to note that your license differs from this License)
- and (b) otherwise make it clear that Your version of the license
- contains terms which differ from the Mozilla Public License and
- Netscape Public License. (Filling in the name of the Initial
- Developer, Original Code or Contributor in the notice described in
- Exhibit A shall not of themselves be deemed to be modifications of
- this License.)
-
- 7. DISCLAIMER OF WARRANTY.
-
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
- THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
- IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
- YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
- COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
- 8. TERMINATION.
-
- 8.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. All
- sublicenses to the Covered Code which are properly granted shall
- survive any termination of this License. Provisions which, by their
- nature, must remain in effect beyond the termination of this License
- shall survive.
-
- 8.2. If You initiate litigation by asserting a patent infringement
- claim (excluding declatory judgment actions) against Initial Developer
- or a Contributor (the Initial Developer or Contributor against whom
- You file such action is referred to as "Participant") alleging that:
-
- (a) such Participant's Contributor Version directly or indirectly
- infringes any patent, then any and all rights granted by such
- Participant to You under Sections 2.1 and/or 2.2 of this License
- shall, upon 60 days notice from Participant terminate prospectively,
- unless if within 60 days after receipt of notice You either: (i)
- agree in writing to pay Participant a mutually agreeable reasonable
- royalty for Your past and future use of Modifications made by such
- Participant, or (ii) withdraw Your litigation claim with respect to
- the Contributor Version against such Participant. If within 60 days
- of notice, a reasonable royalty and payment arrangement are not
- mutually agreed upon in writing by the parties or the litigation claim
- is not withdrawn, the rights granted by Participant to You under
- Sections 2.1 and/or 2.2 automatically terminate at the expiration of
- the 60 day notice period specified above.
-
- (b) any software, hardware, or device, other than such Participant's
- Contributor Version, directly or indirectly infringes any patent, then
- any rights granted to You by such Participant under Sections 2.1(b)
- and 2.2(b) are revoked effective as of the date You first made, used,
- sold, distributed, or had made, Modifications made by that
- Participant.
-
- 8.3. If You assert a patent infringement claim against Participant
- alleging that such Participant's Contributor Version directly or
- indirectly infringes any patent where such claim is resolved (such as
- by license or settlement) prior to the initiation of patent
- infringement litigation, then the reasonable value of the licenses
- granted by such Participant under Sections 2.1 or 2.2 shall be taken
- into account in determining the amount or value of any payment or
- license.
-
- 8.4. In the event of termination under Sections 8.1 or 8.2 above,
- all end user license agreements (excluding distributors and resellers)
- which have been validly granted by You or any distributor hereunder
- prior to termination shall survive termination.
-
- 9. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
- DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
- OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
- ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
- CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
- WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
- RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
- EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
- THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
- 10. U.S. GOVERNMENT END USERS.
-
- The Covered Code is a "commercial item," as that term is defined in
- 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
- software" and "commercial computer software documentation," as such
- terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
- C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
- all U.S. Government End Users acquire Covered Code with only those
- rights set forth herein.
-
- 11. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. This License shall be governed by
- California law provisions (except to the extent applicable law, if
- any, provides otherwise), excluding its conflict-of-law provisions.
- With respect to disputes in which at least one party is a citizen of,
- or an entity chartered or registered to do business in the United
- States of America, any litigation relating to this License shall be
- subject to the jurisdiction of the Federal Courts of the Northern
- District of California, with venue lying in Santa Clara County,
- California, with the losing party responsible for costs, including
- without limitation, court costs and reasonable attorneys' fees and
- expenses. The application of the United Nations Convention on
- Contracts for the International Sale of Goods is expressly excluded.
- Any law or regulation which provides that the language of a contract
- shall be construed against the drafter shall not apply to this
- License.
-
- 12. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or indirectly,
- out of its utilization of rights under this License and You agree to
- work with Initial Developer and Contributors to distribute such
- responsibility on an equitable basis. Nothing herein is intended or
- shall be deemed to constitute any admission of liability.
-
- 13. MULTIPLE-LICENSED CODE.
-
- Initial Developer may designate portions of the Covered Code as
- "Multiple-Licensed". "Multiple-Licensed" means that the Initial
- Developer permits you to utilize portions of the Covered Code under
- Your choice of the NPL or the alternative licenses, if any, specified
- by the Initial Developer in the file described in Exhibit A.
-
- EXHIBIT A -Mozilla Public License.
-
- ``The contents of this file are subject to the Mozilla Public License
- Version 1.1 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- License for the specific language governing rights and limitations
- under the License.
-
- The Original Code is ______________________________________.
-
- The Initial Developer of the Original Code is ________________________.
- Portions created by ______________________ are Copyright (C) ______
- _______________________. All Rights Reserved.
-
- Contributor(s): ______________________________________.
-
- Alternatively, the contents of this file may be used under the terms
- of the _____ license (the "[___] License"), in which case the
- provisions of [______] License are applicable instead of those
- above. If you wish to allow use of your version of this file only
- under the terms of the [____] License and not to allow others to use
- your version of this file under the MPL, indicate your decision by
- deleting the provisions above and replace them with the notice and
- other provisions required by the [___] License. If you do not delete
- the provisions above, a recipient may use your version of this file
- under either the MPL or the [___] License."
-
- [NOTE: The text of this Exhibit A may differ slightly from the text of
- the notices in the Source Code files of the Original Code. You should
- use the text of this Exhibit A rather than the text found in the
- Original Code Source Code for Your Modifications.]
-
Modified: packages/docbook-xsl-doc/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/patches/00list?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/patches/00list (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/patches/00list Tue Aug 26 20:06:44 2008
@@ -1,18 +1,1 @@
02_use_global_papersize_conf
-7436_html_fo_fix_empty_index_entries
-7440_fo_normalize_space
-7441_html_fix_legalnotice_filename_creation
-7528_common_fix_too_many_nested_elements
-7564_fo_fix_typo
-7623_man_support_for_processing_structfield
-7629_man_fix_escaped_dots_in_filenames
-7656_html_component_title_in_info_elements
-7668_locale_update_and_fix_norwegian_bokmal
-7674_man_fix_unescaped_dash_in_whatis_entry
-7681_fo_fix_colsep_in_entrytbl
-7698_html_fix_rowsep_in_entrytbl
-7731_man_prepend_dots_with_zero_width_char
-7740_man_replace_spaces_in_refname_with_underscores
-7806_man_fix_non_breaking_space_output
-7901_fo_fix_inline_or_block_template
-7939_html_add_exslt_ns_for_pi
Modified: packages/docbook-xsl-doc/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch Tue Aug 26 20:06:44 2008
@@ -9,18 +9,18 @@
## DP: values.
## DP:
## DP: NOTE: The patch consists of 3 parts:
-## DP: (1) The page.type parameter fix.
+## DP: (1) The page.type parameter fix (docbook-xsl).
## DP: (2) The update of the documentation for the page.type parameter.
## DP: (3) The verbose output to make sure, the user understands, what's
-## DP: going on.
+## DP: going on (docbook-xsl).
## DP:
## DP: <URL:http://bugs.debian.org/173093>
## DP: <URL:http://bugs.debian.org/382505>
@DPATCH@
-diff -urNad trunk~/doc/fo/paper.type.html trunk/doc/fo/paper.type.html
---- trunk~/doc/fo/paper.type.html 2007-08-30 15:44:38.000000000 +0200
-+++ trunk/doc/fo/paper.type.html 2007-10-25 02:08:44.000000000 +0200
+diff -urNad experimental~/doc/fo/paper.type.html experimental/doc/fo/paper.type.html
+--- experimental~/doc/fo/paper.type.html 2008-06-02 01:08:26.000000000 +0200
++++ experimental/doc/fo/paper.type.html 2008-08-26 21:46:52.000000000 +0200
@@ -17,6 +17,12 @@
The list of known paper sizes includes USletter and most of the A,
B, and C sizes. See <a href="../fo/page.width.portrait.html"><em class="parameter"><code>page.width.portrait</code></em></a>, for example.
@@ -28,65 +28,9 @@
+<p><b>Important note for Debian users:</b> Because of the Debian bugs
+<a href="http://bugs.debian.org/173093">#173093</a>
+and <a href="http://bugs.debian.org/382505">#382505</a> the default value is read
-+from <tt>/etc/papersize</tt>. only the a{0..10}, b{0..4} and letter values of
++from <tt>/etc/papersize</tt>. Only the a{0..10}, b{0..4} and letter values of
+<b>papersize</b>(5) are currently supported.
+</p>
</p>
-diff -urNad trunk~/fo/docbook.xsl trunk/fo/docbook.xsl
---- trunk~/fo/docbook.xsl 2007-06-29 01:23:31.000000000 +0200
-+++ trunk/fo/docbook.xsl 2007-10-25 02:12:53.000000000 +0200
-@@ -324,6 +324,8 @@
- <xsl:value-of select="$page.height"/>
- <xsl:text>)</xsl:text>
- </xsl:message>
-+ <!-- Tell users about solution of bugs #173093 and #382505. -->
-+ <xsl:message>Read /usr/share/doc/docbook-xsl/README.Debian section 5(a).</xsl:message>
- </xsl:template>
-
- <!-- ==================================================================== -->
-diff -urNad trunk~/fo/param.xsl trunk/fo/param.xsl
---- trunk~/fo/param.xsl 2007-08-30 15:43:12.000000000 +0200
-+++ trunk/fo/param.xsl 2007-10-25 02:08:44.000000000 +0200
-@@ -1,4 +1,7 @@
- <?xml version="1.0" encoding="ASCII"?>
-+<!DOCTYPE xsl:stylesheet [
-+ <!ENTITY papersize SYSTEM "/etc/papersize">
-+]>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <!-- This file is generated from param.xweb -->
-@@ -547,7 +550,31 @@
- <xsl:otherwise>8.5in</xsl:otherwise>
- </xsl:choose>
- </xsl:param>
--<xsl:param name="paper.type">USletter</xsl:param>
-+<!-- The following is a solution to Debian bugs #173093 and #382505. -->
-+<xsl:param name="paper.type">
-+ <xsl:variable name="my.paper.type.raw">&papersize;</xsl:variable>
-+ <xsl:variable name="my.paper.type" select="normalize-space($my.paper.type.raw)"/>
-+ <xsl:choose>
-+ <xsl:when test="$my.paper.type = 'a0'">A0</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a1'">A1</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a2'">A2</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a3'">A3</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a4'">A4</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a5'">A5</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a6'">A6</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a7'">A7</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a8'">A8</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a9'">A9</xsl:when>
-+ <xsl:when test="$my.paper.type = 'a10'">A10</xsl:when>
-+ <xsl:when test="$my.paper.type = 'b0'">B0</xsl:when>
-+ <xsl:when test="$my.paper.type = 'b1'">B1</xsl:when>
-+ <xsl:when test="$my.paper.type = 'b2'">B2</xsl:when>
-+ <xsl:when test="$my.paper.type = 'b3'">B3</xsl:when>
-+ <xsl:when test="$my.paper.type = 'b4'">B4</xsl:when>
-+ <!-- otherwise fall back to to upstreams default -->
-+ <xsl:otherwise>USletter</xsl:otherwise>
-+ </xsl:choose>
-+</xsl:param>
- <xsl:param name="part.autolabel">I</xsl:param>
- <xsl:param name="passivetex.extensions" select="0"/>
- <xsl:attribute-set name="pgwide.properties">
Modified: packages/docbook-xsl-doc/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/rules?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/rules (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/rules Tue Aug 26 20:06:44 2008
@@ -2,15 +2,14 @@
#
# export DH_VERBOSE=1
+PACKAGE = docbook-xsl-doc
+
include /usr/share/dpatch/dpatch.make
-PACKAGE = docbook-xsl
-
build: build-stamp
-
build-stamp: patch-stamp
dh_testdir
- touch build-stamp
+ touch $@
clean: unpatch
dh_testdir
@@ -24,19 +23,15 @@
dh_clean -k
dh_installdirs
-# Build architecture-independent files here.
+binary-arch: build
binary-indep: build
dh_testdir
dh_testroot
- dh_installchangelogs RELEASE-NOTES.txt
+ dh_installchangelogs
dh_installdirs
- dh_installdocs
- dh_installexamples
- dh_installxmlcatalogs
- # upstream ships {param,pi,table}.xml as example for DocBook
- # because we don't need them inside docbook-xsl, we exclude them
- dh_install -Ndocbook-xsl-doc-html -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.*
- dh_install -pdocbook-xsl-doc-html -Xreference.pdf.gz -Xreference.txt.gz -XAUTHORS -XCOPYING -XREADME
+ dh_installdocs --all doc/README
+ dh_install -Ndocbook-xsl-doc-html
+ dh_install -pdocbook-xsl-doc-html -Xreference.pdf.gz -Xreference.txt.gz -XAUTHORS -XCOPYING -XREADME -X.gitignore
dh_link
dh_compress
dh_fixperms
@@ -45,32 +40,5 @@
dh_md5sums
dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: build
-# We have nothing to do.
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
-
-# This following code is used to create the .orig.tar.gz tarball.
-# Use it to prepare it for a new release.
-#
-version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p' )
-uversion=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)\.dfsg.*$$/\1/p' )
-
-.PHONY: get-orig-source
-get-orig-source:
- set -ex ; \
- TMPDIR=`mktemp -d docbook-xsl-$(version).orig` ; \
- wget -P "$$TMPDIR" \
- http://downloads.sourceforge.net/docbook/docbook-xsl-$(uversion).tar.bz2 \
- http://downloads.sourceforge.net/docbook/docbook-xsl-doc-$(uversion).tar.bz2 ; \
- tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-$(uversion).tar.bz2 ; \
- tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-doc-$(uversion).tar.bz2 ; \
- rm -rf "$$TMPDIR"/docbook-xsl-$(uversion)/extensions/ ; \
- mv "$$TMPDIR"/docbook-xsl-$(uversion) "$$TMPDIR"/docbook-xsl-$(version).orig ; \
- GZIP=-9 tar --directory="$$TMPDIR" -czf \
- $(CURDIR)/docbook-xsl_$(version).orig.tar.gz \
- docbook-xsl-$(version).orig ; \
- rm -rf "$$TMPDIR"
-
Modified: packages/docbook-xsl-doc/branches/experimental/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-doc/branches/experimental/debian/watch?rev=1143&op=diff
==============================================================================
--- packages/docbook-xsl-doc/branches/experimental/debian/watch (original)
+++ packages/docbook-xsl-doc/branches/experimental/debian/watch Tue Aug 26 20:06:44 2008
@@ -1,10 +1,4 @@
# See uscan(1) for format
-#
-# NOTE: You need to call the get-orig-source target in debian/rules.
-# NOTE: uupdate will *NOT* work, because upstream splits the packages.
-#
-# Because the usual sf.net watch file syntax fails, use the ftp site.
version=3
-opts=dversionmangle=s/\.dfsg\.\d+$// \
- http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz
+http://sf.net/docbook/docbook-xsl-doc-([\d\.]+)\.tar\.gz
More information about the debian-xml-sgml-commit
mailing list