[xml/sgml-commit] r1250 - in /packages/xml-resume-library/branches/experimental: ./ debian/README.source debian/changelog debian/control debian/copyright debian/examples/Makefile debian/patches/bts-498047_it_xsl.patch

Mon Sep 22 11:58:57 UTC 2008

Author: dleidert-guest
Date: Mon Sep 22 11:58:57 2008
New Revision: 1250

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1250
Log:
Merge with xml-resume-library 1.5.1-10.


Added:
    packages/xml-resume-library/branches/experimental/debian/README.source
      - copied unchanged from r1248, packages/xml-resume-library/trunk/debian/README.source
    packages/xml-resume-library/branches/experimental/debian/patches/bts-498047_it_xsl.patch
      - copied unchanged from r1248, packages/xml-resume-library/trunk/debian/patches/bts-498047_it_xsl.patch
Modified:
    packages/xml-resume-library/branches/experimental/   (props changed)
    packages/xml-resume-library/branches/experimental/debian/changelog
    packages/xml-resume-library/branches/experimental/debian/control
    packages/xml-resume-library/branches/experimental/debian/copyright
    packages/xml-resume-library/branches/experimental/debian/examples/Makefile

Propchange: packages/xml-resume-library/branches/experimental/
            ('svn:mergeinfo' removed)

Modified: packages/xml-resume-library/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/branches/experimental/debian/changelog?rev=1250&op=diff
==============================================================================

--- packages/xml-resume-library/branches/experimental/debian/changelog (original)
+++ packages/xml-resume-library/branches/experimental/debian/changelog Mon Sep 22 11:58:57 2008
@@ -1,7 +1,25 @@
+xml-resume-library (1.5.1-10) unstable; urgency=low
+
+  * QA upload.
+  * debian/control
+    - set QA Group as maintainer
+    - bump Standards-Version to 3.8.0
+  * debian/examples/Makefile
+    - applied Francesco's patch; thanks to him; Closes: #497321
+  * debian/copyright
+    - added copyright notice for debian/examples/Makefile
+    - added copiright notice for xsl/country/it.xls after Francesco's patch
+  * debian/patches/bts-498047_it_xsl.patch
+    - added Francesco's patch; thanks to him; Closes: #498047
+  * debian/README.source
+    - added to comply with Policy 3.8.0
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 21 Sep 2008 22:15:49 +0200
+
 xml-resume-library (1.5.1-9) unstable; urgency=low
 
   * debian/control
-    - removed reccomendation on passivetex since it is no longer available
+    - removed reccomendation on passivetex since no more available
   * debian/copyright
     - fixed a typo in copyright notice
   * debian/xml-resume-library.doc-base

Modified: packages/xml-resume-library/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/branches/experimental/debian/control?rev=1250&op=diff
==============================================================================
--- packages/xml-resume-library/branches/experimental/debian/control (original)
+++ packages/xml-resume-library/branches/experimental/debian/control Mon Sep 22 11:58:57 2008
@@ -1,16 +1,16 @@
 Source: xml-resume-library
 Section: text
 Priority: optional
-Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Maintainer: Debian QA Group <packages at qa.debian.org>
 Build-Depends-Indep: w3m, sgml-data
 Build-Depends: cdbs, debhelper (>= 5.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://xmlresume.sourceforge.net
 
 Package: xml-resume-library
 Architecture: all
 Depends: sgml-data (>= 1.9.1)
-Recommends: xsltproc | xalan | sablotron, xmlto
+Recommends: xsltproc | xalan | sablotron, xmlto, xmltex
 Suggests: www-browser, pdf-viewer, java2-runtime
 Description: A set of tools for writing a resume in XML
  The XML Resume Library is an XML and XSL based system for marking up,
@@ -22,5 +22,3 @@
           * Web-ready HTML,
           * Print-ready PDF, or
           * Plain, unformatted text
- .
-

Modified: packages/xml-resume-library/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/branches/experimental/debian/copyright?rev=1250&op=diff
==============================================================================
--- packages/xml-resume-library/branches/experimental/debian/copyright (original)
+++ packages/xml-resume-library/branches/experimental/debian/copyright Mon Sep 22 11:58:57 2008
@@ -37,3 +37,13 @@
     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+These files have different copyright notices:
+
+debian/examples/Makefile:
+    Copyright Â© 2002 Colin Walters <walters at debian.org>
+    Copyright Â© 2008 Francesco Poli <frx at firenze.linux.it>
+
+xsl/country/it.xls:
+    Copyright (c) 2001-2002 Stewart Evans
+    Copyright (c) 2008 Francesco Poli <frx at firenze.linux.it>

Modified: packages/xml-resume-library/branches/experimental/debian/examples/Makefile
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/branches/experimental/debian/examples/Makefile?rev=1250&op=diff
==============================================================================
--- packages/xml-resume-library/branches/experimental/debian/examples/Makefile (original)
+++ packages/xml-resume-library/branches/experimental/debian/examples/Makefile Mon Sep 22 11:58:57 2008
@@ -1,7 +1,8 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # A sample Makefile for building your rÃ©sumÃ© using the
-# xml-resume-library.  Requirements: xsltproc, fop, passivetex
+# xml-resume-library.  Requirements: xsltproc, xmlto, xmltex
 # Copyright Â© 2002 Colin Walters <walters at debian.org>
+# Copyright Â© 2008 Francesco Poli <frx at firenze.linux.it>
 
 # This should be the name of your rÃ©sumÃ© file, but without the .xml
 # extension.
@@ -11,9 +12,7 @@
 country   ?= us
 papersize ?= letter
 
-# The styles you want to use.  These are for the United States; see
-# the directory /usr/share/sgml/xml-resume-library/xsl/output/ for
-# other styles.
+# The styles you want to use, for your country and papersize.
 FO_STYLE   = /usr/share/sgml/xml-resume-library/xsl/output/${country}-${papersize}.xsl
 HTML_STYLE = /usr/share/sgml/xml-resume-library/xsl/output/${country}-html.xsl
 TXT_STYLE  = /usr/share/sgml/xml-resume-library/xsl/output/${country}-text.xsl
@@ -24,7 +23,7 @@
 all:	$(resume).html $(resume).txt $(resume).pdf
 
 clean:
-	-rm -f $(resume).html $(resume).pdf $(resume).fo $(resume).txt *~
+	-rm -f $(resume).html $(resume).pdf $(resume).txt *~
 
 $(resume).html: $(resume).xml
 	xsltproc $(HTML_STYLE) $(resume).xml > $(resume).html
@@ -32,8 +31,6 @@
 $(resume).txt: $(resume).xml
 	xsltproc $(TXT_STYLE) $(resume).xml > $(resume).txt
 
-$(resume).fo: $(resume).xml
-	xsltproc $(FO_STYLE) $(resume).xml > $(resume).fo
+$(resume).pdf: $(resume).xml
+	xmlto -x $(FO_STYLE) pdf $(resume).xml
 
-$(resume).pdf: $(resume).fo
-	fop -fo $(resume).fo -pdf $(resume).pdf


