Please merge psi 0.11-2 from Debian unstable

[Maia Everett]

Binary package hint: psi

Now that qca2 has been synced, all dependencies for the first Qt4 release of Psi are met.

All current Ubuntu changes are now obsolete:
* 01_lsb_version.dpatch: fixed upstream.
* libxss-dev build dependency: fixed in Debian.
* dh_iconcache: no longer needed.

debian/changelog entries since current Ubuntu release:

psi (0.11-1) unstable; urgency=low

  * New Upstream Version
  * Upload to unstable

 -- Jan Niehusmann <email address hidden> Sat, 27 Oct 2007 15:44:16 +0200

psi (0.11~rc3-1) experimental; urgency=low

  * New upstream release
  * Updated dependencies (Closes: Bug#443120)

 -- Jan Niehusmann <email address hidden> Sun, 07 Oct 2007 15:36:20 +0200

psi (0.11~rc2-2.1) experimental; urgency=low

  * always build with --enable-debug

 -- Jan Niehusmann <email address hidden> Tue, 14 Aug 2007 19:15:40 +0200

psi (0.11~rc2-2) experimental; urgency=low

  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437834)
  * Updated menu file to new menu policy (Section is now
    Applications/Network/Communication)
  * Applied patch 769:770 from upstream SVN do fix invisible section headings.

 -- Jan Niehusmann <email address hidden> Tue, 14 Aug 2007 16:15:15 +0200

