[xml/sgml-commit] r1245 - in /packages/xml-resume-library/trunk/debian: ./ examples/ patches/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Mon Sep 22 11:39:40 UTC 2008


Author: dleidert-guest
Date: Mon Sep 22 11:39:40 2008
New Revision: 1245

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1245
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    packages/xml-resume-library/trunk/debian/   (with props)
    packages/xml-resume-library/trunk/debian/README.Debian
    packages/xml-resume-library/trunk/debian/changelog
    packages/xml-resume-library/trunk/debian/compat
    packages/xml-resume-library/trunk/debian/control
    packages/xml-resume-library/trunk/debian/copyright
    packages/xml-resume-library/trunk/debian/examples/
    packages/xml-resume-library/trunk/debian/examples/Makefile
    packages/xml-resume-library/trunk/debian/examples/resume.xml
    packages/xml-resume-library/trunk/debian/patches/
    packages/xml-resume-library/trunk/debian/patches/30_dtd_catalog.patch
    packages/xml-resume-library/trunk/debian/patches/30_resume_dtd.patch
    packages/xml-resume-library/trunk/debian/patches/bts-179476_fr_xsl_comment.patch
    packages/xml-resume-library/trunk/debian/patches/bts-202525_copyright_html.patch
    packages/xml-resume-library/trunk/debian/patches/bts-202527_awords_txt_fix.patch
    packages/xml-resume-library/trunk/debian/patches/bts-202734_fo_jobs_space.patch
    packages/xml-resume-library/trunk/debian/patches/bts-213563.patch
    packages/xml-resume-library/trunk/debian/patches/bts-248569_valid_xhtml.patch
    packages/xml-resume-library/trunk/debian/patches/bts-416217_fix_examples_makefile.patch
    packages/xml-resume-library/trunk/debian/patches/prettify-postalcode.patch
    packages/xml-resume-library/trunk/debian/patches/prettify-text-xsl.patch
    packages/xml-resume-library/trunk/debian/rules   (with props)
    packages/xml-resume-library/trunk/debian/watch
    packages/xml-resume-library/trunk/debian/xml-resume-library.doc-base
    packages/xml-resume-library/trunk/debian/xml-resume-library.install
    packages/xml-resume-library/trunk/debian/xml-resume-library.postinst
    packages/xml-resume-library/trunk/debian/xml-resume-library.prerm

Propchange: packages/xml-resume-library/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Added: packages/xml-resume-library/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/README.Debian?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/README.Debian (added)
+++ packages/xml-resume-library/trunk/debian/README.Debian Mon Sep 22 11:39:40 2008
@@ -1,0 +1,26 @@
+Comments on using this package:
+
+* You'll really need an XSL processor.
+I've been able to use xsltproc for this purpose, and it works just
+fine.  Also, recent GCJ snapshots (not yet in Debian) are supposedly
+able to compile and run Xalan.
+
+* PDF output requires a FO processor.  There is good news
+on this front!  Very recently, the "passivetex" package was added to
+Debian.  Now, with that and "xmlto", you can convert .fo files into
+.pdf, without using non-free Sun Java implementations!  See
+/usr/share/doc/xml-resume-library/debian-examples/.
+
+* Verifying your resume with nsgmls:
+Run nsgmls like this:
+
+SP_CHARSET_FIXED=YES SP_ENCODING=XML nsgmls -wxml -mdeclaration/xml.soc -gues resume.xml
+
+(Thanks to Tollef Fog Heen <tfheen at debian.org> for that tip)
+
+ -- Colin Walters <walters at debian.org>, Mon Oct 22 03:23:31 EDT 2001
+
+Local Variables:
+mode: outline
+coding: utf-8
+End:

