Please merge gnome-keyring-manager (main) from Debian unstable

[Mb]

Binary package hint: gnome-keyring-manager

Merge gnome-keyring-manager 2.20.0-1 from Debian unstable.
Ubuntu component: main
Debian component: main

List of Ubuntu changes to keep:
    - debian/patches/01_lpi.patch:
      - added Launchpad integration (LP: #109954)
    - debian/patches/02_autoconf.patch:
      - lpi configure update
    - debian/control.in:
      - added liblaunchpad-integration-dev to Build-Depends field
    - debian/patches/00-fix-manpage.patch:
      - Added to fix special character (and lintian warning)
    - debian/control.in:
      - Added Maintainer to Desktop Team

List of Ubuntu changes dropped:
  * debian/compat:
    - Updated to 5
last version seems to fix this

Debian changelog (since gnome-keyring-manager 2.20.0-0ubuntu2):
gnome-keyring-manager (2.20.0-1) unstable; urgency=low

  * New upstream release.
  * debian/compat,
    debian/control.in:
    + Update to debhelper compat level 5.
  * debian/control.in:
    + Recommend gnome-icon-theme to get the stock-keyring icon required
      by the desktop file (Closes: #431358).

 -- Sebastian Dröge <email address hidden> Sun, 30 Sep 2007 16:45:20 +0200

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

gnome-keyring-manager (2.20.0-1ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #159917) remaining changes:
    - debian/patches/01_lpi.patch:
      - added Launchpad integration
    - debian/patches/02_autoconf.patch:
      - lpi configure update
    - debian/control.in:
      - added liblaunchpad-integration-dev to Build-Depends field
    - debian/patches/00-fix-manpage.patch:
      - Added to fix special character (and lintian warning)
    - debian/control.in:
      - Added Maintainer to Desktop Team

 -- Mario Bonino <email address hidden> Sun, 04 Nov 2007 10:06:08 +0100

[Sebastien Bacher (seb128)]

Thank you for your work. The desktop team uses https://wiki.ubuntu.com/DesktopTeam/TODO to claim work so there is no conflict, could you update the wiki next time you do a desktop merge. The changes look good, I've removed the previous Ubuntu changelog entries since the new one summarize the change and is enough and uploaded the update. Also no need to subscribe the sponsor team for desktop packages if you use the wiki to claim updates

[Mb (mb-deactivatedaccount-deactivatedaccount-deactivatedaccount)]

I'm sorry for that mistake Sebastien, I will use the wiki next time. Thank you!