psi (0.11~rc2-1) experimental; urgency=low

  * New upstream release
  * remove dependency on libqt4-debug (Closes: Bug#432620, Bug#412708)

 -- Jan Niehusmann <email address hidden> Wed, 25 Jul 2007 00:11:28 +0200

psi (0.11~beta2-1) experimental; urgency=low

  * New upstream release

 -- Jan Niehusmann <email address hidden> Wed, 9 Aug 2006 18:09:04 +0200

[Cesare Tirabassi (norsetto)]

Thanks for your work.
As discussed in #ubuntu-motu:

Can you propose a patch to the systeminfo.cpp module so that psi will correctly report as being run on ubuntu, not debian? It would be preferable if the patch is using the already existing infrastructure being used upstream (OsInfo struct and relative code), so that we can propose the fix upstream.

Please add a dh_icons call in debian/rules.

Please attach a build log of the build you did with your local copy of the deps binaries.

Please resubscribe u-u-s once ready.

[Maia Everett (linneris)]

Attaching two reference debdiffs (the other one is below). Per IRC discussion, I'll contact the Debian developer about the external vs. bundled QCA issue and the bogus (as of now) build-dependency on libqca2-dev.

Among changes suggested above, this debdiff depends on an external QCA2 in libqca2-dev. It runs configure with --disable-bundled-qca.

[Maia Everett (linneris)]

Disregard the above attachment. That debdiff is broken, this is the correct one.

[Cesare Tirabassi (norsetto)]

OK, lets keep this on hold pending discussion with debian.

In the changelog, this:

* Added dpatch to build-deps and debian/rules

Its a remaining ubuntu change and should be listed as such.

Could you also propose the lsb-release patch upstream? It makes much more sense than what they are doing right now (which is kept anyhow as a backup).

Many thanks for your good work!

[Maia Everett (linneris)]

Here's the second debdiff, with bundled QCA. Listed "Added dpatch to build-deps and debian/rules" as an Ubuntu change.

I can confirm that both versions build on my machine correctly and the lsb-release patch works (and Psi correctly identifies the system as Ubuntu).

[Maia Everett (linneris)]

Here is his reply.

Hi Sikon,

On Thu, Nov 08, 2007 at 10:14:14PM +0600, Sikon wrote:
> We couldn't come to an agreement on whether we should
> use --disable-bundled-qca in debian/rules or remove the (currently bogus)
> build dependency on libqca2-dev. What would be your opinion?

Definitely --disable-bundled-qca, so in case of a security bug in qca,
there is only a single place which needs to be fixed.

In fact, I have a new package fixing this issue ready since sunday, but can't
upload it at the moment, as ftp-master.debian.org is down :-(

> * Merged remaining Ubuntu changes:
> - debian/patches/01_lsb_version.dpatch:
> Check lsb-release before attempting hacky upstream distro-specific
> idenification, so that Psi does not misreport Ubuntu as Debian

This should probably be reported upstream as well, I guess?

> * Added dpatch to build-deps and debian/rules

I don't like dpatch :-)

> - Added dh_icons to debian/rules
> * Bumped debhelper build-dep to >= 5.0.51 (for dh_icons)

Sounds good.

Jan

Attached is a very slightly modified standalone QCA debdiff (listed "Added dpatch to build-deps and debian/rules" as an Ubuntu change).

[Cesare Tirabassi (norsetto)]

Upstream bug report:

http://forum.psi-im.org/thread/4695

[Cesare Tirabassi (norsetto)]

Since we still don't have libqca2 binaries in the archive, I suggest that we wait for the new debian version and we merge that.

[Maia Everett (linneris)]

qca2 has now been built for all architectures, except hppa.

Here's a new debdiff for Debian version -2, which has incorporated the --disable-bundled-qca option into debian/rules. I deleted all debdiffs for -1.

List of changes:

psi (0.11-2ubuntu1) hardy; urgency=low

  * Merged remaining Ubuntu changes (LP: #160894)
    - debian/patches/01_lsb_version.dpatch:
        Check lsb-release before attempting hacky upstream distro-specific
        idenification, so that Psi does not misreport Ubuntu as Debian
    - Added dh_icons to debian/rules
    - Added dpatch to build-deps and debian/rules
  * Bumped debhelper build-dep to >= 5.0.51 (for dh_icons)

[Cesare Tirabassi (norsetto)]

Thanks for the good work, I only had to correct a typo and add the previous ubuntu changelog entries that you have unfortunately forgotten (next time please remember it).
Please also remember to set the status to Confirmed and assign it to nobody, otherwise its likely that no sponsors will look at your bug report.
Last but not least, thanks for sending an email to the Debian developer, please remember that they have a BTS and we can link their bugs here so that we can track progress and changes; next time it would be better to use it too.
If you have not done it yet, you should indeed report these changes back to debian in a bug report. Once you do that, please link it here (you may have to remove the bug which is already linked).

Before I upload, I would like you to test that the patch works. I can build and install, but I have no jabber account myself to test it.
Please re-subscribe u-u-s once you have a confirmation that it is ok.

[Maia Everett (linneris)]

Oops. The patch wasn't applied with the previous debdiff because of a mistake in debian/rules.

This debdiff fixes it, as well as the other issues you mentioned (the typo - I assume it was "idenified" - and the missing Ubuntu changelog entries).

Now the patch is applied during build and works. I built and ran Psi, and it identifies Ubuntu correctly.

[Maia Everett (linneris)]

Bug #448363 (--disable-bundled-qca) fixed in 0.11-2; assigning to LSB version

[Cesare Tirabassi (norsetto)]

Uploaded but please coordinate a common solution with debian and upstream!

[Maia Everett (linneris)]

psi (0.11-2ubuntu1) hardy; urgency=low

  * Merged remaining Ubuntu changes (LP: #160894)
    - debian/patches/01_lsb_version.dpatch:
        Check lsb-release before attempting hacky upstream distro-specific
        identification, so that Psi does not misreport Ubuntu as Debian
    - Added dh_icons to debian/rules
    - Added dpatch to build-deps and debian/rules
  * Bumped debhelper build-dep to >= 5.0.51 (for dh_icons)

psi (0.11-2) unstable; urgency=low

  * Call configure with option --disable-bundled-qca (Closes: Bug#448363)
  * Remove old NEWS.Debian

psi (0.11-1) unstable; urgency=low

  * New Upstream Version
  * Upload to unstable

psi (0.11~rc3-1) experimental; urgency=low

  * New upstream release
  * Updated dependencies (Closes: Bug#443120)

psi (0.11~rc2-2.1) experimental; urgency=low

  * always build with --enable-debug

psi (0.11~rc2-2) experimental; urgency=low

  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437834)
  * Updated menu file to new menu policy (Section is now
    Applications/Network/Communication)
  * Applied patch 769:770 from upstream SVN do fix invisible section headings.

psi (0.11~rc2-1) experimental; urgency=low

  * New upstream release
  * remove dependency on libqt4-debug (Closes: Bug#432620, Bug#412708)

psi (0.11~beta2-1) experimental; urgency=low

  * New upstream release

 -- Matvey Kozhev <email address hidden> Tue, 13 Nov 2007 10:00:51 +0600