Please merge cln (1.3.1-2) from Debian Testing

[Vikram Dhillon]

Changelogs:

Latest Debian Changelog:
cln (1.3.1-2) unstable; urgency=low

   * debian/copyright: Clarify license (GPL v2).
   * debian/compat: debhelper compatibility version 6.
 -- Richard Kreckel <email address hidden> Sun, 20 Dec 2009 21:39:47 +0100

Latest Ubuntu Changelog:
cln (1.3.1-1ubuntu2) lucid; urgency=low

  * Drop the quilt handling here, it turns out this isn't needed with the
    current upstream version even though the patch applies cleanly.
 -- Steve Langasek < <email address hidden>> Tue, 10 Nov 2009 10:57:40 +0000

Since this is a merge, I'll provide a patch in a minute. The package builds fine in a lucid chroot:

dpkg-deb: building package `libcln6' in `../libcln6_1.3.1-2_i386.deb'.
dpkg-deb: building package `libcln-dev' in `../libcln-dev_1.3.1-2_i386.deb'.
dpkg-deb: building package `pi' in `../pi_1.3.1-2_i386.deb'.
 dpkg-genchanges >../cln_1.3.1-2_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//6695 and its subdirectories

[Daniel Holbach (dholbach)]

Which source package does your patch apply to? It doesn't apply to 1.3.1-1ubuntu2 nor 1.3.1-2 (which are current Ubuntu and Debian).

[Steve Langasek (vorlon)]

Hi Vikram,

cln (1.3.1-2ubuntu1) lucid; urgency=low

  * Merging from Debian, remaining changes:
     - deiban/compat:
        - Upadting the debhelper compatibility version to 6
     - debian/copyright:
        - Updating the GPL license as per the changes in Debian

 -- Vikram Dhillon <email address hidden> Sun, 17 Jan 2010 21:53:41 -0500

"remaining changes" should refer to those changes that are carried over from the previous Ubuntu version of the package. You appear to be using it to describe *new* changes that you've added in this version. Please describe these separately in your changelogs when preparing merges.

Now, as for the particular changes in question here: the only change actually carried over is a diff to debian/rules which only matters if using debian/patches (which we've dropped already), so I don't think it warrants a continued delta from Debian. The new changes you're suggesting here are, likewise, not changes that I believe justify a delta for this package. I've therefore synced cln 1.3.1-2 into Ubuntu, and recommend closing this bug as 'wontfix'.