Please merge salliere 0.7.1-1 (universe) from Debian unstable (main)

Debdiff against debian 0.7.1-1

Debdiff against latest in ubuntu: 0.7-1

Looks like a pure bug fix release, which is good considering that we're in Feature Freeze.

A few things:
 - there's no need to bump the Standards-Version over Debian - this has no effect
 - can you depends on salliere (= ${binary:Version}) instead of salliere (= 0.7.1-1)?
 - what exactly are you merging? We didn't actually introduce any changes in the package before. https://wiki.ubuntu.com/UbuntuDevelopment/Merging
 - why do you drop ${java:Depends} from the Depends of gsalliere?

Also the clean target is broken right now:
make[1]: Entering directory `/home/daniel/salliere-0.7'
rm -rf classes bin testbin salliere-0.7
rm -f .classes .bin .testbin *.tar.gz *.jar *.1 *Manifest.txt
rm: cannot remove `salliere-0.7.1': Is a directory
make[1]: *** [clean] Error 1

> A few things:
> - can you depends on salliere (= ${binary:Version}) instead of
> salliere (= 0.7.1-1)?

Of course! I didn't know about that way of doing it.

> - what exactly are you merging? We didn't actually introduce any
> changes in the package before.

Merging is not the right term. My goal was to fix the FTBFS for 0.7-1. Debian already had 0.7.1-1 which fixes the iText lib compatibility issue but also FTBFS (see below).

> - why do you drop ${java:Depends} from the Depends of gsalliere?
>

jh_depends fails on gsalliere, this is due to the fact that gsalliere's jar file's manifest refers to /usr/share/salliere/salliere-0.7.1.jar which has just been built but is not installed at the time jh_depends is called.
As gsalliere doesn't have dependencies other than salliere, I changed the call to jh_depends so it is only effective on salliere making ${java:Depends} not substituted anymore for gsalliere, which explains why I dropped it.

Maybe there's another way to go, what would you suggest? Can I make salliere a specific Build Dep for gsalliere?

> Also the clean target is broken right now:

Didn't notice that, I'll fix it in the next debdiff.

> Maybe there's another way to go, what would you suggest? Can I make
> salliere a specific Build Dep for gsalliere?

No. Please no circular build-depends. This will require archive admins to do manual bootstrapping on the machines.

Let me know when you get a new debdiff uploaded.

This is a debdiff with the above requested changes against debian 0.7.1-1

I was not able to reproduce the clean target breakage you display above, for me it builds and cleans with no error.

Can you please forward the patch to Debian? http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543109 is discussing the build failure.

This bug was fixed in the package salliere - 0.7.1-1ubuntu1

---------------
salliere (0.7.1-1ubuntu1) karmic; urgency=low

  * Fixes FTBFS (LP: #416907)
  * debian/rules:
   - Changed call to jh_depends to only use it on package salliere
  * debian/control:
   - Dropped ${java:Depends} from gsalliere as jh_depends fails
     because of a dependency on salliere which is not installed.

salliere (0.7.1-1) unstable; urgency=low

  * New Upstream release
   - patch to work on itext 2.x (Closes: #521967)

 -- Nicolas Van Wambeke <email address hidden> Thu, 20 Aug 2009 22:41:30 +0200

I'm the DD and upstream for both salliere and javahelper. This is actually a bug in javahelper which I will lbe fixing in the javahelper 0.23 upload which I will be making to unstable today. Please revert your patch to salliere when javahelper migrates to ubuntu.

Thanks,
Matt