debian/0000775000000000000000000000000012242722741007173 5ustar debian/copyright0000664000000000000000000000154012242017363011123 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xmlgraphics-commons Upstream-Contact: Chris Bowditch, Thomas DeWeese, Christian Geisert, Clay Leeds, Jeremias Märki, Cameron McCormack, Simon Pepping, Jörg Pietschmann Source: http://xmlgraphics.apache.org/commons/ Files: * Copyright: 2006, The Apache Software Foundation License: Apache-2.0 Files: debian/pom.xml Copyright: 2005, The Apache Software Foundation Comment: pom.xml file has been downloaded from License: Apache-2.0 Files: debian/* Copyright: 2007, Arnaud Vandyck , 2011, Damien Raude-Morvan License: Apache-2.0 License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' debian/compat0000664000000000000000000000000212242017363010366 0ustar 9 debian/watch0000664000000000000000000000035612242017363010225 0ustar version=3 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \ http://www.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-(\d.*)-src\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian jh_repack debian/source/0000775000000000000000000000000012242017364010471 5ustar debian/source/format0000664000000000000000000000001412242017363011676 0ustar 3.0 (quilt) debian/README.Debian-source0000664000000000000000000000064712242017363012536 0ustar xmlgraphics-commons ------------------- Source tarball: --------------- The lib/*.jar files were removed, as provided only in binary form, and the examples/ subdirectory was removed, as it contained files of dubious copyright status (some PDF files, for instance). Please see the debian/new-upstream script for details on how that did happen. -- Vincent Fourmond Mon, 13 Oct 2008 21:47:24 +0200 debian/patches/0000775000000000000000000000000012242017364010620 5ustar debian/patches/series0000664000000000000000000000011312242017363012027 0ustar #xml-top-level.patch #xml-rdf-resource.patch disable-iccprofile-test.patch debian/patches/xml-rdf-resource.patch0000664000000000000000000001325312242017363015042 0ustar Description: ignores rdf:resource in XMP Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=xml-rdf-resource.patch;att=1;bug=605941 Bug-Debian: http://bugs.debian.org/605941 Author: brian m. carlson Index: xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPArray.java =================================================================== --- xmlgraphics-commons-1.4.dfsg.orig/src/java/org/apache/xmlgraphics/xmp/XMPArray.java 2010-12-20 21:38:39.387336352 +0100 +++ xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPArray.java 2010-12-20 21:39:14.891670733 +0100 @@ -19,6 +19,8 @@ package org.apache.xmlgraphics.xmp; +import java.net.URI; + import java.util.List; import org.xml.sax.ContentHandler; @@ -216,15 +218,19 @@ for (int i = 0, c = values.size(); i < c; i++) { String lang = (String)xmllang.get(i); atts.clear(); + Object v = values.get(i); if (lang != null) { atts.addAttribute(XMPConstants.XML_NS, "lang", "xml:lang", "CDATA", lang); } + if (v instanceof URI) { + atts.addAttribute(XMPConstants.RDF_NAMESPACE, "resource", + "rdf:resource", "CDATA", ((URI)v).toString()); + } handler.startElement(XMPConstants.RDF_NAMESPACE, "li", "rdf:li", atts); - Object v = values.get(i); if (v instanceof XMPComplexValue) { ((XMPComplexValue)v).toSAX(handler); - } else { + } else if (!(v instanceof URI)) { String value = (String)values.get(i); char[] chars = value.toCharArray(); handler.characters(chars, 0, chars.length); Index: xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java =================================================================== --- xmlgraphics-commons-1.4.dfsg.orig/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2010-12-20 21:39:04.295336685 +0100 +++ xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2010-12-20 21:39:14.891670733 +0100 @@ -19,6 +19,9 @@ package org.apache.xmlgraphics.xmp; +import java.net.URI; +import java.net.URISyntaxException; + import java.util.Stack; import org.xml.sax.Attributes; @@ -233,6 +236,15 @@ } else { getCurrentArray(true).add(s); } + } else { + String res = atts.getValue(XMPConstants.RDF_NAMESPACE, + "resource"); + try { + URI resource = new URI(res); + getCurrentArray(true).add(resource); + } catch (URISyntaxException e) { + throw new SAXException("rdf:resource value is not a well-formed URI", e); + } } } } else if ("Description".equals(localName)) { @@ -267,9 +279,18 @@ String s = content.toString().trim(); prop = new XMPProperty(name, s); String lang = atts.getValue(XMPConstants.XML_NS, "lang"); + String res = atts.getValue(XMPConstants.RDF_NAMESPACE, "resource"); if (lang != null) { prop.setXMLLang(lang); } + if (res != null) { + try { + URI resource = new URI(res); + prop.setValue(resource); + } catch (URISyntaxException e) { + throw new SAXException("rdf:resource value is not a well-formed URI", e); + } + } } if (prop.getName() == null) { throw new IllegalStateException("No content in XMP property"); Index: xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPProperty.java =================================================================== --- xmlgraphics-commons-1.4.dfsg.orig/src/java/org/apache/xmlgraphics/xmp/XMPProperty.java 2010-12-20 21:38:39.403336472 +0100 +++ xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPProperty.java 2010-12-20 21:39:14.891670733 +0100 @@ -19,6 +19,8 @@ package org.apache.xmlgraphics.xmp; +import java.net.URI; + import java.util.Iterator; import java.util.Map; @@ -38,6 +40,7 @@ private Object value; private String xmllang; private Map qualifiers; + private boolean uri; /** * Creates a new XMP property. @@ -47,6 +50,7 @@ public XMPProperty(QName name, Object value) { this.name = name; this.value = value; + this.uri = false; } /** @return the qualified name of the property (namespace URI + local name) */ @@ -192,12 +196,15 @@ public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); String qName = getEffectiveQName(); + if (value instanceof URI) { + atts.addAttribute(XMPConstants.RDF_NAMESPACE, "resource", "rdf:resource", "CDATA", ((URI)value).toString()); + } handler.startElement(getName().getNamespaceURI(), getName().getLocalName(), qName, atts); if (value instanceof XMPComplexValue) { XMPComplexValue cv = ((XMPComplexValue)value); cv.toSAX(handler); - } else { + } else if (!(value instanceof URI)) { char[] chars = value.toString().toCharArray(); handler.characters(chars, 0, chars.length); } debian/patches/disable-iccprofile-test.patch0000664000000000000000000000322712242017363016341 0ustar Description: This test fails with openjdk-7 (and oracle java 7). Skip for the time being until upstream resolve - see Bug. Author: James Page Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53328 --- a/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java +++ b/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java @@ -162,28 +162,6 @@ public class ImageLoaderTestCase extends sessionContext.checkAllStreamsClosed(); } - public void testICCProfiles() throws Exception { - MyImageSessionContext sessionContext = createImageSessionContext(); - List/* */profiles = new ArrayList(); - - runReaders(profiles, sessionContext, "iccTest.png", "image/png", - ImageFlavor.RAW_PNG); - runReaders(profiles, sessionContext, "iccTest.jpg", "image/jpeg", - ImageFlavor.RAW_JPEG); - - ICC_Profile first = (ICC_Profile) profiles.get(0); - byte[] firstData = first.getData(); - for (int i = 1; i < profiles.size(); i++) { - ICC_Profile icc = (ICC_Profile) profiles.get(i); - byte[] data = icc.getData(); - assertEquals("Embedded ICC Profiles are not the same size!", - firstData.length, data.length); - for (int j = 0; j < firstData.length; j++) { - assertEquals("Embedded ICC Profiles differ at index " + j, - firstData[j], data[j]); - } - } - } private void runReaders(List profiles, ImageSessionContext isc, String uri, String mime, ImageFlavor rawFlavor) throws Exception { debian/patches/xml-top-level.patch0000664000000000000000000000252512242017363014351 0ustar Description: handles top-level elements in XMP poorly Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=xml-top-level.patch;att=1;bug=605940 Bug-Debian: http://bugs.debian.org/605940 Author: brian m. carlson Index: xmlgraphics-commons-1.4.dfsg/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java =================================================================== --- xmlgraphics-commons-1.5.orig/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2012-10-16 19:54:12.000000000 +0000 +++ xmlgraphics-commons-1.5/src/java/org/apache/xmlgraphics/xmp/XMPHandler.java 2012-10-29 08:07:29.898012902 +0000 @@ -187,6 +187,12 @@ throw new SAXException("Unexpected element in the RDF namespace: " + localName); } } else { + String about = attributes.getValue(XMPConstants.RDF_NAMESPACE, "about"); + if (this.contextStack.peek().equals(this.meta) && (about != null)) { + //rdf:RDF is the parent, so this is a top-level item that isn't + //an rdf:Description, which isn't allowed. + throw new SAXException("Top-level element " + qName + " not an rdf:Description"); + } if (getCurrentPropName() != null) { //Structure (shorthand form) startStructure(); debian/rules0000775000000000000000000000207512242017363010254 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/junit4.jar:/usr/share/java/mockito-core.jar PACKAGE = xmlgraphics-commons VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) # unexport DISPLAY for so cowbuilder builds don't fail unexport DISPLAY %: dh $@ --with javahelper # all target, builds package and run test override_dh_auto_build: # Link in required deps for testing ln -sf /usr/share/java/commons-io.jar lib/ ln -sf /usr/share/java/commons-logging.jar lib/ dh_auto_build -- -noinput -Dpwd=none all maven-artifacts override_dh_auto_clean: # Drop any linked in deps for testing mh_clean rm -f lib/*.jar dh_auto_clean rm -f xmlgraphics-commons-*-bundle.jar override_dh_auto_install: mh_installpom -plib$(PACKAGE)-java build/maven/pom.xml mh_installjar -plib$(PACKAGE)-java -l build/maven/pom.xml build/$(PACKAGE)-$(VERSION).jar get-orig-source: uscan --force-download --verbose --repack --rename debian/libxmlgraphics-commons-java-doc.doc-base0000664000000000000000000000051712242017363016735 0ustar Document: libxmlgraphics-commons-java-doc Title: API documentation for libxmlgraphics-commons-java Author: Abstract: This is the API documentation for libxmlgraphics-commons-java Section: Programming/Java Format: HTML Index: /usr/share/doc/libxmlgraphics-commons-java/api Files: /usr/share/doc/libxmlgraphics-commons-java/api/*.html debian/libxmlgraphics-commons-java-doc.install0000664000000000000000000000007712237020777016736 0ustar build/javadocs/* usr/share/doc/libxmlgraphics-commons-java/api debian/libxmlgraphics-commons-java.jlibs0000664000000000000000000000004212242017363015611 0ustar build/xmlgraphics-commons-1.5.jar debian/changelog0000664000000000000000000002367712242722736011070 0ustar xmlgraphics-commons (1.5-4ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: - d/rules,control: Drop dependencies required for unit testing as they include libmockito-java which would pull maven into main, disable unit test execution. -- James Page Tue, 19 Nov 2013 17:54:32 +0000 xmlgraphics-commons (1.5-4) unstable; urgency=low [ Emmanuel Bourg ] * Team upload. * debian/control: - Removed junit4 and libmockito-java from the dependencies of libxmlgraphics-commons-java - Updated Standards-Version to 3.9.5 (no changes) - Use canonical URLs for the Vcs-* fields - Fixed the duplicate-short-description lintian warning * Switch to debhelper level 9 * debian/rules: Improved the clean target * Include the Javadoc in the documentation package instead of the raw xdoc files * Install the documentation in /usr/share/doc/libxmlgraphics-commons-java [ tony mancill ] * debian/rules: - unexport DISPLAY to prevent test failures on workstations -- Emmanuel Bourg Thu, 07 Nov 2013 23:11:13 +0100 xmlgraphics-commons (1.5-3ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - d/rules,control: Drop dependencies required for unit testing as they include libmockito-java which would pull maven into main, disable unit test execution. -- James Page Sun, 09 Jun 2013 21:43:10 +0100 xmlgraphics-commons (1.5-3) unstable; urgency=low * Fix lintian error (doc-base-file-references-missing-file) * Enable testsuite + disable test which is incompat with openjdk-7. Thanks to James Page. Closes: #708616 -- Mathieu Malaterre Wed, 29 May 2013 14:34:25 +0200 xmlgraphics-commons (1.5-2ubuntu2) saucy; urgency=low * d/rules,control: Drop dependencies required for unit testing as they include libmockito-java which would pull maven into main, disable unit test execution. -- James Page Fri, 17 May 2013 10:58:26 +0100 xmlgraphics-commons (1.5-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - d/rules: Enable testsuite execution. - d/patches/disable-iccprofile-test.patch: Disable failing test with openjdk-7 until resolved upstream. * Dropped changes, included upstream: - d/patches/java7-compat.patch. - d/patches/enable-testsuite.patch: Disabled tests now functional. * Dropped changes, included in Debian: - debian/rules: commented in junit ant-junit to DEB_ANT_JARS to enable test suite execution - debian/rules: use /usr/lib/jvm/default-java for build. - debian/control: Build-Depends: switched to default-jdk. -- James Page Fri, 17 May 2013 10:33:45 +0100 xmlgraphics-commons (1.5-2) unstable; urgency=low * Upload to sid * Bump Std-Vers to 3.9.4, no changes needed * Use updated debian/watch (HowToHelpWithFixingWatchFiles) -- Mathieu Malaterre Wed, 15 May 2013 14:43:50 +0200 xmlgraphics-commons (1.5-1) experimental; urgency=low * Use my @d.o alias, remove DMUA flag (not required) * Update the xmlgraphics-commons Uploaders list. Closes: #654142 * Bump Std-Vers to 3.9.3, no changes needed * Fix VCS urls * Use javahelper for repack and d/rules * Build documentation package * remove XMP patches: - xml-rdf-resource.patch - xml-top-level.patch -- Mathieu Malaterre Mon, 29 Oct 2012 08:59:08 +0100 xmlgraphics-commons (1.4.dfsg-4ubuntu2) quantal; urgency=low * Fix FTBFS with openjdk-7 as default-jdk (LP: #888129): - d/patches/java7-compat.patch: Cherry picked patch from upstream VCS which removes the use of Sun Java 6 internal API's. - d/patches/disable-iccprofile-test.patch: Disable failing test with openjdk-7 until resolved upstream. -- James Page Wed, 30 May 2012 17:21:51 +0100 xmlgraphics-commons (1.4.dfsg-4ubuntu1) precise; urgency=low * Merge from Debian testing (LP: #922893). Remaining changes: - debian/rules: commented in junit ant-junit to DEB_ANT_JARS to enable test suite execution. - debian/patches/enable-testsuite.patch: patch in system libraries and patch out failing tests (see patch for details of why). - debian/rules: use /usr/lib/jvm/default-java for build. - debian/control: Build-Depends: switched to default-jdk. -- James Page Thu, 09 Feb 2012 15:58:23 +0000 xmlgraphics-commons (1.4.dfsg-4) unstable; urgency=low * Team upload. * d/control: Drop Depends on java2-runtime-headless since only programs need to depends on Java runtime (Debian Java Policy). * Bump Standards-Version to 3.9.2: no changes needed. * d/rules: Fix JAVA_HOME for multiarch OpenJDK. * d/copyright: Update to latest DEP-5 format. -- Damien Raude-Morvan Fri, 25 Nov 2011 08:39:18 +0100 xmlgraphics-commons (1.4.dfsg-3ubuntu1) oneiric; urgency=low * MIR updates for Ubuntu (LP: #778216): - debian/rules: commented in junit ant-junit to DEB_ANT_JARS to enable test suite execution. - debian/patches/enable-testsuite.patch: patch in system libraries and patch out failing tests (see patch for details of why). - debian/control + Bumped Standards-Version: to 3.9.2, no changes. + Build-Depends: switched to default-jdk. + Removed library dependency on java-gcj-compat-headless | java2-runtime-headless - no longer required by policy. - debian/rules: use /usr/lib/jvm/default-java for build. -- James Page Mon, 11 Jul 2011 12:36:14 +0100 xmlgraphics-commons (1.4.dfsg-3) unstable; urgency=low * Uploading to unstable, hoping we won't break too many things ;-)... -- Vincent Fourmond Fri, 11 Feb 2011 14:15:14 +0100 xmlgraphics-commons (1.4.dfsg-2) experimental; urgency=low * Applied patches by Brian M. Carlson to fix various problems with XMP (closes: #605940, #605941) * Dropping simple-patchsys now that we have switched to format 3.0 * Conforms to standards 3.9.1 -- Vincent Fourmond Wed, 22 Dec 2010 20:29:33 +0100 xmlgraphics-commons (1.4.dfsg-1) experimental; urgency=low [ Mathieu Malaterre ] * New upstream. Closes: #589269 * Update Standards-Version to 3.9.0 (no change required) * Use shipped in pom.xml instead of debian one. * Add get-orig-source target in debian/rules [ Torsten Werner ] * Improve the download and creation of the orig tarball. -- Torsten Werner Sun, 18 Jul 2010 15:19:45 +0200 xmlgraphics-commons (1.3.1.dfsg-5) unstable; urgency=low * Added Maven support * Added VCS-* fields * Standards-Version to 3.8.4 * Source format 3.0 (quilt) * debhelper compat to 7 * d/copyright: - converted to DEP5 format - added debian/pom.xml section * Removed Arnaud Vandyck from Uploaders -- Gabriele Giacone <1o5g4r8o@gmail.com> Mon, 22 Feb 2010 00:13:23 +0100 xmlgraphics-commons (1.3.1.dfsg-4) unstable; urgency=low * Hmmm, also depend on java2-runtime-headless as well... (really closes: #551548) -- Vincent Fourmond Thu, 28 Jan 2010 21:18:21 +0100 xmlgraphics-commons (1.3.1.dfsg-3) unstable; urgency=low * The "losing one's head" release * Depend on java-gcj-compat-headless rather than -compat, to avoid pulling unnecessary X dependencies (closes: #551548) * Already conforms to Standards 3.8.3 -- Vincent Fourmond Mon, 25 Jan 2010 21:07:44 +0100 xmlgraphics-commons (1.3.1.dfsg-2) unstable; urgency=low * Uploading to unstable * Add a missing ${misc:Depends} in dependencies -- Vincent Fourmond Tue, 17 Feb 2009 21:44:28 +0100 xmlgraphics-commons (1.3.1.dfsg-1) experimental; urgency=low [ Sylvestre Ledru ] * New upstream version (closes: #490749) * debian/rules now uses DEB_UPSTREAM_VERSION [ Vincent Fourmond ] * Created a debian/new-upstream script to repackage upstream tarball * Updated debian/watch * Adding libcommons-logging as Build-Dep and in debian/rules * Updated debian/README.Debian-source to reflect the debian/new-upstream script. -- Vincent Fourmond Mon, 13 Oct 2008 22:17:22 +0200 xmlgraphics-commons (1.2.dfsg+dak-1) experimental; urgency=low [ Michael Koch ] * Fixed watch file to match current debian version format. [ Vincent Fourmond ] * Added myself to Uploaders * Fixed debian/rules and debian/control to build with openjdk (closes: #452875) * Already conforms to Standards 3.8.0 * Moving to main, hence the pseudo-new-upstream tarball to work around dak's contrib-to-main bug. * Uploading to experimental to avoid potential disruption -- Vincent Fourmond Thu, 18 Sep 2008 00:28:42 +0200 xmlgraphics-commons (1.2.dfsg-1) unstable; urgency=low * New upstream release. * Renamed README.Debian to README.Debian-source and adjusted content. * Removed libxmlgraphics-commons-java.dirs, libxmlgraphics-commons-java.install and libxmlgraphics-commons-java.links files and implemented them in debian/rules accounting for upstream version automatically. * Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.5. * Moved debhelper and cdbs from from Build-Depends-Indep to Build-Depends. * Removed unused Depends on libasm-java. * Cleaned up debian/rules. * Updated Standards-Version to 3.7.3. * Updated debhelper level to 5. * Added myself to Uploaders. -- Michael Koch Thu, 27 Dec 2007 21:13:11 +0100 xmlgraphics-commons (1.1.dfsg.2-1) unstable; urgency=low * Move to contrib because it needs Sun's proprietary jpeg codecs. -- Arnaud Vandyck Mon, 7 May 2007 10:46:53 +0200 xmlgraphics-commons (1.1.dfsg.1-1) unstable; urgency=low * Initial Release (closes: #418896). * No javadoc at the moment. -- Arnaud Vandyck Fri, 13 Apr 2007 08:55:41 +0200 debian/control0000664000000000000000000000371512242721433010601 0ustar Source: xmlgraphics-commons Section: java Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Vincent Fourmond , Mathieu Malaterre Build-Depends: debhelper (>= 9), javahelper Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, libcommons-io-java (>= 1.3.1), libcommons-logging-java, maven-repo-helper Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/xmlgraphics-commons Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/xmlgraphics-commons Homepage: http://xmlgraphics.apache.org/commons/ Package: libxmlgraphics-commons-java Architecture: all Depends: ${misc:Depends}, libcommons-io-java, libcommons-logging-java Suggests: libxmlgraphics-commons-java-doc Description: Reusable components used by Batik and FOP Apache XML Graphics Commons is a library that consists of several reusable components used by Apache Batik and Apache FOP. Many of these components can easily be used separately outside the domains of SVG and XSL-FO. You will find components such as a PDF library, an RTF library, Graphics2D implementations that let you generate PDF & PostScript files, and much more. Package: libxmlgraphics-commons-java-doc Architecture: all Section: doc Depends: ${misc:Depends}, ${java:Depends} Recommends: ${java:Recommends} Suggests: libxmlgraphics-commons-java Description: Reusable components used by Batik and FOP (documentation) Apache XML Graphics Commons is a library that consists of several reusable components used by Apache Batik and Apache FOP. Many of these components can easily be used separately outside the domains of SVG and XSL-FO. You will find components such as a PDF library, an RTF library, Graphics2D implementations that let you generate PDF & PostScript files, and much more. . This package includes the documentation.