[Bug 590600] Re: Please merge libcommons-jxpath-java (1.3-3) from Debian unstable

[Thierry Carrez]

This should be a sync and not a merge, as I pushed all the remaining delta to Debian.
If you look at your merge proposal, you'll see that the only delta is the Maintainer: in debian/control.

** Changed in: libcommons-jxpath-java (Ubuntu)
       Status: New => Invalid

-- 
Please merge libcommons-jxpath-java  (1.3-3) from Debian unstable
https://bugs.launchpad.net/bugs/590600
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is a direct subscriber.

Status in “libcommons-jxpath-java” package in Ubuntu: Invalid

Bug description:
Binary package hint: libcommons-jxpath-java

Latest Changelogs:

Debian:
 libcommons-jxpath-java  (1.3-3) unstable; urgency=low

   [ Thierry Carrez ]
   * debian/control: Minimal dependency on -headless runtimes
 
   [ Torsten Werner ]
   * Switch to source format 3.0.
   * Remove Arnaud from uploaders list.
   * Update Standards-Version: 3.8.4.

 -- Torsten Werner <twerner at debian.org>  Mon, 03 May 2010 20:58:18 +0200 

Ubuntu: 
libcommons-jxpath-java (1.3-2ubuntu1) lucid; urgency=low

  * Merge from debian testing, remaining changes:
    - debian/control: Set minimal dependency to -headless runtimes
  * Dropped non-essential Ubuntu changes to reduce delta with Debian:
    - Java2 code compatibility: depend on java1 code is alright
    - Extra debian/README.source
    - Extra library dependencies, extra suggest
    - servlet.jar variable change in ant.properties (unused in the build)

libcommons-jxpath-java (1.3-2) unstable; urgency=low

  * (Build-)Depends on libservlet2.5-java instead of libservlet2.3-java.
  * Removed Suggests of java-virtual-machine.
  * Removed Wolfgang and added myself to Uploaders.

libcommons-jxpath-java (1.3-1) unstable; urgency=low

  [ Emmanuel Bourg ]
  * Update of the URLs
  * Rename Jakarta Commons to Apache Commons
  * debian/copyright: Switch to Apache License 2.0. Closes: #532891.

  [ Niels Thykier ]
  * New upstream release.
  * Added myself to the uploaders.
  * Replaced Build-Depends-Indep with Build-Depends to avoid problems
    with the buildds.
  * Replace "kaffe" with "default java" packages.
  * Added missing ${misc:Depends} to dependencies.
  * Bumped debhelper compat to version 7.
  * Bumped Standards-Version to 3.8.3
    - Updated the encoding of debian/copyright to UTF-8.
    - Added Vcs-fields to debian/control.
    - Added Homepage field in debian/control.
  * Work around upstream forgetting to bump the version number.
    - Updated patch 01_build_xml.patch to also correct the version
    number in docs.
 -- Thierry Carrez <thierry.carrez at ubuntu.com>   Thu, 12 Nov 2009 11:34:21 +0100

The package is rather clean and only requires a small change and a patch is attached, the package also builds fine in a maverick chroot: 

dpkg-deb: building package `libcommons-jxpath-java-doc' in `../libcommons-jxpath-java-doc_1.3-3_all.deb'.
 dpkg-genchanges  >../libcommons-jxpath-java_1.3-3_i386.changes
dpkg-genchanges: not including original source code in upload
dpkg-buildpackage: binary and diff upload (original source NOT included)
I: Copying back the cached apt archive contents
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env 
I: removing directory /var/cache/pbuilder/build//3025 and its subdirectories
I: Current time: Sun Jun  6 23:23:08 EDT 2010
I: pbuilder-time-stamp: 1275880988


The patch applies fine in -p0:
$ patch -p0 < diff.debdiff 
patching file debian/changelog
patching file debian/control