This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to annotated tag debian/0.0_R8+dfsg2-1 in repository xhtmlrenderer.
commit f5f73ab58c69c9f62474db16241abe813a0f1b09 Author: Markus Koschany <[email protected]> Date: Mon Jan 11 13:02:44 2016 +0100 Revert "Imported Upstream version 0.0~R8+dfsg2" This reverts commit d635120d22d8a7915be32705fac5736c82849b8d. --- debian/README.source | 11 -- debian/changelog | 17 -- debian/classpath | 2 - debian/compat | 1 - debian/control | 54 ------ debian/copyright | 267 ------------------------------ debian/libcore-renderer-java-doc.doc-base | 8 - debian/libcore-renderer-java-doc.docs | 1 - debian/libcore-renderer-java-doc.javadoc | 1 - debian/libcore-renderer-java.jlibs | 2 - debian/orig-tar.excludes | 9 - debian/orig-tar.sh | 18 -- debian/patches/01_use_debian_jars.diff | 86 ---------- debian/patches/series | 1 - debian/rules | 37 ----- debian/source/format | 1 - debian/watch | 5 - demos/svg/xhtml/dat/face-sad.svg | 94 +++++++---- 18 files changed, 60 insertions(+), 555 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 8a3f744..0000000 --- a/debian/README.source +++ /dev/null @@ -1,11 +0,0 @@ -The original upstream tarball has been repacked to replace the non-free -(cc-by-nc-sa) licensed version of face-crying.svg with the public domain -version found in tango-icon-theme. - -Note to build this package with a tool like git-buildpackage, you must -first apply the build system patches so the clean target can be run. - -For example: - -$ quilt push -a -$ gbp buildpackage --git-ignore-new diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 6c2e2d4..0000000 --- a/debian/changelog +++ /dev/null @@ -1,17 +0,0 @@ -xhtmlrenderer (0.0~R8+dfsg-1) unstable; urgency=medium - - * Team upload. - * Repack upstream source to replace non-free face-crying.svg with version - found in tango-icon-theme. (Closes: #787361) - * Update project homepage. - * Use debhelper 9. - * Bump Standards-Version to 3.9.6. - * Update Vcs URLs. - - -- tony mancill <[email protected]> Mon, 01 Jun 2015 21:14:36 -0700 - -xhtmlrenderer (0.0~R8-1) unstable; urgency=low - - * Initial release. (Closes: #608284). - - -- Miguel Landaeta <[email protected]> Thu, 20 Jan 2011 13:36:27 -0430 diff --git a/debian/classpath b/debian/classpath deleted file mode 100644 index 6a7ecf0..0000000 --- a/debian/classpath +++ /dev/null @@ -1,2 +0,0 @@ -build/core-renderer.jar /usr/share/java/itext.jar -build/core-renderer-minimal.jar /usr/share/java/itext.jar diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index f651a1f..0000000 --- a/debian/control +++ /dev/null @@ -1,54 +0,0 @@ -Source: xhtmlrenderer -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Miguel Landaeta <[email protected]> -Build-Depends: debhelper (>= 9~), default-jdk, javahelper, ant -Build-Depends-Indep: libitext-java (>= 2.0) -Standards-Version: 3.9.6 -Homepage: https://code.google.com/p/flying-saucer/ -Vcs-Git: git://anonscm.debian.org/pkg-java/xhtmlrenderer.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/xhtmlrenderer.git - -Package: libcore-renderer-java -Architecture: all -Depends: libitext-java (>= 2.0), ${misc:Depends} -Description: Java library that provides an XML/XHTML/CSS 2.1 Renderer - xhtmlrender is an XML/CSS renderer, which means it takes - XML files as input, applies formatting and styling using - CSS, and generates a rendered representation of that XML as - output. The output may go to the screen (in a GUI), to an - image or to a PDF file. - . - The main target for content is XHTML 1.0 (strict), an XML - document format that standardizes HTML. However, - xhtmlrenderer accepts any well-formed XML for rendering as - long as CSS is provided that tells how to lay it out. - . - In the case of XHTML, default stylesheets are provided out - of the box and packaged within the library. - -Package: libcore-renderer-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends} -Recommends: libcore-renderer-java -Suggests: default-jdk-doc -Description: Documentation for libcore-renderer-java - Documentation for xhtmlrender that is an XML/CSS renderer, - which means it takes XML files as input, applies formatting - and styling using CSS, and generates a rendered representation - of that XML as output. The output may go to the screen (in a - GUI), to an image or to a PDF file. - . - The main target for content is XHTML 1.0 (strict), an XML - document format that standardizes HTML. However, - xhtmlrenderer accepts any well-formed XML for rendering as - long as CSS is provided that tells how to lay it out. - . - In the case of XHTML, default stylesheets are provided out - of the box and packaged within the library. - . - This package contains the javadoc files of - libcore-renderer-java and the user guide reference for - xhtmlrenderer. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 695078d..0000000 --- a/debian/copyright +++ /dev/null @@ -1,267 +0,0 @@ -The sources where downloaded from -http://pigeonholdings.com/projects/flyingsaucer/R8/downloads/flyingsaucer-R8-src.zip. - -Files: * -Copyright: © 2004-2009, Joshua Marinacci <[email protected]>, - © 2004-2009, Patrick Wright, - © 2004-2009, The Flying Saucer Team, - © 2004-2008, Torbjörn Gannholm, - © 2004-2008, Wisconsin Court System, - © 2007,2009, Christophe Marchand, - © 2007-2008, Sean Bright, - © 2005, Scott Cytacki, - © 2007, Jason Blumenkrantz, - © 2007, Nick Reddel -License: LGPL-2.1 -Comment: Since several source code files don't have an header indicating - copyright, license or author, upstream was contacted for clarification. - Below is the email exchange with them: - - Date: Thu, 20 Jan 2011 10:40:31 -0430 - From: Miguel Landaeta <[email protected]> - To: Josh Marinacci <[email protected]> - Cc: tony mancill <[email protected]> - Message-ID: <[email protected]> - Subject: xhtmlrenderer Debian package - - Hi Joshua, - - I'm just emailing you to let you know about a Debian package that I'm - preparing for xhtmlrenderer and to ask you some questions about the - licensing and copyright of some files included in the source tarball released - by your project. - - In the LICENSE file is stated the following: - - "All source code to Flying Saucer itself is licensed under the GNU Lesser - General Public License (LGPL); you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free - Software Foundation, either version 2.1 of the License, or (at your option) - any - later version." - - However there are some files without a header and they don't have an author - or copyright statement available: - - ./src/java/org/xhtmlrenderer/tool/Boxer.java - ./src/java/org/xhtmlrenderer/simple/PDFRenderer.java - ./src/java/org/xhtmlrenderer/pdf/DefaultPDFCreationListener.java - ./src/java/org/xhtmlrenderer/simple/XHTMLPrintable.java - ./src/java/org/xhtmlrenderer/util/PermutationGenerator.java - ./src/java/org/xhtmlrenderer/util/GenerateBigFile.java - several files under ./src/java/org/xhtmlrenderer/test/* - several files under ./src/java/org/xhtmlrenderer/pdf/* - - (There are probably more, the check could be more exhaustive if - necessary). - - Are those files also licensed under LGPL-2.1 license? - If not, how are licensed those files? - - [snip] - - - Date: Thu, 20 Jan 2011 07:22:47 -0800 - From: Josh Marinacci <[email protected]> - To: Miguel Landaeta <[email protected]> - Cc: tony mancill <[email protected]>, Patrick Wright <[email protected]> - In-Reply-To: <[email protected]> - References: <[email protected]> - Message-Id: <[email protected]> - Subject: Re: xhtmlrenderer Debian package - - Hi Miguel. A Debian package sounds great. I'm actually not the project = - leader anymore (not for a few years now). I've CC'ed Patrick who can = - give you the info you need. The site is down due to the Java.net = - transition, though I believe most of the site is actually stored other = - places now. - - good luck! - J - - - Date: Thu, 20 Jan 2011 18:43:43 +0100 - From: Patrick Wright <[email protected]> - To: Miguel Landaeta <[email protected]> - Cc: tony mancill <[email protected]>, "Peter Brant" <[email protected]>, - Josh Marinacci <[email protected]> - In-Reply-To: <[email protected]> - References: <[email protected]> - <[email protected]> - Message-Id: <[email protected]> - Subject: Re: xhtmlrenderer Debian package - - Hi Miguel - - 1) Regarding licensing - our intention has always been that all the - code for Flying Saucer itself is licensed under the LGPL. If any are - missing the license header, this is most likely an oversight on our - part which no one has brought to our attention. The only exception(s) - might be the documentation and perhaps some of the demo code, but I - would need to double-check that. The library itself is LGPL. I believe - we are comfortable that our CVS (and now GitHub) repository shows the - origin of the files in our source tree. We can correct any licensing - issues in the source tree. - - [snip] - - -Files: demos/docbook/MozBook/MozBook.css -Author: David Horton -License: Public Domain - -Files: demos/docbook/docbook-css-0.4/* -Copyright: © 2004, David Holroyd and contributors -License: other (BSD-like) - Permission to use, copy, modify and distribute this software and its - documentation for any purpose and without fee is hereby granted in - perpetuity, provided that the above copyright notice appear in all - copies, and that both the copyright notice and this permission notice - appear in supporting documentation. The contributors make no - representations about the suitability of this software for any - purpose. It is provided "as is" without express or implied warranty. - - THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Files: demos/docbook/wysiwygdocbook1.01/* -Copyright: © 2004, David Holroyd and contributors, - © 2005 Michael Thiele, and contributors -License: other (BSD-like) - Permission to use, copy, modify and distribute this software and its - documentation for any purpose and without fee is hereby granted in - perpetuity, provided that the above copyright notice appear in all - copies, and that both the copyright notice and this permission notice - appear in supporting documentation. The contributors make no - representations about the suitability of this software for any - purpose. It is provided "as is" without express or implied warranty. - - THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Files: demos/docbook/dtd/*, - src/schema/docbook/*.mod, - src/schema/docbook/*.dtd -Copyright: © 1992-2004, HaL Computer Systems, Inc., - © 1992-2002, O'Reilly & Associates, Inc., - © 1992-2002, ArborText, Inc., - © 1992-2002, Fujitsu Software Corporation, - © 1992-2002, Norman Walsh, - © 1992-2002, Sun Microsystems, Inc., - © 1992-2002, Organization for the Advancement of Structured Information Standards (OASIS) -License: other - Permission to use, copy, modify and distribute the DocBook XML DTD - and its accompanying documentation for any purpose and without fee - is hereby granted in perpetuity, provided that the above copyright - notice and this paragraph appear in all copies. The copyright - holders make no representation about the suitability of the DTD for - any purpose. It is provided "as is" without expressed or implied - warranty. - - If you modify the DocBook XML DTD in any way, except for declaring and - referencing additional sets of general entities and declaring - additional notations, label your DTD as a variant of DocBook. See - the maintenance documentation for more information. - -Files: src/schema/*.ent -Copyright: © 1986, International Organization for Standardization -License: other - Permission to copy in any form is granted for use with - conforming SGML systems and applications as defined in - ISO 8879, provided this notice is included in all copies. - -Files: src/schema/xhtml/*.mod, - src/schema/xhtml/*.dtd -Copyright: © 1998-2001, W3C (MIT, INRIA, Keio) -Comment: Even though those *.mod and *.dtd files don't indicate a license, - those files are copies of the ones distributed in w3c-dtd-xhtml package. - Those files are known to be licensed under W3C Software Licence which - is compatible with the GPL2 license. -License: W3C Software License - W3C Software License - - According to http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html, - "while schemas and DTDs are frequently part of our specifications and - seemingly fall under the document copyright terms, you may use them under - the W3C Software License." - - http://www.w3.org/Consortium/Legal/copyright-software-19980720 : - - - W3C ® SOFTWARE NOTICE AND LICENSE - - Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts - Institute of Technology, Institut National de Recherche en Informatique - et en Automatique, Keio University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/ - - This W3C work (including software, documents, or other related items) - is being provided by the copyright holders under the following - license. By obtaining, using and/or copying this work, you (the - licensee) agree that you have read, understood, and will comply with - the following terms and conditions: - - Permission to use, copy, modify, and distribute this software and its - documentation, with or without modification, for any purpose and - without fee or royalty is hereby granted, provided that you include - the following on ALL copies of the software and documentation or - portions thereof, including modifications, that you make: - 1. The full text of this NOTICE in a location viewable to users of - the redistributed or derivative work. - 2. Any pre-existing intellectual property disclaimers, notices, or - terms and conditions. If none exist, a short notice of the - following form (hypertext is preferred, text is permitted) should - be used within the body of any redistributed or derivative code: - "Copyright © [$date-of-software] World Wide Web Consortium, - (Massachusetts Institute of Technology, Institut National de - Recherche en Informatique et en Automatique, Keio University). - All Rights Reserved. http://www.w3.org/Consortium/Legal/"; - 3. Notice of any changes or modifications to the W3C files, including - the date changes were made. (We recommend you provide URIs to the - location from which the code is derived.) - THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT - HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS - FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR - DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, - TRADEMARKS OR OTHER RIGHTS. - - COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL - OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR - DOCUMENTATION. - - The name and trademarks of copyright holders may NOT be used in - advertising or publicity pertaining to the software without specific, - written prior permission. Title to copyright in this software and any - associated documentation will at all times remain with copyright - holders. - - ____________________________________ - - This formulation of W3C's notice and license became active on August - 14 1998 so as to improve compatibility with GPL. This version ensures - that W3C software licensing terms are no more restrictive than GPL and - consequently W3C software may be distributed in GPL packages. See the - older formulation for the policy prior to this date. Please see our - Copyright FAQ for common questions about using materials from our - site, including specific terms and conditions for packages like - libwww, Amaya, and Jigsaw. Other questions about this notice can be - directed to [email protected]. - -Files: debian/* -Copyright: © 2011, Miguel Landaeta <[email protected]> -License: LGPL-2.1 - -License: LGPL-2.1 - The full text of the GNU Lesser General Public License is - distributed in /usr/share/common-licenses/LGPL-2.1 on Debian systems. diff --git a/debian/libcore-renderer-java-doc.doc-base b/debian/libcore-renderer-java-doc.doc-base deleted file mode 100644 index 82f4a84..0000000 --- a/debian/libcore-renderer-java-doc.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libcore-renderer-java-userguide -Title: The Flying Saucer User's Guide -Abstract: XML/XHTML/CSS renderer written in Java -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcore-renderer-java-doc/guide/users-guide-R8.html -Files: /usr/share/doc/libcore-renderer-java-doc/guide/* diff --git a/debian/libcore-renderer-java-doc.docs b/debian/libcore-renderer-java-doc.docs deleted file mode 100644 index 03cfcf8..0000000 --- a/debian/libcore-renderer-java-doc.docs +++ /dev/null @@ -1 +0,0 @@ -doc/guide diff --git a/debian/libcore-renderer-java-doc.javadoc b/debian/libcore-renderer-java-doc.javadoc deleted file mode 100644 index d17d71d..0000000 --- a/debian/libcore-renderer-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -doc/full/api/ usr/share/doc/libcore-renderer-java/api diff --git a/debian/libcore-renderer-java.jlibs b/debian/libcore-renderer-java.jlibs deleted file mode 100644 index b5c5b74..0000000 --- a/debian/libcore-renderer-java.jlibs +++ /dev/null @@ -1,2 +0,0 @@ -build/core-renderer-minimal.jar -build/core-renderer.jar diff --git a/debian/orig-tar.excludes b/debian/orig-tar.excludes deleted file mode 100644 index bdb1283..0000000 --- a/debian/orig-tar.excludes +++ /dev/null @@ -1,9 +0,0 @@ -# jars without source code -xhtmlrenderer-*/lib/*.jar -xhtmlrenderer-*/lib/dev/* - -# file licensed under CC-2.5 (non-free) -xhtmlrenderer-*/demos/browser/xhtml/recipebook-xml.css - -# unclear license, unimportant file anyway -xhtmlrenderer-*/demos/docbook/xml/plugin-implement.xml diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index fa84630..0000000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -# called by uscan with '--upstream-version' <version> <file> -echo "version $2" -package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` -version="$(echo $2 | sed 's/^/0\.0~/')" -tarball=$3 -TAR=${package}_${version}.orig.tar.gz -DIR=${package}-${version}.orig - -unzip $tarball -d $DIR - -GZIP=--best tar --numeric --group 0 --owner 0 --anchored \ - -X debian/orig-tar.excludes -c -v -z -f $TAR $DIR - -rm -rf $tarball $DIR diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff deleted file mode 100644 index 61435f6..0000000 --- a/debian/patches/01_use_debian_jars.diff +++ /dev/null @@ -1,86 +0,0 @@ -Description: Build the package using the libraries available in Debian - Replace all references to .jar files bundled by upstream with the ones - provided by Debian and disable references to libraries not available - in Debian. The SVG module is not built because it Build-Depends on - SVG Salamander and that library is not packaged yet. -Author: Miguel Landaeta <[email protected]> -Bug-Debian: http://bugs.debian.org/608284 -Forwarded: no -Last-Update: 2011-01-01 - ---- xhtmlrenderer-R8.orig/build.xml -+++ xhtmlrenderer-R8/build.xml -@@ -70,7 +70,7 @@ - <antcall target="jar.core-minimal" /> - <antcall target="jar.browser" /> - <antcall target="jar.about" /> -- <antcall target="jar.svg" /> -+ <!--<antcall target="jar.svg" />--> - <antcall target="jar.docbook" /> - </target> - ---- xhtmlrenderer-R8.orig/etc/build/preset-defs.xml -+++ xhtmlrenderer-R8/etc/build/preset-defs.xml -@@ -55,14 +55,19 @@ - </sequential> - </macrodef> - -+ <!-- Pack200Task.jar is not available in Debian and it is -+ not needed to build this package - <taskdef name="pack200" - classname="com.sun.tools.apache.ant.pack200.Pack200Task" - classpath="${libraries.dev.dir}/Pack200Task.jar" - /> -+ --> - <!-- Create our unpacker task --> -+ <!-- - <taskdef name="unpack200" - classname="com.sun.tools.apache.ant.pack200.Unpack200Task" - classpath="${libraries.dev.dir}/Pack200Task.jar"/> -+ --> - - </project> - ---- xhtmlrenderer-R8.orig/etc/build/properties.xml -+++ xhtmlrenderer-R8/etc/build/properties.xml -@@ -101,8 +101,8 @@ - - <!-- path reference for all JAR files in /lib --> - <path id="libraries.all"> -- <fileset dir="${libraries.dir}"> -- <include name="*.jar"/> -+ <fileset dir="/usr/share/java"> -+ <include name="itext.jar"/> - </fileset> - </path> - ---- xhtmlrenderer-R8.orig/etc/build/dist.xml -+++ xhtmlrenderer-R8/etc/build/dist.xml -@@ -102,6 +102,7 @@ - <include name="svgSalamander.jar"/> - </fileset> - </copy> -+ <!-- - <pack200 src="${dest.dir}/core-renderer.jar" - destfile="${dist.dir}/${app.version}/demo/packed/core-renderer.jar.pack.gz" - gzipoutput="true"/> -@@ -114,6 +115,7 @@ - <pack200 src="${libraries.dev.dir}/svgSalamander.jar" - destfile="${dist.dir}/demo_repo/packed/svgSalamander.jar.pack.gz" - gzipoutput="true"/> -+ --> - - <copy file="${src.packaging.dir}/template.jar.var" - tofile="${dist.dir}/${app.version}/demo/core-renderer.jar.var"/> -@@ -159,9 +161,11 @@ - <include name="@{demoname}.jar"/> - </fileset> - </copy> -+ <!-- - <pack200 src="${dest.dir}/@{demoname}.jar" - destfile="${dist.dir}/${app.version}/demo/@{demoname}/packed/@{demoname}.jar.pack.gz" - gzipoutput="true"/> -+ --> - <copy file="${src.packaging.dir}/template.jar.var" - tofile="${dist.dir}/${app.version}/demo/@{demoname}/@{demoname}.jar.var"/> - <replace file="${dist.dir}/${app.version}/demo/@{demoname}/@{demoname}.jar.var" diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 048ab09..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_use_debian_jars.diff diff --git a/debian/rules b/debian/rules deleted file mode 100755 index fdd786e..0000000 --- a/debian/rules +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/make -f - -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^.\+: \(.\+\)-.\+$$/\1/') -UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/^0.0~//') -JARS := core-renderer core-renderer-minimal -export JAVA_HOME=/usr/lib/jvm/default-java - -%: - dh $@ --with javahelper - -override_dh_auto_build: - ant jar - ant docs - jh_classpath - -override_dh_auto_clean: - dh_auto_clean - -rm -rf doc/full doc/user - -override_dh_link: - # provide compatibility with the versioning scheme used by upstream - for jar in $(JARS); do \ - dh_link usr/share/java/$$jar.jar \ - usr/share/java/$$jar-$(UPSTREAM_VERSION).jar; \ - done - -override_jh_classpath: - # already called during build - -get-orig-source: - cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ - uscan \ - --verbose \ - --no-symlink \ - --destdir $(CURDIR) \ - --watchfile debian/watch \ - --force-download diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 90fff57..0000000 --- a/debian/watch +++ /dev/null @@ -1,5 +0,0 @@ -version=3 -opts=dversionmangle=s/0\.0~// \ -https://xhtmlrenderer.dev.java.net/ \ -http://pigeonholdings.com/projects/flyingsaucer/R8/downloads/flyingsaucer-(.*)-src.zip \ -debian debian/orig-tar.sh diff --git a/demos/svg/xhtml/dat/face-sad.svg b/demos/svg/xhtml/dat/face-sad.svg index fdfa02d..4f0cc19 100644 --- a/demos/svg/xhtml/dat/face-sad.svg +++ b/demos/svg/xhtml/dat/face-sad.svg @@ -2,30 +2,22 @@ <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; + xmlns:cc="http://web.resource.org/cc/"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"; xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; sodipodi:docname="face-sad.svg" sodipodi:docbase="/home/jimmac/gfx/ximian/tango-desktop-theme/scalable/emotes" - inkscape:version="0.46" + inkscape:version="0.41+cvs" sodipodi:version="0.32" id="svg4376" height="48px" - width="48px" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + width="48px"> <defs id="defs3"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 24 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="48 : 24 : 1" - inkscape:persp3d-origin="24 : 16 : 1" - id="perspective39" /> <linearGradient id="linearGradient3290"> <stop @@ -131,7 +123,7 @@ inkscape:collect="always" /> </defs> <sodipodi:namedview - inkscape:window-y="109" + inkscape:window-y="184" inkscape:window-x="223" inkscape:window-height="739" inkscape:window-width="700" @@ -152,40 +144,74 @@ fill="#edd400" /> <metadata id="metadata4"> - <rdf:RDF> + <rdf:RDF + id="RDF5"> <cc:Work + id="Work6" rdf:about=""> - <dc:format>image/svg+xml</dc:format> + <dc:format + id="format7">image/svg+xml</dc:format> <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title>Face - Sad</dc:title> - <dc:subject> - <rdf:Bag> - <rdf:li>emoticon</rdf:li> - <rdf:li>emote</rdf:li> - <rdf:li>smiley</rdf:li> - <rdf:li>sad</rdf:li> - <rdf:li>:(</rdf:li> - <rdf:li>:-(</rdf:li> + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; + id="type9" /> + <dc:title + id="title8909">Face - Sad</dc:title> + <dc:subject + id="subject8911"> + <rdf:Bag + id="Bag8913"> + <rdf:li + id="li3283">emoticon</rdf:li> + <rdf:li + id="li3285">emote</rdf:li> + <rdf:li + id="li3287">smiley</rdf:li> + <rdf:li + id="li3289">sad</rdf:li> + <rdf:li + id="li3291">:(</rdf:li> + <rdf:li + id="li3293">:-(</rdf:li> </rdf:Bag> </dc:subject> <cc:license - rdf:resource="http://creativecommons.org/licenses/publicdomain/"; /> - <dc:creator> - <cc:Agent> - <dc:title>Jakub Steiner</dc:title> + rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/"; + id="license9103" /> + <dc:creator + id="creator9121"> + <cc:Agent + id="Agent9123"> + <dc:title + id="title9125">Jakub Steiner</dc:title> </cc:Agent> </dc:creator> - <dc:source>http://jimmac.musichall.cz</dc:source> + <dc:source + id="source9127">http://jimmac.musichall.cz</dc:source> </cc:Work> <cc:License - rdf:about="http://creativecommons.org/licenses/publicdomain/";> + id="License9105" + rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.0/";> <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction"; /> + id="permits9107" + rdf:resource="http://web.resource.org/cc/Reproduction"; /> <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution"; /> + id="permits9109" + rdf:resource="http://web.resource.org/cc/Distribution"; /> + <cc:requires + id="requires9111" + rdf:resource="http://web.resource.org/cc/Notice"; /> + <cc:requires + id="requires9113" + rdf:resource="http://web.resource.org/cc/Attribution"; /> + <cc:prohibits + id="prohibits9115" + rdf:resource="http://web.resource.org/cc/CommercialUse"; /> <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; /> + id="permits9117" + rdf:resource="http://web.resource.org/cc/DerivativeWorks"; /> + <cc:requires + id="requires9119" + rdf:resource="http://web.resource.org/cc/ShareAlike"; /> </cc:License> </rdf:RDF> </metadata> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xhtmlrenderer.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
