RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: afb@rpm5.org
Module: rpm-guide Date: 23-Aug-2008 11:36:02
Branch: HEAD Handle: 2008082309360200
Added files:
rpm-guide opl.xml
Modified files:
rpm-guide Makefile legalnotice-opl-en.xml rpm-guide-en.xml
Log:
switch to dblatex, so the pdf generation works
Summary:
Revision Changes Path
1.3 +2 -1 rpm-guide/Makefile
1.2 +1 -0 rpm-guide/legalnotice-opl-en.xml
1.1 +215 -0 rpm-guide/opl.xml
1.3 +3 -1 rpm-guide/rpm-guide-en.xml
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm-guide/Makefile
============================================================================
$ cvs diff -u -r1.2 -r1.3 Makefile
--- rpm-guide/Makefile 23 Aug 2008 09:29:52 -0000 1.2
+++ rpm-guide/Makefile 23 Aug 2008 09:36:02 -0000 1.3
@@ -22,7 +22,8 @@
${XMLTO} xhtml-nochunks $(XMLFILE)
pdf ${DOCNAME}.pdf:: ${XMLFILE} ${XMLEXTRAFILES}
- ${XMLTO} pdf $(XMLFILE)
+ #${XMLTO} pdf $(XMLFILE)
+ dblatex --param doc.collab.show=0 $(XMLFILE)
validate:
${XMLLINT} --xinclude ${XMLFILE} > ${DOCNAME}.tmp.xml
@@ .
patch -p0 <<'@@ .'
Index: rpm-guide/legalnotice-opl-en.xml
============================================================================
$ cvs diff -u -r1.1 -r1.2 legalnotice-opl-en.xml
--- rpm-guide/legalnotice-opl-en.xml 23 Aug 2008 09:29:52 -0000 1.1
+++ rpm-guide/legalnotice-opl-en.xml 23 Aug 2008 09:36:02 -0000 1.2
@@ -1,3 +1,4 @@
+<!-- note: this fancy orderedlist file doesn't work with dblatex -->
<!-- $Id: -->
<!--
@@ .
patch -p0 <<'@@ .'
Index: rpm-guide/opl.xml
============================================================================
$ cvs diff -u -r0 -r1.1 opl.xml
--- /dev/null 2008-08-23 11:36:00 +0200
+++ opl.xml 2008-08-23 11:36:02 +0200
@@ -0,0 +1,215 @@
+<!-- $Id: -->
+
+<!--
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+ <!ENTITY BOILERPLATE "This header makes editing XML easier" >
+
+]>
+-->
+
+ <para id="opl.permission">
+ Permission is granted to copy, distribute, and/or modify this
+ document under the terms of the Open Publication Licence, Version
+ 1.0, or any later version. The terms of the OPL are set out below.
+ </para>
+ <section id="opl.require">
+ <title>REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS</title>
+
+ <para>
+ Open Publication works may be reproduced and distributed in
+ whole or in part, in any medium physical or electronic, provided
+ that the terms of this license are adhered to, and that this
+ license or an incorporation of it by reference (with any options
+ elected by the author(s) and/or publisher) is displayed in the
+ reproduction.
+ </para>
+
+ <para>
+ Proper form for an incorporation by reference is as follows:
+ </para>
+
+ <para>
+ Copyright (c) <year> by <author's name or designee>.
+ This material may be distributed only subject to the terms and
+ conditions set forth in the Open Publication License, vX.Y or
+ later (the latest version is presently available at
+ <ulink
+ url="http://www.opencontent.org/openpub/"/>
+ </para>
+
+ <para>
+ The reference must be immediately followed with any options
+ elected by the author(s) and/or publisher of the document (see
+ section VI). Commercial redistribution of Open
+ Publication-licensed material is permitted. Any publication in
+ standard (paper) book form shall require the citation of the
+ original publisher and author. The publisher and author's names
+ shall appear on all outer surfaces of the book. On all outer
+ surfaces of the book the original publisher's name shall be as
+ large as the title of the work and cited as possessive with
+ respect to the title.
+ </para>
+ </section>
+ <section id="opl.copyright">
+ <title>COPYRIGHT</title>
+
+ <para>
+ The copyright to each Open Publication is owned by its author(s)
+ or designee.
+ </para>
+ </section>
+ <section id="opl.scope">
+ <title>SCOPE OF LICENSE</title>
+
+ <para>
+ The following license terms apply to all Open Publication works,
+ unless otherwise explicitly stated in the document.
+ </para>
+
+ <para>
+ Mere aggregation of Open Publication works or a portion of an Open
+ Publication work with other works or programs on the same media
+ shall not cause this license to apply to those other works. The
+ aggregate work shall contain a notice specifying the inclusion of
+ the Open Publication material and appropriate copyright notice.
+ </para>
+
+ <para>
+ SEVERABILITY. If any part of this license is found to be
+ unenforceable in any jurisdiction, the remaining portions of the
+ license remain in force.
+ </para>
+
+ <para>
+ NO WARRANTY. Open Publication works are licensed and provided "as
+ is" without warranty of any kind, express or implied, including,
+ but not limited to, the implied warranties of merchantability and
+ fitness for a particular purpose or a warranty of
+ non-infringement.
+ </para>
+ </section>
+ <section id="opl.modified.works">
+ <title>REQUIREMENTS ON MODIFIED WORKS</title>
+
+ <para>
+ All modified versions of documents covered by this license,
+ including translations, anthologies, compilations and partial
+ documents, must meet the following requirements:
+ </para>
+
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>
+ The modified version must be labeled as such.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The person making the modifications must be identified and
+ the modifications dated.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Acknowledgement of the original author and publisher if
+ applicable must be retained according to normal academic
+ citation practices.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The location of the original unmodified document must be
+ identified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The original author's (or authors') name(s) may not be used
+ to assert or imply endorsement of the resulting document
+ without the original author's (or authors') permission.
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+ <section id="opl.good-practice">
+ <title>GOOD-PRACTICE RECOMMENDATIONS</title>
+
+ <para>
+ In addition to the requirements of this license, it is requested
+ from and strongly recommended of redistributors that:
+ </para>
+
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>
+ If you are distributing Open Publication works on hardcopy
+ or CD-ROM, you provide email notification to the authors of
+ your intent to redistribute at least thirty days before your
+ manuscript or media freeze, to give the authors time to
+ provide updated documents. This notification should describe
+ modifications, if any, made to the document.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ All substantive modifications (including deletions) be
+ either clearly marked up in the document or else described
+ in an attachment to the document.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Finally, while it is not mandatory under this license, it is
+ considered good form to offer a free copy of any hardcopy
+ and CD-ROM expression of an Open Publication-licensed work
+ to its author(s).
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </section>
+ <section id="opl.options">
+ <title>LICENSE OPTIONS</title>
+
+ <para>
+ The author(s) and/or publisher of an Open Publication-licensed
+ document may elect certain options by appending language to the
+ reference to or copy of the license. These options are considered
+ part of the license instance and must be included with the license
+ (or its incorporation by reference) in derived works.
+ </para>
+
+ <para>
+ A. To prohibit distribution of substantively modified versions
+ without the explicit permission of the author(s). "Substantive
+ modification" is defined as a change to the semantic content of
+ the document, and excludes mere changes in format or typographical
+ corrections.
+ </para>
+
+ <para>
+ To accomplish this, add the phrase `Distribution of substantively
+ modified versions of this document is prohibited without the
+ explicit permission of the copyright holder.' to the license
+ reference or copy.
+ </para>
+
+ <para>
+ B. To prohibit any publication of this work or derivative works in
+ whole or in part in standard (paper) book form for commercial
+ purposes is prohibited unless prior permission is obtained from
+ the copyright holder.
+ </para>
+
+ <para>
+ To accomplish this, add the phrase 'Distribution of the work or
+ derivative of the work in any standard (paper) book form is
+ prohibited unless prior permission is obtained from the copyright
+ holder.' to the license reference or copy.
+ </para>
+ </section>
@@ .
patch -p0 <<'@@ .'
Index: rpm-guide/rpm-guide-en.xml
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpm-guide-en.xml
--- rpm-guide/rpm-guide-en.xml 23 Aug 2008 09:29:52 -0000 1.2
+++ rpm-guide/rpm-guide-en.xml 23 Aug 2008 09:36:02 -0000 1.3
@@ -15,6 +15,7 @@
<!ENTITY BOOKID "rpm-guide-en-&VERSION; (2005-10-03-T23:30+01:00)"> <!-- change date here and VERSION entity everytime a change is made-->
+<!ENTITY LEGALNOTICE SYSTEM "opl.xml">
<!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "legalnotice-opl-en.xml">
<!ENTITY PACKAGINGINTRO SYSTEM "rpm-guide-intro-packaging-en.xml">
@@ -62,7 +63,8 @@
<firstname>Eric</firstname>
</author>
</authorgroup>
- &LEGALNOTICE-OPL-CONTENT;
+ <!-- &LEGALNOTICE-OPL-CONTENT; -->
+ <legalnotice>&LEGALNOTICE;</legalnotice>
<revhistory>
<revision>
<revnumber>0.1</revnumber>
@@ .
Received on Sat Aug 23 11:36:02 2008