Bug#566901: Bug#725461: batik: FTBFS: Unable to find a javac compiler

[Markus Koschany]

Hi Vincent,

On 17.10.2013 19:12, Vincent Fourmond wrote:
[...]
>   Good job for checking all that !

You're welcome.

> 
>> 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.
> 
>   That's definitely the way to go. I can review/sponsor this upload
> this week-end if you wish.

Alright, thank you! I forgot to close #566901 in debian/changelog.
Updated debdiff is attached.

Cheers,

Markus




diff -Nru batik-1.7+dfsg/debian/batik.manpages 
batik-1.7+dfsg/debian/batik.manpages
--- batik-1.7+dfsg/debian/batik.manpages1970-01-01 01:00:00.0 
+0100
+++ batik-1.7+dfsg/debian/batik.manpages2013-10-17 21:43:10.0 
+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.0 +0200
+++ batik-1.7+dfsg/debian/changelog 2013-10-17 21:45:09.0 +0200
@@ -1,3 +1,16 @@
+batik (1.7+dfsg-5) experimental; urgency=low
+
+  * Team upload.
+  * Split the package in libbatik-java and batik. (Closes: #566901)
+- 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   Thu, 17 Oct 2013 17:46:02 +0200
+
 batik (1.7+dfsg-4) unstable; urgency=low
 
   * Team upload.
@@ -13,7 +26,7 @@
   * Bump compat level to 9 and require debhelper >= 9.
   * Use canonical VCS-URI.
   * Remove Michael Koch from Uploaders. (Closes: #653996)
-  * libatik-java: Drop all jre/jdk dependencies. Recommend default-jre instead.
+  * libbatik-java: Drop all jre/jdk dependencies. Recommend default-jre 
instead.
   * Run wrap-and-sort -sa
   * Add DEP-3 header to all patches.
 
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.0 +0200
+++ batik-1.7+dfsg/debian/control   2013-10-17 21:43:10.0 +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.dirs2010-11-25 01:18:24.0 
+0100
+++ batik-1.7+dfsg/debian/libbatik-java.dirs1970-01-01 01:00:00.0 
+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.manifest1970-01-01 

Bug#566901: Bug#725461: batik: FTBFS: Unable to find a javac compiler

[Vincent Fourmond]

  Hi Markus,

On Thu, Oct 17, 2013 at 6:15 PM, Markus Koschany  wrote:
> 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

  Good job for checking all that !

> 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.

  That's definitely the way to go. I can review/sponsor this upload
this week-end if you wish.

  Cheers,

  Vincent

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.