Added: packages/xml-resume-library/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/changelog?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/changelog (added)
+++ packages/xml-resume-library/trunk/debian/changelog Mon Sep 22 11:39:40 2008
@@ -1,0 +1,295 @@
+xml-resume-library (1.5.1-9) unstable; urgency=low
+
+  * debian/control
+    - removed reccomendation on passivetex since it is no longer available
+  * debian/copyright
+    - fixed a typo in copyright notice
+  * debian/xml-resume-library.doc-base
+    - changed Section to Text
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sat, 08 Mar 2008 16:41:28 +0100
+
+xml-resume-library (1.5.1-8) unstable; urgency=low
+
+  * debian/patches/bts-213563.patch
+    - added to avoid direct upstream code modification (introduced in Steve's
+      NMU)
+  * debian/xml-resume-library.install
+    - removed installation of debian/overrides
+  * debian/overrides
+    - removed
+  * debian/xml-resume-library.doc-base
+    - removed new lines in Abstract field
+  * debian/control
+    - Recommends all on one line
+    - bump build dep on debhelper to >=5
+  * debian/compat
+    - bump to 5
+  * debian/copyright
+    - separation of copyright and license
+    - upstream author, copyright and license indented with 4 spaces
+  * debian/patches/bts-179476_fr_xsl_comment.patch
+    - added, restoring and renaming debian/patches/fr-xsl-comment.patch;
+      regression introduced in Steve's NMU, patch deleted (Closes: #459939)
+  * debian/patches/bts-416217_fix_examples_makefile.patch
+    - examples makefile uses local xsl template; thanks to Philippe Coval for
+      the patch (Closes: #416217)
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sat, 26 Jan 2008 17:58:15 +0100
+
+xml-resume-library (1.5.1-7) unstable; urgency=low
+
+  * Non-maintainer upload, with permission from the maintainer.
+    - Bumped standards version to 3.7.3
+      - Moved Homepage: field into debian/control
+    - Dropped the recommendation on 'fop' as it is in contrib.
+      (Closes: #452477)
+    - Updated the Debian example to work with fop.
+      (Closes: #415372)
+    - Register the documentation via doc-base.
+      (Closes: #144642)
+    - Updated XSL files: uk.xsl, es.xsl, fr.xsl, nl.xsl
+      (Closes: #213563)
+
+ -- Steve Kemp <skx at debian.org>  Wed,  5 Dec 2007 17:28:17 +0000
+
+xml-resume-library (1.5.1-6) unstable; urgency=low
+
+  * debian/control
+    - removed transformiix, saxon-catalog since are no more available
+    - renamed libfop-java to fop since it "Replaces: libfop-java"
+  * debian/patches/bts-202734_fo_jobs_space.patch
+    - jobs are too close to each other in FO output (Closes: #202734)
+  * debian/rules
+    - added inclusion of simple-patchsys.mk : now we are _really_ using cdbs
+      (previous the code was patched and debian/patches/* were ignored)
+  * debian/patches/bts-202525_copyright_html.patch
+    - Improper html formatting of copyright/lastupdate fields (Closes:
+    #202525)
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sat,  8 Jul 2006 21:07:40 +0200
+
+xml-resume-library (1.5.1-5) unstable; urgency=low
+
+  * debian/patches/bts-248569_valid_xhtml.patch
+    - HTML output stylesheet generates invalid XHTML (Closes: #248569)
+  * debian/control
+    - Upgrade to Debian Policy 3.7.2: no changes required
+  * debian/copyright
+    - Changed upstream email
+  * debian/watch
+    - Included watch-file
+  * debian/patches/bts-202527_awords_txt_fix.patch
+    - Bad text formatting of Awards section (Closes: #202527)
+  * debian/examples/Makefile
+    - some suggestions about debian patches ( exemples Makefile ) (Closes:
+      #232908)
+    - resume variable now lowercase and ready to be passed via commandline
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Sun,  7 May 2006 17:17:19 +0200
+
+xml-resume-library (1.5.1-4) unstable; urgency=low
+
+  * debian/control:
+    - New maintainer. (Closes: #361013)
+    - Upgrade to Debian Policy 3.7.0
+    - should Depends on available XSL and XSL-FO processors (Closes:
+      #206374)
+    - Added homepage
+    - Moved debhelper and cdbs to Build-Depends
+    - Update dependency against debhelper >= 4.1.0 (linda clean)
+  * debian/compat
+    - Added due to upgrade to 3.7.0 Debian Policy
+  * debian/rules
+    - Package lintian clean removing changelog.html
+  * debian/xml-resume-library.install
+    - Wrong name for jar file (Closes: #205956)
+
+ -- Sandro Tosi <matrixhasu at gmail.com>  Mon,  1 May 2006 22:43:25 +0200
+
+xml-resume-library (1.5.1-3) unstable; urgency=low
+
+  * debian/control:
+    - Bump Standards-Version: 3.5.10, no changes required.
+    - Build-Depend on cdbs.
+    - Depend on a recent sgml-data (Closes: #175479).
+  * debian/rules:
+    - Convert to cdbs.
+    - Make link for jar file, per java policy.
+  * debian/rocks:
+    - Removed.
+  * debian/xml-resume-library.install:
+    - Install jar file (Closes: #186757).
+  
+ -- Colin Walters <walters at debian.org>  Sun, 25 May 2003 05:04:46 -0400
+
+xml-resume-library (1.5.1-2) unstable; urgency=medium
+
+  * The "Yes, I wish this packages' upstream didn't periodically disappear
+    for long periods of time and ignore patches" release.
+  * debian/control:
+    - Update to Standards-Version: 3.5.9; no changes required.
+  * debian/patches/prettify-postalcode.patch:
+    - New patch from to format postal codes better (Closes: #179478).
+  * debian/patches/fr-xsl-comment.patch:
+    - New patch to remove naughty ISO-8859-1 from comment (Closes: #179476).
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters at debian.org>  Fri,  4 Apr 2003 22:16:16 -0500
+
+xml-resume-library (1.5.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #173630).
+  * debian/control:
+    - Standards-Version: 3.5.8.
+  * debian/rules:
+    - Update to latest version of Colin's Build System.
+  * debian/rocks:
+    - Make text version of upstream changelog changelog.gz instead of
+    changelog.txt.gz.  Thanks lintian.
+  * debian/patches/30_dtd_catalog.patch:
+    - Update.
+  * debian/patches/prettify-text-xsl.patch:
+    - New patch, courtesy of James LewisMoss <dres at lewismoss.net>, and
+    forward ported to 1.5.1 by me (Closes: #174482).
+  * debian/examples/resume.xml:
+    - Update to 1.5.1.
+  * debian/postinst, debian/prerm:
+    - Rename to debian/xml-resume-library.postinst,
+    debian/xml-resume-library.prerm, respectively.
+    - Add copyright statement.
+
+ -- Colin Walters <walters at debian.org>  Fri,  3 Jan 2003 15:19:58 -0500
+
+xml-resume-library (1.5.0-2) unstable; urgency=low
+
+  * debian/rocks:
+    - Update to latest version of Colin's Build System.
+
+ -- Colin Walters <walters at debian.org>  Thu, 14 Nov 2002 19:54:35 -0500
+
+xml-resume-library (1.5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Dump DBS in favor of my own version of dpatch.
+    - Use debhelper 4 and dh_install.
+  * debian/rules:
+    - Significantly clean up.
+    - Install HTML docs in html/ subdirectory.
+
+ -- Colin Walters <walters at debian.org>  Fri,  8 Nov 2002 16:31:52 -0500
+
+xml-resume-library (1.4.2-4) unstable; urgency=low
+
+  * debian/control:
+    - Remove recommends on contrib crap.  Now just recommend passivetex
+      and xmlto.  No more non-free Sun Java! 
+  * debian/examples/Makefile:
+    - Update to use xmlto.
+  * debian/examples/resume.xml:
+    - New upstream version. :)
+
+ -- Colin Walters <walters at debian.org>  Thu,  5 Sep 2002 22:37:54 -0400
+
+xml-resume-library (1.4.2-3) unstable; urgency=low
+
+  * debian/control:
+    - Actually do what is in the last changelog entry :)
+
+ -- Colin Walters <walters at debian.org>  Sat, 17 Aug 2002 00:18:29 -0400
+
+xml-resume-library (1.4.2-2) unstable; urgency=low
+
+  * debian/control:
+    - Change Suggests on "lib-fop-java" to "libfop-java"
+      (Closes: #153865).
+
+ -- Colin Walters <walters at debian.org>  Fri, 16 Aug 2002 23:55:44 -0400
+
+xml-resume-library (1.4.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Colin Walters <walters at debian.org>  Fri, 19 Jul 2002 19:12:23 -0400
+
+xml-resume-library (1.4.1-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/examples/Makefile:
+    - Try to handle fop better.
+  * debian/examples/resume.xml:
+    - Update.
+  * debian/README.Debian:
+    - Add some instructions for installing FOP.
+
+ -- Colin Walters <walters at debian.org>  Tue, 18 Jun 2002 22:55:15 -0400
+
+xml-resume-library (1.4.0-1) unstable; urgency=medium
+
+  * New upstream version.
+  * debian/control:
+    - Build-Depend on sgml-data, not sgml-base (Closes: #146912)
+    - Build-Depend on dbs.
+  * debian/rules:
+    - Use dbs.
+
+ -- Colin Walters <walters at debian.org>  Thu, 30 May 2002 21:49:43 -0400
+
+xml-resume-library (1.3.2-5) unstable; urgency=high
+
+  * dtd/catalog:
+    - Remove SGMLDECL for XML (Closes: #145607).
+  * dtd/resume.dtd:
+    - Explicitly reference ISOlat1.ent (Closes: #145959).
+
+ -- Colin Walters <walters at debian.org>  Thu,  7 May 2002 18:10:32 -0400
+
+xml-resume-library (1.3.2-4) unstable; urgency=high
+
+  * debian/rules:
+    - Install upstream "catalog" file as resume.cat.
+  * dtd/catalog:
+    - Remove reference to iso-lat1.ent.
+  * dtd/resume.dtd:
+    - Use Debian's ISOlat1.ent.
+
+ -- Colin Walters <walters at debian.org>  Fri, 12 Apr 2002 16:47:44 -0400
+
+xml-resume-library (1.3.2-3) unstable; urgency=high
+
+  * debian/rules:
+    - Install iso-lat1.ent (Closes: #135579)
+
+ -- Colin Walters <walters at debian.org>  Thu,  4 Apr 2002 18:25:11 -0500
+
+xml-resume-library (1.3.2-2) unstable; urgency=low
+
+  * debian/examples/{resume.xml,Makefile}
+    - New.
+  * debian/rules, debian/dirs:
+    - Install them.
+  * debian/README.Debian:
+    - Reorganize.
+
+ -- Colin Walters <walters at debian.org>  Wed,  3 Apr 2002 03:02:24 -0500
+
+xml-resume-library (1.3.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #116612)
+
+ -- Colin Walters <walters at debian.org>  Sun, 17 Feb 2002 22:48:26 -0500
+
+xml-resume-library (1.2.4-2) unstable; urgency=low
+
+  * Add catalog.
+  * Add maintainer scripts.
+
+ -- Colin Walters <walters at debian.org>  Mon, 22 Oct 2001 03:26:35 -0400
+
+xml-resume-library (1.2.4-1) unstable; urgency=low
+
+  * Initial version.
+
+ -- Colin Walters <walters at verbum.org>  Thu,  6 Sep 2001 00:38:02 -0400

Added: packages/xml-resume-library/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/compat?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/compat (added)
+++ packages/xml-resume-library/trunk/debian/compat Mon Sep 22 11:39:40 2008
@@ -1,0 +1,1 @@
+5

Added: packages/xml-resume-library/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/control?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/control (added)
+++ packages/xml-resume-library/trunk/debian/control Mon Sep 22 11:39:40 2008
@@ -1,0 +1,26 @@
+Source: xml-resume-library
+Section: text
+Priority: optional
+Maintainer: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends-Indep: w3m, sgml-data
+Build-Depends: cdbs, debhelper (>= 5.0.0)
+Standards-Version: 3.7.3
+Homepage: http://xmlresume.sourceforge.net
+
+Package: xml-resume-library
+Architecture: all
+Depends: sgml-data (>= 1.9.1)
+Recommends: xsltproc | xalan | sablotron, xmlto
+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,
+ adding metadata to, and formatting resumes and curricula vitae.
+ .
+ It consists of these components:
+    * An XML Document Type Definition (DTD) for describing resumes.
+    * Three XSL stylesheets to transform an XML resume into:
+          * Web-ready HTML,
+          * Print-ready PDF, or
+          * Plain, unformatted text
+ .
+

Added: packages/xml-resume-library/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/copyright?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/copyright (added)
+++ packages/xml-resume-library/trunk/debian/copyright Mon Sep 22 11:39:40 2008
@@ -1,0 +1,39 @@
+This package was debianized by Colin Walters <walters at debian.org> on
+Thu,  6 Sep 2001 00:38:02 -0400.
+
+The current Debian maintainer is Sandro Tosi <matrixhasu at gmail.com>
+
+Upstream web site: http://xmlresume.sourceforge.net
+
+Upstream Author:
+
+    Sean Kelly <kelly at seankelly.tv>
+
+Copyright:
+
+    Copyright (C) 2000-2001 by Sean Kelly.
+
+License:
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+       1. Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+       2. Redistributions in binary form must reproduce the above
+          copyright notice, this list of conditions and the following
+          disclaimer in the documentation and/or other materials provided with
+          the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+    BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    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.

Added: packages/xml-resume-library/trunk/debian/examples/Makefile
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/examples/Makefile?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/examples/Makefile (added)
+++ packages/xml-resume-library/trunk/debian/examples/Makefile Mon Sep 22 11:39:40 2008
@@ -1,0 +1,39 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# A sample Makefile for building your résumé using the
+# xml-resume-library.  Requirements: xsltproc, fop, passivetex
+# Copyright © 2002 Colin Walters <walters at debian.org>
+
+# This should be the name of your résumé file, but without the .xml
+# extension.
+resume    ?= resume
+
+# Parametric country and papersize values
+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.
+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
+
+.PHONY: all clean check
+.SUFFIXES: .html .fo .pdf .xml .xsl .txt
+
+all:	$(resume).html $(resume).txt $(resume).pdf
+
+clean:
+	-rm -f $(resume).html $(resume).pdf $(resume).fo $(resume).txt *~
+
+$(resume).html: $(resume).xml
+	xsltproc $(HTML_STYLE) $(resume).xml > $(resume).html
+
+$(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).fo
+	fop -fo $(resume).fo -pdf $(resume).pdf

Added: packages/xml-resume-library/trunk/debian/examples/resume.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/examples/resume.xml?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/examples/resume.xml (added)
+++ packages/xml-resume-library/trunk/debian/examples/resume.xml Mon Sep 22 11:39:40 2008
@@ -1,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- resume.xml Copyright © 2002 Colin Walters <walters at verbum.org> -->
+<!DOCTYPE resume PUBLIC "-//Sean Kelly//DTD Resume 1.5.1//EN"
+  "/usr/share/sgml/xml-resume-library/dtd/resume.dtd">
+
+<resume>
+  <header>
+    <name>
+      <firstname>Colin</firstname>
+      <surname>Walters</surname>
+    </name>
+    <address>
+      <street>144 W. Lane Ave Apt B2</street>
+      <city>Columbus</city>
+      <state>OH</state>
+      <zip>43201</zip>
+    </address>
+    <contact>
+      <phone>614.893.8049</phone>
+      <email>walters at verbum.org</email>
+      <url>http://web.verbum.org/~walters/</url>
+    </contact>
+  </header>
+
+  <objective>
+    <para>To advance the state of non-proprietary software in a
+dynamic and interesting working environment.
+    </para>
+  </objective>
+
+  <history>
+    <job>
+      <jobtitle>Grader, CIS 756: Compiler Design and Implementation</jobtitle>
+      <employer>Ohio State University, Computer Science Department</employer>
+      <period>
+	<from>
+	  <date>
+	    <month>August</month>
+	    <year>2001</year>
+	  </date>
+	</from>
+	<to>
+	  <date>
+	    <month>December</month>
+	    <year>2001</year>
+	  </date>
+	</to>
+      </period>
+      <description>
+	<para>Reviewed labs and homework assignments for CIS 756, a
+	course on the design and implementation of compilers.  Duties
+	included interacting with students to assist in problem
+	solving, and teaching class during the absence of the professor.</para>
+      </description>
+    </job>
+    <job>
+      <jobtitle>Volunteer Debian Developer</jobtitle>
+      <employer>The Debian Project</employer>
+      <period>
+	<from>
+	  <date>
+	    <month>September</month>
+	    <year>2001</year>
+	  </date>
+	</from>
+	<to>
+	 <present/>
+	</to>
+      </period>
+      <description>
+	<para>Volunteer developer for the Universal Operating System
+	(<url>http://www.debian.org</url>).  Work has included
+	numerous patches to fix bugs ranging from build failures to
+	Debian policy violations, a number of contributions to
+	Debian's packaging of the GNOME desktop environment, as well
+	as work on the PowerPC port, including the addition of 2.4
+	PowerPC Linux kernel support for the Debian installer.</para>
+	<para>I currently maintain Debian packages of "calc", the GNU
+	Emacs Calculator, the "gnome-system-monitor" process viewing
+	application, "crack-attack", a multiplayer OpenGL puzzle game,
+	and "gpmudmon-applet", a battery monitor applet for the GNOME
+	desktop.</para>
+      </description>
+    </job>
+
+    <job>
+      <jobtitle>Student Programmer</jobtitle>
+      <employer>Ohio State University, Computer Science Department</employer>
+      <period>
+	<from>
+	  <date>
+	    <month>August</month>
+	    <year>2000</year>
+	  </date>
+	</from>
+	<to>
+	  <date>
+	    <month>September</month>
+	    <year>2001</year>
+	  </date>
+	</to>
+      </period>
+      <description>
+	<para>Developed a client/server electronic timesheet in the
+Java programming language, using RMI and Swing.  Assisted with system
+administration tasks.
+	</para>
+      </description>
+    </job>
+    <job>
+      <jobtitle>Treasurer</jobtitle>
+      <employer>The OSU Open Source Club</employer>
+      <period>
+	<from>
+	  <date>
+	    <month>August</month>
+	    <year>2000</year>
+	  </date>
+	</from>
+	<to>
+	 <present/>
+	</to>
+      </period>
+      <description>
+	<para>Worked as official treasurer for the OSU Open Source
+	Club (<url>http://freedom.cis.ohio-state.edu</url>).  Duties
+	included managing funds, as well as system administration and
+	various leadership roles.</para>
+	<para>I implemented the initial version
+	of the club's current workstation lab, which entailed
+	installing various operating systems, from Debian GNU/Hurd to
+	NetBSD and Red Hat GNU/Linux, and integrating them into our
+	LDAP setup using PAM.</para>
+	<para>Also, I gave a number of talks for the
+	club, including one on programming in Emacs Lisp, and one on
+	programming in GTK+. </para>
+      </description>
+    </job>
+
+
+    <job>
+      <jobtitle>Computer Lab Consultant</jobtitle>
+      <employer>Ohio State University, HFEC Department</employer>
+      <period>
+	<from>
+	  <date>
+	    <month>August</month>
+	    <year>1998</year>
+	  </date>
+	</from>
+	<to>
+	  <date>
+	    <month>September</month>
+	    <year>1999</year>
+	  </date>
+	</to>
+      </period>
+      <description>
+	<para>Maintained a computer lab consisting of a diverse number
+	of operating systems.  Assisted computer lab users with
+	difficulties with the lab software and hardware.
+	</para>
+      </description>
+    </job>
+  </history>
+
+  <academics>
+    <degrees>
+      <degree>
+	<level>Batchelor of Science</level>
+	<major>Computer and Information Science</major>
+	<date>
+	  <month>June</month>
+	  <year>2002</year>
+	</date>
+	<institution>The Ohio State University</institution>
+      </degree>
+    </degrees>
+  </academics>
+
+  <skillarea>
+    <title>Special Skills</title>
+    <skillset>
+      <skill>Strong experience in the ANSI C, Common Lisp, Java,
+	Scheme (Guile), Emacs Lisp, and Perl programming languages.
+	Familiarity with the Objective Caml, TeX, Standard ML,
+	LaTeX, POSIX sh, METAFONT, and C++ programming languages.
+      </skill>
+      <skill>Experience with major free software packages such as
+	GNU Emacs, GNOME, PostgreSQL, and the GIMP.
+      </skill>
+    </skillset>
+  </skillarea>
+    
+  <copyright>
+    <year>2002</year>
+    <name>
+      <firstname>Colin</firstname>
+      <surname>Walters</surname>
+    </name>
+    <legalnotice>
+      <para>All rights reserved.  This document may be copied and
+      redistributed freely, but modification is allowed only if the
+      resulting document does not purport to be the canonical résumé
+      of the same Colin Walters who authored the original version of
+      this document.</para>
+    </legalnotice>
+  </copyright>
+</resume>
+
+<!--
+Local Variables:
+compile-command: "SP_CHARSET_FIXED=YES SP_ENCODING=XML nsgmls -wxml -mdeclaration/xml.soc -gues resume.xml"
+End:
+-->

Added: packages/xml-resume-library/trunk/debian/patches/30_dtd_catalog.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/30_dtd_catalog.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/30_dtd_catalog.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/30_dtd_catalog.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,14 @@
+--- resume-1_4_2/dtd/catalog	Sun Jun 16 02:32:36 2002
++++ resume-1_4_2.new/dtd/catalog	Tue Jun 18 23:39:41 2002
+@@ -34,11 +34,3 @@
+   -- The XML Resume Library, an XML DTD (and a schema some day...) --
+ 
+ PUBLIC "-//Sean Kelly//DTD Resume 1.5.1//EN" "resume.dtd"
+-
+-  -- ISO entity sets in XML format --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.ent"
+-
+-  -- SGML Declaration --
+-
+-SGMLDECL "resume.dcl"

Added: packages/xml-resume-library/trunk/debian/patches/30_resume_dtd.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/30_resume_dtd.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/30_resume_dtd.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/30_resume_dtd.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,11 @@
+--- resume-1_4_2/dtd/resume.dtd	Fri May 24 15:51:24 2002
++++ resume-1_4_2.new/dtd/resume.dtd	Thu May 30 22:29:35 2002
+@@ -41,7 +41,7 @@
+ <![%ISOlat1.module;[
+ <!ENTITY % ISOlat1 PUBLIC
+ "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+-"iso-lat1.ent">
++"/usr/share/sgml/entities/xml-iso-entities-8879.1986/ISOlat1.ent">
+ %ISOlat1;
+ <!--end of ISOlat1.module-->]]>
+ 

Added: packages/xml-resume-library/trunk/debian/patches/bts-179476_fr_xsl_comment.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-179476_fr_xsl_comment.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-179476_fr_xsl_comment.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-179476_fr_xsl_comment.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,22 @@
+Date: Sun, 2 Feb 2003 16:53:39 +0100
+From: Guillaume Morin <gemorin at debian.org>;
+To: Debian Bug Tracking System <submit at bugs.debian.org>
+Subject: xsl/country/fr.xsl contains non UTF-8 characters
+Message-ID: <20030202155339.GA1518 at siri>
+
+fr.xsl contains some ISO8859-1 characters, which make fr.xsl unusable.
+They are inside a comment.  I've chosen not to replace them by their
+UTF-8 counterparts to make the comment more readable.
+
+--- xml-resume-library/xsl/country/fr.xsl~      2003-02-02 16:43:42.000000000 +0100
++++ xml-resume-library/xsl/country/fr.xsl	2003-02-02 16:46:21.000000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ <!-- French language notes (correct us if we're wrong:
+  * Not all the words are capitalized in titles, only the first one. 
+- * It's Téléphone privé, not privé Téléphone
++ * It's T'el'ephone priv'e, not priv'e T'el'ephone
+ -->
+ 
+   <xsl:param name="resume.word">Curriculum Vitae</xsl:param>
+

Added: packages/xml-resume-library/trunk/debian/patches/bts-202525_copyright_html.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-202525_copyright_html.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-202525_copyright_html.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-202525_copyright_html.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,35 @@
+--- xml-resume-library/css/compact.css	2006-07-08 20:56:07.000000000 +0200
++++ xml-resume-library/css/compact.css	2006-07-08 21:01:02.000000000 +0200
+@@ -45,7 +45,7 @@
+ .awardTitle { font-weight: bold }
+ .bookTitle { font-style: italic }
+ .citation { font-style: italic }
+-.copyright { font-size: 75% }
++.copyright { margin-left: -.8cm; margin-top: 0.15cm; font-size: 75% }
+ li.degree { margin-bottom: 0.2cm; }
+ .degreeTitle { font-weight: bold }
+ .employer { font-style: italic }
+
+--- xml-resume-library/css/gray.css	2006-07-08 20:56:07.000000000 +0200
++++ xml-resume-library/css/gray.css	2006-07-08 21:04:08.000000000 +0200
+@@ -32,7 +32,7 @@
+ .bookTitle { font-style: italic }
+ .citation { font-style: italic }
+ .clearanceLevel { font-weight: bold }
+-.copyright { font-size: 75% }
++.copyright { margin-left: -20pt; margin-top: 0.5em; font-size: 75% }
+ li.degree { margin-bottom: 0.5em; }
+ .degreeTitle { font-weight: bold }
+ .employer { font-style: italic }
+
+--- xml-resume-library/css/blueorange.css	2006-07-08 20:56:07.000000000 +0200
++++ xml-resume-library/css/blueorange.css	2006-07-08 21:04:50.000000000 +0200
+@@ -47,7 +47,7 @@
+ .bookTitle { font-style: italic }
+ .citation { font-style: italic }
+ .clearanceLevel { font-weight: bold }
+-.copyright { font-size: 75% }
++.copyright { margin-left: -20pt; margin-top: 0.5em; font-size: 75% }
+ li.degree { margin-bottom: 0.5em; }
+ .degreeTitle { font-weight: bold }
+ .employer { font-style: italic }

Added: packages/xml-resume-library/trunk/debian/patches/bts-202527_awords_txt_fix.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-202527_awords_txt_fix.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-202527_awords_txt_fix.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-202527_awords_txt_fix.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,10 @@
+--- xml-resume-library/xsl/format/text.xsl	2003-12-03 22:56:36.000000000 -0800
++++ xml-resume-library/xsl/format/text.xsl	2003-12-03 22:54:51.000000000 -0800
+@@ -994,6 +994,7 @@ In general, each block is responsible fo
+         </xsl:apply-templates>
+       </xsl:with-param>
+     </xsl:call-template>
++    <xsl:call-template name="NewLine"/>
+   </xsl:template>
+ 
+   <!-- Format the misc info -->

Added: packages/xml-resume-library/trunk/debian/patches/bts-202734_fo_jobs_space.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-202734_fo_jobs_space.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-202734_fo_jobs_space.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-202734_fo_jobs_space.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,11 @@
+--- xml-resume-library/xsl/format/fo.xsl  2003-07-24 15:00:22.000000000 -0400
++++ xml-resume-library/xsl/format/fo.xsl  2003-07-24 15:02:24.000000000 -0400
+@@ -395,7 +395,7 @@
+
+   <!-- Format a single job. -->
+   <xsl:template match="r:job">
+-    <fo:block>
++    <fo:block space-after="{$para.break.space}">
+       <fo:block space-after="{$half.space}" keep-with-next="always">
+         <fo:block
+             keep-with-next="always"

Added: packages/xml-resume-library/trunk/debian/patches/bts-213563.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-213563.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-213563.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-213563.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,371 @@
+--- xml-resume-library-1.5.1.orig/xsl/country/it.xsl
++++ xml-resume-library-1.5.1/xsl/country/it.xsl
+@@ -30,7 +30,7 @@
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$Id: it.xsl,v 1.4 2002/11/18 21:04:25 brandondoyle Exp $
++$Id$
+ -->
+ 
+ <xsl:stylesheet version="1.0"
+@@ -39,7 +39,7 @@
+   <xsl:param name="resume.word">Curriculum Vitae</xsl:param>
+   <xsl:param name="page.word">page</xsl:param>
+   <xsl:param name="contact.word">Contatti</xsl:param>
+-  <xsl:param name="objective.word">Obiettivo</xsl:param>
++  <xsl:param name="objective.word">Obiettivi</xsl:param>
+   <xsl:param name="history.word">Esperienze Professionali</xsl:param>
+   <xsl:param name="academics.word">Istruzione</xsl:param>
+   <xsl:param name="publications.word">Documenti</xsl:param>
+@@ -49,7 +49,9 @@
+   <xsl:param name="by.word">di</xsl:param>
+   <xsl:param name="present.word">presente</xsl:param>
+   <xsl:param name="phone.word">Telefono</xsl:param>
+-  <xsl:param name="phone.home.phrase"><xsl:value-of select="$phone.word"/> in casa</xsl:param>
++  <xsl:param name="phone.home.phrase"><xsl:value-of select="$phone.word"/> fisso</xsl:param>
++  <xsl:param name="phone.mobile.phrase"><xsl:value-of select="$phone.word"/> cellulare</xsl:param>
++
+   <xsl:param name="email.word">Email</xsl:param>
+   <xsl:param name="url.word">URL</xsl:param>
+   <xsl:param name="achievements.word">Conseguimenti</xsl:param>
+@@ -59,28 +61,28 @@
+   <!-- default to Italian address formatting -->
+   <xsl:param name="address.format">italian</xsl:param>
+ 
+-  <xsl:param name="and.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="awards.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.home.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.aim.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.icq.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.irc.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.jabber.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.msn.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.yahoo.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="referees.hidden.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="security-clearances.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="interests.word">TRANSLATION NEEDED</xsl:param>
++  <xsl:param name="and.word">e</xsl:param>
++  <xsl:param name="awards.word">Premi e riconoscimenti</xsl:param>
++  <xsl:param name="fax.home.phrase">Fax abitazione</xsl:param>
++  <xsl:param name="fax.word">Fax</xsl:param>
++  <xsl:param name="fax.work.phrase">Fax ufficio</xsl:param>
++  <xsl:param name="im.aim.service">AIM</xsl:param>
++  <xsl:param name="im.icq.service">ICQ</xsl:param>
++  <xsl:param name="im.irc.service">IRC</xsl:param>
++  <xsl:param name="im.jabber.service">Jabber</xsl:param>
++  <xsl:param name="im.msn.service">MSN Messenger</xsl:param>
++  <xsl:param name="im.yahoo.service">Yahoo! Messenger</xsl:param>
++  <xsl:param name="referees.hidden.phrase">Disponibile su richiesta</xsl:param>
++  <xsl:param name="security-clearances.word">Autorizzazioni speciali</xsl:param>
++  <xsl:param name="interests.word">Interessi</xsl:param>
+   <xsl:param name="minor.word">TRANSLATION NEEDED</xsl:param>
+   <xsl:param name="minors.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="overall-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="major-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="out-of.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="last-modified.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.mobile.phrase">TRANSLATION NEEDED</xsl:param>
++  <xsl:param name="overall-gpa.word">Voto</xsl:param>
++  <xsl:param name="major-gpa.word">Voto</xsl:param>
++  <xsl:param name="out-of.word"> su </xsl:param>
++  <xsl:param name="last-modified.phrase">Ultima modifica</xsl:param>
++  <xsl:param name="phone.work.phrase">Telefono ufficio</xsl:param>
++  <xsl:param name="phone.mobile.phrase">Telefono cellulare</xsl:param>
+   <xsl:param name="pager.word">TRANSLATION NEEDED</xsl:param>
+ </xsl:stylesheet>
+ 
+--- xml-resume-library-1.5.1.orig/xsl/country/es.xsl
++++ xml-resume-library-1.5.1/xsl/country/es.xsl
+@@ -1,10 +1,10 @@
+-<?xml version="1.0" encoding="iso-8859-15"?>
++<?xml version="1.0" encoding="UTF-8"?>
+ 
+ <!--
+ es.xsl
+ Parameters for Spanish resumes.
+ 
+-Copyright (c) 2002 Miguel Coca <mcoca at users.sourceforge.net>
++MAINTAINER: Miguel Coca <mcoca at gnu.org>
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+@@ -30,59 +30,74 @@
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$Id: es.xsl,v 1.3 2002/11/18 23:05:03 brandondoyle Exp $
++$Id$
+ -->
+ 
+ <xsl:stylesheet version="1.0"
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ 
+   <xsl:param name="resume.word">Curriculum Vitae</xsl:param>
+-  <xsl:param name="page.word">p&aacute;gina</xsl:param>
+-  <xsl:param name="contact.word">Información de contacto</xsl:param>
++  <xsl:param name="page.word">página</xsl:param>
++  <!-- Word to use for "Contact Information" -->
++  <xsl:param name="contact.word">Información de contacto</xsl:param>
+   <xsl:param name="objective.word">Objetivo</xsl:param>
++  <!-- Word to use for "Employment History" -->
+   <xsl:param name="history.word">Experiencia</xsl:param>
+-  <xsl:param name="academics.word">Formación</xsl:param>
++  <xsl:param name="academics.word">Formación</xsl:param>
+   <xsl:param name="publications.word">Publicaciones</xsl:param>
++  <xsl:param name="interests.word">Intereses</xsl:param>
++  <xsl:param name="security-clearances.word">Autorizaciones de seguridad</xsl:param>
++  <xsl:param name="awards.word">Premios</xsl:param>
+   <xsl:param name="miscellany.word">Otros</xsl:param>
++  <!-- Word to use for "in", as in "bachelor degree *in* political science" -->
+   <xsl:param name="in.word">en</xsl:param>
++  <!-- Word to use for "and", as in "Minors in political science, English, *and*
++  business" -->
++  <xsl:param name="and.word">y</xsl:param>
++  <!-- Word to use for "Copyright (c)" -->
+   <xsl:param name="copyright.word">Copyright &#169;</xsl:param>
++  <!-- Word to use for "by", as in "Copyright by Joe Doom" -->
+   <xsl:param name="by.word">por</xsl:param>
++  <!-- Word to use for "present", as in "Period worked: August 1999-Present" -->
+   <xsl:param name="present.word">Actualidad</xsl:param>
++  <xsl:param name="achievements.word">Logros:</xsl:param>
++  <xsl:param name="projects.word">Proyectos:</xsl:param>
++  <!-- Word to use for "minor" (lesser area of study), singluar and plural. -->
++  <xsl:param name="minor.word">TRANSLATION NEEDED</xsl:param>
++  <xsl:param name="minors.word">TRANSLATION NEEDED</xsl:param>
++  <xsl:param name="referees.word">Referencias</xsl:param>
++  <!-- Word to use for "Overall GPA", as in "*Overall GPA*: 3.3" -->
++  <xsl:param name="overall-gpa.word">Nota media</xsl:param>
++  <!-- Word to use for "GPA in Major", as in "*GPA in Major*: 3.3" -->
++  <xsl:param name="major-gpa.word">Nota media en la especialidad</xsl:param>
++  <!-- Text to use for "out of", as in "GPA: 3.71* out of *4.00" -->
++  <xsl:param name="out-of.word"> sobre </xsl:param>
++  <xsl:param name="last-modified.phrase">Última modificación</xsl:param>
+ 
+-  <xsl:param name="phone.word">Tel&eacute;fono</xsl:param>
++  <xsl:param name="phone.word">Teléfono</xsl:param>
+   <xsl:param name="fax.word">Fax</xsl:param>
+   <xsl:param name="phone.home.phrase"><xsl:value-of select="$phone.word"/></xsl:param>
+-  <xsl:param name="phone.work.phrase"><xsl:value-of select="$phone.word"/> del Trabajo</xsl:param>
+-  <xsl:param name="phone.mobile.phrase"><xsl:value-of select="$phone.word"/> M&oacute;vil</xsl:param>
++  <xsl:param name="phone.work.phrase"><xsl:value-of select="$phone.word"/> del trabajo</xsl:param>
++  <xsl:param name="phone.mobile.phrase"><xsl:value-of select="$phone.word"/> móvil</xsl:param>
+   <xsl:param name="fax.home.phrase"><xsl:value-of select="$fax.word"/></xsl:param>
+-  <xsl:param name="fax.work.phrase"><xsl:value-of select="$fax.word"/> del Trabajo</xsl:param>
++  <xsl:param name="fax.work.phrase"><xsl:value-of select="$fax.word"/> del trabajo</xsl:param>
+ 
++  <xsl:param name="pager.word">Buscapersonas</xsl:param>
+   <xsl:param name="email.word">Email</xsl:param>
+   <xsl:param name="url.word">URL</xsl:param>
+-  <xsl:param name="achievements.word">Logros:</xsl:param>
+-  <xsl:param name="projects.word">Proyectos:</xsl:param>
+ 
+-  <!-- default to European address formatting -->
++  <!-- Format for address; available values are: -->
++  <!-- 'standard' for US/Canadian/UK style addresses -->
++  <!-- 'european' for European format (with postal code preceding city). -->
++  <!-- 'italian' for Italian format (postal code city (province) ). -->
+   <xsl:param name="address.format">european</xsl:param>
+ 
+-  <xsl:param name="and.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="awards.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.aim.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.icq.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.irc.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.jabber.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.msn.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.yahoo.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="interests.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="last-modified.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="major-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="minor.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="minors.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="out-of.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="overall-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="pager.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="referees.hidden.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="referees.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="security-clearances.word">TRANSLATION NEEDED</xsl:param>
+-</xsl:stylesheet>
++  <!-- Instant messenger service names -->
++  <xsl:param name="im.aim.service">AIM</xsl:param>
++  <xsl:param name="im.icq.service">ICQ</xsl:param>
++  <xsl:param name="im.irc.service">IRC</xsl:param>
++  <xsl:param name="im.jabber.service">Jabber</xsl:param>
++  <xsl:param name="im.msn.service">MSN Messenger</xsl:param>
++  <xsl:param name="im.yahoo.service">Yahoo! Messenger</xsl:param>
+ 
++</xsl:stylesheet>
+--- xml-resume-library-1.5.1.orig/xsl/country/uk.xsl
++++ xml-resume-library-1.5.1/xsl/country/uk.xsl
+@@ -30,7 +30,7 @@
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$Id: uk.xsl,v 1.2 2002/11/18 21:04:25 brandondoyle Exp $
++$Id$
+ -->
+ 
+ <xsl:stylesheet version="1.0"
+@@ -40,47 +40,54 @@
+   "Telephone", not a "Phone". -->
+ 
+   <xsl:param name="resume.word">CV</xsl:param>
+-  <xsl:param name="phone.word">Telephone</xsl:param>
+   <xsl:param name="referees.word">Referees</xsl:param>
+ 
+-  <xsl:param name="academics.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="achievements.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="and.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="awards.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="by.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="contact.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="copyright.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="email.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.home.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="history.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.aim.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.icq.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.irc.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.jabber.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.msn.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.yahoo.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="in.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="interests.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="last-modified.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="major-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="minor.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="minors.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="miscellany.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="objective.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="out-of.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="overall-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="page.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="pager.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.home.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.mobile.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="present.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="projects.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="publications.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="referees.hidden.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="security-clearances.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="url.word">TRANSLATION NEEDED</xsl:param>
+-</xsl:stylesheet>
++  <xsl:param name="academics.word">Qualifications</xsl:param>
++  <xsl:param name="achievements.word">Achievements</xsl:param>
++  <xsl:param name="and.word">and</xsl:param>
++  <xsl:param name="awards.word">Awards</xsl:param>
++  <xsl:param name="by.word">by</xsl:param>
++  <xsl:param name="contact.word">Contact details</xsl:param>
++  <xsl:param name="copyright.word">Copyright &#169;</xsl:param>
++  <xsl:param name="email.word">e-mail</xsl:param>
++  <xsl:param name="fax.word">Fax</xsl:param>
++  <xsl:param name="fax.home.phrase"><xsl:value-of select="$fax.word"/>number, home</xsl:param>
++  <xsl:param name="fax.work.phrase"><xsl:value-of select="$fax.word"/>number, work</xsl:param>
++  <xsl:param name="history.word">Employment History</xsl:param>
++  <xsl:param name="im.aim.service">AIM</xsl:param>
++  <xsl:param name="im.icq.service">ICQ</xsl:param>
++  <xsl:param name="im.irc.service">IRC</xsl:param>
++  <xsl:param name="im.jabber.service">Jabber</xsl:param>
++  <xsl:param name="im.msn.service">MSN</xsl:param>
++  <xsl:param name="im.yahoo.service">Yahoo IM</xsl:param>
++  <xsl:param name="in.word">in</xsl:param>
++  <xsl:param name="interests.word">Extra curricular interests</xsl:param>
++  <xsl:param name="last-modified.phrase">Last modified</xsl:param>
++  <xsl:param name="major-gpa.word">Major GPA</xsl:param>
++  <xsl:param name="minor.word">minor</xsl:param>
++  <xsl:param name="minors.word">minors</xsl:param>
++  <xsl:param name="miscellany.word">Miscellany </xsl:param>
++  <xsl:param name="objective.word">Type of work sought</xsl:param>
++  <xsl:param name="out-of.word"> out of </xsl:param>
++  <xsl:param name="overall-gpa.word">Overall GPA</xsl:param>
++  <xsl:param name="page.word">page</xsl:param>
++  <xsl:param name="pager.word">pager</xsl:param>
++  <xsl:param name="phone.word">Telephone</xsl:param>
++  <xsl:param name="phone.home.phrase">Home <xsl:value-of select="$phone.word"/></xsl:param>
++  <xsl:param name="phone.mobile.phrase">Mobile <xsl:value-of select="$phone.word"/></xsl:param>
++  <xsl:param name="phone.work.phrase">Work <xsl:value-of select="$phone.word"/></xsl:param>
++  <xsl:param name="present.word">present</xsl:param>
++  <xsl:param name="projects.word">Projects</xsl:param>
++  <xsl:param name="publications.word">Publications</xsl:param>
++  <xsl:param name="security-clearances.word">Security clearance</xsl:param>
++  <xsl:param name="url.word">Website</xsl:param>
++  <xsl:param name="training.word">Training</xsl:param>
++  <xsl:param name="certification.word">Certifying Body</xsl:param>
++
++  <!-- Format for address; available values are: -->
++  <!-- 'standard' for US/Canadian/UK style addresses -->
++  <!-- 'european' for European format (with postal code preceding city). -->
++  <!-- 'italian' for Italian format (postal code city (province) ). -->
++  <xsl:param name="address.format">standard</xsl:param>
+ 
++</xsl:stylesheet>
+--- xml-resume-library-1.5.1.orig/xsl/country/fr.xsl
++++ xml-resume-library-1.5.1/xsl/country/fr.xsl
+@@ -4,8 +4,7 @@
+ fr.xsl
+ Parameters for French resumes.
+ 
+-Copyright (c) 2001-2002 Sean Kelly
+-All rights reserved.
++MAINTAINER: Gilles Sadowski <erans at users.sourceforge.net>, Didier Cassirame <faded at users.sourceforge.net>
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+@@ -30,7 +29,7 @@
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-$Id: fr.xsl,v 1.5 2002/11/18 21:04:25 brandondoyle Exp $
++$Id$
+ -->
+ 
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+@@ -70,24 +69,25 @@
+   <!-- than France (e.g. Canada) "standard" formatting may be more correct. -->
+   <xsl:param name="address.format">european</xsl:param>
+ 
+-  <xsl:param name="and.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="fax.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.aim.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.icq.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.irc.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.jabber.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.msn.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="im.yahoo.service">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="interests.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="last-modified.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="major-gpa.word">TRANSLATION NEEDED</xsl:param>
++
++  <xsl:param name="and.word">et</xsl:param>
++  <xsl:param name="fax.work.phrase">Fax (bureau)</xsl:param>
++  <xsl:param name="im.aim.service">AIM</xsl:param>
++  <xsl:param name="im.icq.service">ICQ</xsl:param>
++  <xsl:param name="im.irc.service">IRC</xsl:param>
++  <xsl:param name="im.jabber.service">Jabber</xsl:param>
++  <xsl:param name="im.msn.service">MSN</xsl:param>
++  <xsl:param name="im.yahoo.service">Yahoo</xsl:param>
++  <xsl:param name="interests.word">Centres d'intérêt</xsl:param>
++  <xsl:param name="last-modified.phrase">Dernière modification</xsl:param>
++  <xsl:param name="pager.word">Bip</xsl:param>
++  <xsl:param name="phone.work.phrase">Téléphone (bureau)</xsl:param>
++  <xsl:param name="security-clearances.word">Cert ification de sécurité</xsl:param>
++  <xsl:param name="out-of.word">parmi</xsl:param> 
++
+   <xsl:param name="minor.word">TRANSLATION NEEDED</xsl:param>
+   <xsl:param name="minors.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="out-of.word">TRANSLATION NEEDED</xsl:param>
+   <xsl:param name="overall-gpa.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="pager.word">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="phone.work.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="referees.hidden.phrase">TRANSLATION NEEDED</xsl:param>
+-  <xsl:param name="security-clearances.word">TRANSLATION NEEDED</xsl:param>
++  <xsl:param name="major-gpa.word">TRANSLATION NEEDED</xsl:param>
+ </xsl:stylesheet>
+

Added: packages/xml-resume-library/trunk/debian/patches/bts-248569_valid_xhtml.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-248569_valid_xhtml.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-248569_valid_xhtml.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-248569_valid_xhtml.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,23 @@
+--- xsl/format/html.xsl	2002-11-27 21:38:35.000000000 -0500
++++ xsl/format/html.xsl	2004-05-12 01:21:28.000000000 -0400
+@@ -34,9 +34,9 @@
+ <xsl:stylesheet xmlns:r="http://xmlresume.sourceforge.net/resume/0.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  version="1.0" 
+  exclude-result-prefixes="r">
+-  <xsl:output method="html" omit-xml-declaration="yes" indent="no" encoding="UTF-8" 
++  <xsl:output method="xml" omit-xml-declaration="yes" indent="no" encoding="UTF-8" 
+    doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" 
+-   doctype-system="http://www.w3.org/TR/xhtml1/DTD/strict.dtd"/>
++   doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+    
+   <xsl:strip-space elements="*"/>
+   <xsl:include href="../params.xsl"/>
+@@ -60,7 +60,7 @@
+         </title>
+         <xsl:choose>
+           <xsl:when test="$css.embed = 1">
+-            <style>
++            <style type="text/css">
+               <xsl:value-of select="document($css.href)"/>
+             </style>
+           </xsl:when>

Added: packages/xml-resume-library/trunk/debian/patches/bts-416217_fix_examples_makefile.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/bts-416217_fix_examples_makefile.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/bts-416217_fix_examples_makefile.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/bts-416217_fix_examples_makefile.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,115 @@
+diff -BurN xml-resume-library-1.5.1-6/examples/Makefile xml-resume-library-1.5.1-6-rzr/examples/Makefile
+--- xml-resume-library-1.5.1-6/examples/Makefile	2002-11-28 03:38:35.000000000 +0100
++++ xml-resume-library-1.5.1-6-rzr/examples/Makefile	2007-03-25 22:37:33.000000000 +0200
+@@ -48,41 +48,47 @@
+ # Basename (filename minus .xml extension) of resume to process
+ # For example, put "myresume" here to process "myresume.xml".
+ #------------------------------------------------------------------------------
+-resume = resume
++resume?=resume
+ 
+ #------------------------------------------------------------------------------
+ # Stylesheets
+ #------------------------------------------------------------------------------
+ # Options: br de fr it nl uk us es
+-country = us
++country?=us
+ # Options: letter for country=us, a4 for others
+-papersize = letter
++papersize?=letter
+ 
+-xsl_base = http://xmlresume.sourceforge.net/xsl
+-#xsl_base = ../xsl
+-#xsl_base = ../src/www/xsl
+-
+-html_style = $(xsl_base)/output/$(country)-html.xsl
+-text_style = $(xsl_base)/output/$(country)-text.xsl
+-fo_style = $(xsl_base)/output/$(country)-$(papersize).xsl
+-upgrade_13x_140_style = $(xsl_base)/misc/13x-140.xsl
++xsl_base?=/usr/share/sgml/xml-resume-library/xsl
++#xsl_base?=http://xmlresume.sourceforge.net/xsl
++#xsl_base?=../xsl
++#xsl_base?=../src/www/xsl
++
++html_style?=$(xsl_base)/output/$(country)-html.xsl
++text_style?=$(xsl_base)/output/$(country)-text.xsl
++fo_style?=$(xsl_base)/output/$(country)-$(papersize).xsl
++upgrade_13x_140_style?=$(xsl_base)/misc/13x-140.xsl
+ 
+ #------------------------------------------------------------------------------
+ # Processing software
+ #------------------------------------------------------------------------------
+-make = gmake
++make?=gmake
+ 
+-xsl_proc = java org.apache.xalan.xslt.Process $(xsl_flags) -in $(in) -xsl $(xsl) -out $(out)
+-#xsl_proc = java com.icl.saxon.StyleSheet $(xsl_flags) -o $(out) $(in) $(xsl) $(xsl_params)
++CLASSPATH?=\
++/usr/share/java/xalan2.jar:\
++/usr/share/java/fop-0.20.5.jar:\
++/usr/share/java/avalon-framework-4.2.0.jar
+ 
+-pdf_proc = java org.apache.fop.apps.Fop -fo $(fo_flags) $(in) -pdf $(out)
+-#pdf_proc = ~/bin/xep/run.sh $(fo_flags) $(in) $(out)
++xsl_proc?=java org.apache.xalan.xslt.Process $(xsl_flags) -in $(in) -xsl $(xsl) -out $(out)
++#xsl_proc?=java com.icl.saxon.StyleSheet $(xsl_flags) -o $(out) $(in) $(xsl) $(xsl_params)
++
++pdf_proc?=java org.apache.fop.apps.Fop -fo $(fo_flags) $(in) -pdf $(out)
++#pdf_proc?=~/bin/xep/run.sh $(fo_flags) $(in) $(out)
+ 
+ # RTF generation currently requires you download a separate, closed source jar 
+ # file and add it to your java classpath: 	
+ # http://www.xmlmind.com/foconverter/downloadperso.shtml
+-rtf_proc = java com.xmlmind.fo.converter.Driver $(in) $(out)
+-#rtf_proc = java ch.codeconsult.jfor.main.CmdLineConverter $(in) $(out)
++rtf_proc?=java com.xmlmind.fo.converter.Driver $(in) $(out)
++#rtf_proc?=java ch.codeconsult.jfor.main.CmdLineConverter $(in) $(out)
+ 
+ # Element filtering allows you to create targeted resumes.  
+ # You can create your own targets; just specify them in your resume.xml 
+@@ -92,8 +98,8 @@
+ # "targets" attribute) are always included.  
+ # Take a look at example2.xml and try changing the filter targets to get a 
+ # feel for how the filter works.
+-filter_targets = foodservice carpentry
+-filter_proc = java net.sourceforge.xmlresume.filter.Filter -in $(in) -out $(out) $(filter_targets)
++filter_targets?=foodservice carpentry
++filter_proc?=java net.sourceforge.xmlresume.filter.Filter -in $(in) -out $(out) $(filter_targets)
+ 
+ #------------------------------------------------------------------------------
+ # End configurable parameters
+@@ -111,17 +117,17 @@
+ filter: $(resume)-filtered.xml
+ 
+ clean:
+-	rm -f $(resume).html
+-	rm -f $(resume).txt
+-	rm -f $(resume).fo
+-	rm -f $(resume).pdf
+-	rm -f $(resume).rtf
+-	rm -f $(resume)-filtered.xml
+-	rm -f $(resume)-filtered.html
+-	rm -f $(resume)-filtered.txt
+-	rm -f $(resume)-filtered.pdf
+-	rm -f $(resume)-filtered.fo
+-	rm -f $(resume)-filtered.rtf
++	- at rm -f $(resume).html
++	- at rm -f $(resume).txt
++	- at rm -f $(resume).fo
++	- at rm -f $(resume).pdf
++	- at rm -f $(resume).rtf
++	- at rm -f $(resume)-filtered.xml
++	- at rm -f $(resume)-filtered.html
++	- at rm -f $(resume)-filtered.txt
++	- at rm -f $(resume)-filtered.pdf
++	- at rm -f $(resume)-filtered.fo
++	- at rm -f $(resume)-filtered.rtf
+ 
+ $(resume).html: in = $(resume).xml
+ $(resume).html: out = $(resume).html
+@@ -162,3 +168,5 @@
+ $(resume)-filtered.xml: $(resume).xml
+ 	$(filter_proc)
+ 	$(make) all resume=$(resume)-filtered
++
++#eof "xmlresume.mk -- fixed for french processing"

Added: packages/xml-resume-library/trunk/debian/patches/prettify-postalcode.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/prettify-postalcode.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/prettify-postalcode.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/prettify-postalcode.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,30 @@
+Subject: Bug#179478: fo.xsl does not format european address correctly
+Date: Sun, 2 Feb 2003 17:28:00 +0100
+From: Guillaume Morin <gemorin at debian.org>
+To: Debian Bug Tracking System <submit at bugs.debian.org>
+Message-ID: <20030202162800.GA2193 at siri>
+
+According to
+http://xmlresume.sourceforge.net/user-guide/param.address.format.html,
+european address should be formatted as 
+<street>
+<street2>
+<suburb | ward>
+<zip | postalCode> <city>
+
+But since fo.xsl puts the postalcode and the city in different 
+<fo:block>, they are displayed on different line.
+
+This patch fixes the problem :
+
+--- xml-resume-library/xsl/format/fo.xsl~      2003-02-02 17:00:04.000000000 +0100
++++ xml-resume-library/xsl/format/fo.xsl      2003-02-02 17:18:59.000000000 +0100
+@@ -225,7 +225,7 @@
+         <xsl:if test="string-length($PostCode) &gt; 0">
+           <xsl:value-of select="$PostCode"/><xsl:text> </xsl:text>
+         </xsl:if>
+-	</fo:block><fo:block>
++	<!-- </fo:block><fo:block> -->
+         <xsl:apply-templates select="r:city"/>
+       </fo:block>
+         <xsl:if test="string-length($AdminDivision) &gt; 0">

Added: packages/xml-resume-library/trunk/debian/patches/prettify-text-xsl.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/patches/prettify-text-xsl.patch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/patches/prettify-text-xsl.patch (added)
+++ packages/xml-resume-library/trunk/debian/patches/prettify-text-xsl.patch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,25 @@
+--- xml-resume-library/xsl/format/text.xsl~	2002-11-27 21:38:36.000000000 -0500
++++ xml-resume-library/xsl/format/text.xsl	2003-01-03 15:32:04.000000000 -0500
+@@ -416,12 +416,21 @@
+   </xsl:template>
+                 
+   <xsl:template match="r:period">
+-    <xsl:apply-templates select="r:from"/>-<xsl:apply-templates select="r:to"/>
++    <xsl:apply-templates select="r:from"/> - <xsl:apply-templates select="r:to"/>
+     <xsl:if test="parent::r:job">
+       <xsl:call-template name="NewLine"/>
+     </xsl:if>
+   </xsl:template>
+ 
++  <xsl:template match="r:from">
++    <xsl:apply-templates select="r:date"/>
++  </xsl:template>
++
++  <xsl:template match="r:to">
++    <xsl:apply-templates select="r:date"/>
++    <xsl:apply-templates select="r:present"/>
++  </xsl:template>
++
+   <!-- Format a date. -->
+   <xsl:template match="r:date" name="FormatDate">
+     <xsl:if test="r:dayOfMonth">

Added: packages/xml-resume-library/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/rules?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/rules (added)
+++ packages/xml-resume-library/trunk/debian/rules Mon Sep 22 11:39:40 2008
@@ -1,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2002,2003 Colin Walters <walters at debian.org>
+
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+binary-post-install/xml-resume-library::
+	find debian/xml-resume-library/usr/share/sgml/xml-resume-library/ -name '*.sh' -exec chmod a+x {} \;
+	 # workaround because dh_install doesn't allow renaming files
+	mkdir -p debian/xml-resume-library/usr/share/sgml/xml-resume-library/dtd
+	cp dtd/catalog debian/xml-resume-library/usr/share/sgml/xml-resume-library/dtd/resume.cat
+	 # rework upstream documentation
+# Commented out to close 205956
+#	cd debian/xml-resume-library/usr/share/java && \
+#	  ln -s xmlresume-filter-1.5.1.jar xmlresume-filter.jar
+	(cd debian/xml-resume-library/usr/share/doc/xml-resume-library; \
+		ln -s html/changelog/index.html changelog.html; \
+		w3m -dump changelog.html | gzip -9 > changelog.gz; rm changelog.html )

Propchange: packages/xml-resume-library/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/xml-resume-library/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/watch?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/watch (added)
+++ packages/xml-resume-library/trunk/debian/watch Mon Sep 22 11:39:40 2008
@@ -1,0 +1,6 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+# Find new files on sourceforge
+http://sf.net/xmlresume/resume-(\d+)_(\d+)_(\d+)\.tgz
+

Added: packages/xml-resume-library/trunk/debian/xml-resume-library.doc-base
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/xml-resume-library.doc-base?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/xml-resume-library.doc-base (added)
+++ packages/xml-resume-library/trunk/debian/xml-resume-library.doc-base Mon Sep 22 11:39:40 2008
@@ -1,0 +1,9 @@
+Document: xml-resume-library
+Title: The XML resume library
+Author: David MacKenzie
+Abstract: The XML Resume Library is an XML and XSL based system for marking up, adding metadata to, and formatting resumes and curricula vitae.
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/xml-resume-library/html/index.html
+Files: /usr/share/doc/xml-resume-library/html/*/*.html

Added: packages/xml-resume-library/trunk/debian/xml-resume-library.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/xml-resume-library.install?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/xml-resume-library.install (added)
+++ packages/xml-resume-library/trunk/debian/xml-resume-library.install Mon Sep 22 11:39:40 2008
@@ -1,0 +1,8 @@
+dtd/resume.dtd usr/share/sgml/xml-resume-library/dtd/
+xsl/* usr/share/sgml/xml-resume-library/xsl/
+css/* usr/share/sgml/xml-resume-library/css/
+doc/* usr/share/doc/xml-resume-library/html/
+examples/* usr/share/doc/xml-resume-library/examples/
+java/xmlresume-filter.jar usr/share/java/
+debian/examples/* usr/share/doc/xml-resume-library/debian-examples/
+

Added: packages/xml-resume-library/trunk/debian/xml-resume-library.postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/xml-resume-library.postinst?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/xml-resume-library.postinst (added)
+++ packages/xml-resume-library/trunk/debian/xml-resume-library.postinst Mon Sep 22 11:39:40 2008
@@ -1,0 +1,23 @@
+#!/bin/bash
+# -*- coding: utf-8 -*-
+# Copyright © 2002 Colin Walters <walters at debian.org>
+# xml-resume-library postinst by Colin Walters <walters at debian.org>;
+# derived from docbook-xml postinst by Adam Di Carlo <aph at debian.org>
+set -e
+
+PACKAGE=xml-resume-library
+CENTRALCAT=/etc/sgml/${PACKAGE}.cat
+DTDDIR=/usr/share/sgml/xml-resume-library/dtd
+
+if [ "$1" = configure ]; then
+    # remove the old catalog
+    install-sgmlcatalog --quiet --remove ${PACKAGE}
+
+    update-catalog --quiet --add ${CENTRALCAT} ${DTDDIR}/resume.cat
+    update-catalog --quiet --add --super ${CENTRALCAT}
+fi
+
+# automatically generated debhelper commands
+#DEBHELPER#
+
+exit 0

Added: packages/xml-resume-library/trunk/debian/xml-resume-library.prerm
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/xml-resume-library/trunk/debian/xml-resume-library.prerm?rev=1245&op=file
==============================================================================
--- packages/xml-resume-library/trunk/debian/xml-resume-library.prerm (added)
+++ packages/xml-resume-library/trunk/debian/xml-resume-library.prerm Mon Sep 22 11:39:40 2008
@@ -1,0 +1,22 @@
+#!/bin/bash
+# -*- coding: utf-8 -*-
+# Copyright © 2002 Colin Walters <walters at debian.org>
+# xml-resume-library prerm by Colin Walters <walters at debian.org>;
+# derived from docbook-xml prerm by Adam Di Carlo <aph at debian.org>
+
+PACKAGE=xml-resume-library
+CENTRALCAT=/etc/sgml/${PACKAGE}.cat
+
+set -e
+
+if [ "$1" = remove ]; then
+    update-catalog --quiet --remove --super ${CENTRALCAT}
+elif [ "$1" = purge ]; then
+    rm -f ${CENTRALCAT} ${CENTRALCAT}.old
+    rm -rf /etc/sgml/${PACKAGE}
+fi
+
+# automatically generated debhelper commands
+#DEBHELPER#
+
+exit 0




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