Merge Keppassx from 0.4.3-1ubuntu3 to 0.4.3-2 (universe)

[Alessandro Losavio]

Please merge Keppassx from 0.4.3-1ubuntu3 to 0.4.3-2 (universe)

keepassx (0.4.3-2) unstable; urgency=low

  * Fix FTBFS with gcc 4.7. (Closes: #667224)
    - Add fix_ftbfs_gcc47.diff
  * Bump Standards-Version to 3.9.3, no changes needed.
  * Enable parallel building.
  * Switch to debhelper compat level v9.
    - Exports build flags.
  * Use the qmake_qt4 dh buildsystem.
  * Install application icon in various resolutions.
    - Add debian/keepassx.svg
    - Build-depend on imagemagick and librsvg2-bin.

 -- Felix Geyer <email address hidden> Thu, 05 Apr 2012 13:10:22 +0200

[Alessandro Losavio (alo21)]

This is the debdiff between keepassx 0.4.3-2 and keepassx 0.4.3-2ubuntu1

[Alessandro Losavio (alo21)]

This is the debdiff between keepassx 0.4.3-1ubuntu3 and keepassx 0.4.3-2ubuntu1

[Bhavani Shankar (bhavi)]

Looking into this

Regards
Bhavani

[Bhavani Shankar (bhavi)]

Thanks for the submission, Just took a look at your diff

A few points:

You seem to have a changelog entry missing:

Disable the tray icon when running on Unity. (LP: #842224)

and when debian/keepassx.svg is merged in debian, Your debian-ubuntu diff still shows a reference to it. (You might want to recheck on the same again)

Regards,
Bhavani

[Alessandro Losavio (alo21)]

I think that the entry 'Disable the tray icon when running on Unity. (LP: #842224)' is not directly reported to keepassx, but to sni-qt, in fact I didn't see any sni-qt.conf file in debian folder despite this patch (https://launchpadlibrarian.net/109461817/keepassx-842224-needs-activate.patch). Have I to leave the entry in the changelog?

You see a reference to debian/keepassx.svg, because I had two keepassx.svg (keepassx.svg.UBUNTU and keepassx.svg.DEBIAN). Have to delete this reference in the debdiff?

[Alessandro Losavio (alo21)]

this is the new debdiff with the bhavi's review

[Bhavani Shankar (bhavi)]

Hi Alessandro,

Thanks for the patch, when I run debuild on the same I get:

bhavani@bhavani-spagetti-monster:~/sponsoring/keepassx-0.4.3$ debuild -S -sa -k2E303A1E
 dpkg-buildpackage -rfakeroot -d -us -uc -S -sa
dpkg-buildpackage: source package keepassx
dpkg-buildpackage: source version 0.4.3-2ubuntu1
dpkg-buildpackage: source changed by Alessandro Losavio <email address hidden>
 dpkg-source --before-build keepassx-0.4.3
 fakeroot debian/rules clean
dh clean --parallel --buildsystem=qmake_qt4
   dh_testdir -O--parallel -O--buildsystem=qmake_qt4
   debian/rules override_dh_auto_clean
make[1]: Entering directory `/home/bhavani/sponsoring/keepassx-0.4.3'
dh_auto_clean
rm -rf bin build
make[1]: Leaving directory `/home/bhavani/sponsoring/keepassx-0.4.3'
   dh_clean -O--parallel -O--buildsystem=qmake_qt4
 dpkg-source -b keepassx-0.4.3
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building keepassx using existing ./keepassx_0.4.3.orig.tar.gz
dpkg-source: info: local changes detected, the modified files are:
 keepassx-0.4.3/src/KpxConfig.h
 keepassx-0.4.3/src/dialogs/SettingsDlg.cpp
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/keepassx_0.4.3-2ubuntu1.diff.6HjkYH
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -b keepassx-0.4.3 gave error exit status 2
debuild: fatal error at line 1357:
dpkg-buildpackage -rfakeroot -d -us -uc -S -sa failed

Can you please check whether the patches apply cleanly as dpkg-source detects byhand changes or please correct me if I'm missing something here.

Regards
Bhavani

[Daniel Holbach (dholbach)]

Running "quilt pop -a" resolved this.

[Launchpad Janitor (janitor)]

This bug was fixed in the package keepassx - 0.4.3-2ubuntu1

---------------
keepassx (0.4.3-2ubuntu1) raring; urgency=low

  * Merge from Debian unstable. (LP: #1094568) Remaining changes:
    - Add check_systray_available.diff
    - Disable the tray icon when running on Unity. (LP: #842224)

keepassx (0.4.3-2) unstable; urgency=low

  * Fix FTBFS with gcc 4.7. (Closes: #667224)
    - Add fix_ftbfs_gcc47.diff
  * Bump Standards-Version to 3.9.3, no changes needed.
  * Enable parallel building.
  * Switch to debhelper compat level v9.
    - Exports build flags.
  * Use the qmake_qt4 dh buildsystem.
  * Install application icon in various resolutions.
    - Add debian/keepassx.svg
    - Build-depend on imagemagick and librsvg2-bin.
 -- Alessandro Losavio <email address hidden> Sun, 30 Dec 2012 09:39:20 +0000