Control: tags 566901 patch Hi Vincent,
On 17.10.2013 15:07, Vincent Fourmond wrote: [...] > I don't have the time to review the patch right now. I can have a > look this week-end, if you want more eyes, but if you feel confident > about the current state, I don't mind an upload as-is. No worries. Tony Mancill has uploaded the bug fixes for #725461 already. Now I'm attaching the debdiff with all the changes to split the package into libbatik-java and batik. I can confirm that these rdeps still build fine with those changes: scilab-full-bin umlet sweethome3d-furniture-editor sweethome3d scilab-full-bin osmosis (FTBFS because of a another bug) libjeuclid-core-java libjcharts-java libjaxe-java libjasperreports3.7-java libjasperreports-java freeplane freemind-plugins-svg libfop-java libflamingo-java ditaa As you said verifying that everything works as intended is time consuming. Therefore I have targeted the new revision for experimental. I suggest to ask the maintainers/uploaders of these rdeps to confirm that their packages still work fine with the new version as soon as it enters experimental. Hopefully this will speed things up a little. Regards, Markus
diff -Nru batik-1.7+dfsg/debian/batik.manpages batik-1.7+dfsg/debian/batik.manpages --- batik-1.7+dfsg/debian/batik.manpages 1970-01-01 01:00:00.000000000 +0100 +++ batik-1.7+dfsg/debian/batik.manpages 2013-10-17 17:52:28.000000000 +0200 @@ -0,0 +1,4 @@ +debian/manpages/rasterizer.1 +debian/manpages/svgpp.1 +debian/manpages/squiggle.1 +debian/manpages/ttf2svg.1 diff -Nru batik-1.7+dfsg/debian/changelog batik-1.7+dfsg/debian/changelog --- batik-1.7+dfsg/debian/changelog 2013-10-17 06:59:23.000000000 +0200 +++ batik-1.7+dfsg/debian/changelog 2013-10-17 17:52:28.000000000 +0200 @@ -1,3 +1,16 @@ +batik (1.7+dfsg-5) experimental; urgency=low + + * Team upload. + * Split the package in libbatik-java and batik. + - Rename manifest to libbatik-java.manifest. + - Install man pages with batik.manpages. + - Set Breaks and Replaces relation accordingly. + - debian/rules: Install wrapper scripts to batik package. + - debian/control: Add new binary package batik. + * Drop libbatik-java.dirs. Not needed. + + -- Markus Koschany <a...@gambaru.de> Thu, 17 Oct 2013 17:46:02 +0200 + batik (1.7+dfsg-4) unstable; urgency=low * Team upload. diff -Nru batik-1.7+dfsg/debian/control batik-1.7+dfsg/debian/control --- batik-1.7+dfsg/debian/control 2013-10-17 06:59:23.000000000 +0200 +++ batik-1.7+dfsg/debian/control 2013-10-17 17:52:28.000000000 +0200 @@ -14,7 +14,7 @@ ant, default-jdk, javahelper, - libavalon-framework-java (>= 4.2.0), + libavalon-framework-java, libbsf-java, libcommons-io-java, libcommons-logging-java, @@ -29,18 +29,13 @@ Package: libbatik-java Architecture: all Depends: - java-wrappers (>= 0.1.12), - libavalon-framework-java (>= 4.2.0), + libavalon-framework-java, libbsf-java, libcommons-io-java, libcommons-logging-java, libxalan2-java, libxml-commons-external-java, ${misc:Depends} -Recommends: - fop (>= 1:0.94), - rhino, - default-jre Description: xml.apache.org SVG Library Batik is a toolkit for applications or applets that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such @@ -52,8 +47,34 @@ * A module to convert SVG to various formats, such as raster images (JPEG, PNG or Tiff) and PS, PDF. . + For detailed information, go to http://xml.apache.org/batik/ + +Package: batik +Architecture: all +Depends: + java-wrappers, + libbatik-java (>= ${source:Version}), + ${misc:Depends}, + default-jre | java7-runtime +Recommends: + fop, + rhino +Breaks: libbatik-java (<< 1.7+dfsg-5) +Replaces: libbatik-java (<< 1.7+dfsg-5) +Description: xml.apache.org SVG Library -- wrapper scripts + This package provides the wrapper scripts for rasterizer, squiggle, ttf2svg + and svgpp. + . + Batik is a toolkit for applications or applets that want to use images + in the Scalable Vector Graphics (SVG) format for various purposes, such + as viewing, generation or manipulation. + . + Batik provides several modules to be used in applications: + * A SVG generator module, usable to export graphics into the SVG format. + * A SVG processor and SVG Viewing component for integrating SVG viewing. + * A module to convert SVG to various formats, such as raster images + (JPEG, PNG or Tiff) and PS, PDF. + . fop is necessary for PDF output of rasterizer. . rhino is necessary for using the SVG browser, squiggle. - . - For detailed information, go to http://xml.apache.org/batik/ diff -Nru batik-1.7+dfsg/debian/libbatik-java.dirs batik-1.7+dfsg/debian/libbatik-java.dirs --- batik-1.7+dfsg/debian/libbatik-java.dirs 2010-11-25 01:18:24.000000000 +0100 +++ batik-1.7+dfsg/debian/libbatik-java.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/share/java diff -Nru batik-1.7+dfsg/debian/libbatik-java.manifest batik-1.7+dfsg/debian/libbatik-java.manifest --- batik-1.7+dfsg/debian/libbatik-java.manifest 1970-01-01 01:00:00.000000000 +0100 +++ batik-1.7+dfsg/debian/libbatik-java.manifest 2013-10-17 17:52:28.000000000 +0200 @@ -0,0 +1,89 @@ +usr/share/java/batik-bridge.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik Bridge + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.bridge + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.bridge,org.apache.batik.bridge.svg12 + +usr/share/java/batik-css.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik CSS + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.css + Bundle-Version: 1.7.0 + Require-Bundle: org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",org.w3c.css.sac + Export-Package: org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser + +usr/share/java/batik-svg-dom.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik SVG DOM + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.dom.svg + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.dom.anim,org.apache.batik.dom.svg,org.apache.batik.dom.svg12 + +usr/share/java/batik-dom.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik DOM + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.dom + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl + +usr/share/java/batik-awt-util.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik AWT Util + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.ext.awt + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.font,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.ext.swing + +usr/share/java/batik-parser.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik Parser + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.parser + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.parser + +usr/share/java/batik-svggen.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik SVG Gen + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.svggen + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.svggen,org.apache.batik.svggen.font,org.apache.batik.svggen.font.table + +usr/share/java/batik-transcoder.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik Parser + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.transcoder + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.keys,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.transcoder.wmf,org.apache.batik.transcoder.wmf.tosvg + +usr/share/java/batik-gui-util.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik GUI Util + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.util.gui + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor + +usr/share/java/batik-util.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik Util + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.util + Bundle-Version: 1.7.0 + Require-Bundle: org.apache.batik.util.gui;bundle-version="[1.7.0,1.8.0)" + Export-Package: org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.util.resources + +usr/share/java/batik-xml.jar: + Bundle-ManifestVersion: 2 + Bundle-Name: Batik XML + Bundle-Vendor: Debian.org + Bundle-SymbolicName: org.apache.batik.xml + Bundle-Version: 1.7.0 + Export-Package: org.apache.batik.xml diff -Nru batik-1.7+dfsg/debian/libbatik-java.manpages batik-1.7+dfsg/debian/libbatik-java.manpages --- batik-1.7+dfsg/debian/libbatik-java.manpages 2010-11-25 01:18:24.000000000 +0100 +++ batik-1.7+dfsg/debian/libbatik-java.manpages 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -debian/manpages/rasterizer.1 -debian/manpages/svgpp.1 -debian/manpages/squiggle.1 -debian/manpages/ttf2svg.1 diff -Nru batik-1.7+dfsg/debian/manifest batik-1.7+dfsg/debian/manifest --- batik-1.7+dfsg/debian/manifest 2013-10-06 19:35:59.000000000 +0200 +++ batik-1.7+dfsg/debian/manifest 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -usr/share/java/batik-bridge.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Bridge - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.bridge - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.bridge,org.apache.batik.bridge.svg12 - -usr/share/java/batik-css.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik CSS - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.css - Bundle-Version: 1.7.0 - Require-Bundle: org.apache.batik.util;bundle-version="[1.7.0,1.8.0)",org.w3c.css.sac - Export-Package: org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser - -usr/share/java/batik-svg-dom.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik SVG DOM - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.dom.svg - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.dom.anim,org.apache.batik.dom.svg,org.apache.batik.dom.svg12 - -usr/share/java/batik-dom.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik DOM - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.dom - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl - -usr/share/java/batik-awt-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik AWT Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.ext.awt - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.font,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.ext.swing - -usr/share/java/batik-parser.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Parser - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.parser - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.parser - -usr/share/java/batik-svggen.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik SVG Gen - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.svggen - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.svggen,org.apache.batik.svggen.font,org.apache.batik.svggen.font.table - -usr/share/java/batik-transcoder.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Parser - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.transcoder - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.keys,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.transcoder.wmf,org.apache.batik.transcoder.wmf.tosvg - -usr/share/java/batik-gui-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik GUI Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.util.gui - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor - -usr/share/java/batik-util.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik Util - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.util - Bundle-Version: 1.7.0 - Require-Bundle: org.apache.batik.util.gui;bundle-version="[1.7.0,1.8.0)" - Export-Package: org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.util.resources - -usr/share/java/batik-xml.jar: - Bundle-ManifestVersion: 2 - Bundle-Name: Batik XML - Bundle-Vendor: Debian.org - Bundle-SymbolicName: org.apache.batik.xml - Bundle-Version: 1.7.0 - Export-Package: org.apache.batik.xml diff -Nru batik-1.7+dfsg/debian/rules batik-1.7+dfsg/debian/rules --- batik-1.7+dfsg/debian/rules 2013-10-15 06:56:48.000000000 +0200 +++ batik-1.7+dfsg/debian/rules 2013-10-17 17:52:28.000000000 +0200 @@ -48,9 +48,9 @@ ln -s batik-all-$(UPSTREAM_VERSION).jar debian/libbatik-java/usr/share/java/batik.jar; \ # Install wrapper scripts - install -d debian/libbatik-java/usr/bin + install -d debian/batik/usr/bin for prog in debian/wrappers/* ; do \ - install -t debian/libbatik-java/usr/bin/ $$prog ; \ + install -t debian/batik/usr/bin/ $$prog ; \ done clean::
signature.asc
Description: OpenPGP digital signature