Please merge gnome-lokkit 0.50.22-7.2 (universe) from Debian unstable (main)

Here we go. I've provided some additional fixes for Lintian errors which I will forward to Debian.

gnome-lokkit (0.50.22-7.2ubuntu1) intrepid; urgency=low

  * Merge from Debian, remaining changes (LP: #233866):
    - gnome-lokkit.desktop:
      + added gksu to Exec field
      + updated Terminal field to be boolean
      + removed icon extension
    - debian/rules:
      + added icon installation for the .desktop file
      + Don't ignore make clean error
    - debian/gnome-lokkit.menu, debian/lokkit.menu:
      + Update section to Applications/System/Security to prevent
      a lintian warning
    - debian/gnome-lokkit.files, Makefile.am:
      + Install .desktop file to the correct location
    - debian/control:
      + Changed build-dep on gettext to not be a Debian revision
  * Modify Maintainer value to match the DebianMaintainerField
    specification.

 -- Iain Lane <email address hidden> Thu, 22 May 2008 00:38:36 +0100

Your debdiff has changes to config.guess, config.sub, Makefile...
You need to update the Maintainer field

FTBFS:

make[1]: Leaving directory `/home/emilio/tmp/gnome-lokkit-0.50.22'
# Install icon for the .desktop file
mkdir -p /home/emilio/tmp/gnome-lokkit-0.50.22/debian/gnome-lokkit/usr/share/pixmaps
install -m 0644 pixmaps/gnome-lokkit-logo.png /home/emilio/tmp/gnome-lokkit-0.50.22/debian/gnome-lokkit/usr/share/pixmaps
dh_movefiles
dh_movefiles: debian/tmp/usr/share/applications not found (supposed to put it in gnome-lokkit)
make: *** [install] Error 1
dpkg-buildpackage: failure: fakeroot debian/rules binary gave error exit status 2

New version filtering out config.{guess,sub} changes and updating maintainer. Makefile.am changes were required.

This bug was fixed in the package gnome-lokkit - 0.50.22-7.2ubuntu1

---------------
gnome-lokkit (0.50.22-7.2ubuntu1) intrepid; urgency=low

  * Merge from Debian, remaining changes (LP: #233866):
    - gnome-lokkit.desktop:
      + added gksu to Exec field
      + updated Terminal field to be boolean
      + removed icon extension
    - debian/rules:
      + added icon installation for the .desktop file
      + Don't ignore make clean error
    - debian/gnome-lokkit.menu, debian/lokkit.menu:
      + Update section to Applications/System/Security to prevent
      a lintian warning
    - debian/gnome-lokkit.files, Makefile.am:
      + Install .desktop file to the correct location
    - debian/control:
      + Changed build-dep on gettext to not be a Debian revision
  * Modify Maintainer value to match the DebianMaintainerField
    specification.
  * Modify Maintainer value to match the DebianMaintainerField
    specification.

 -- Iain Lane <email address hidden> Mon, 26 May 2008 18:05:24 +0100

Uploaded, thanks for the work!

gnome-lokkit (0.50.22-7.2) unstable; urgency=low

  * Non-maintainer upload to solve release goal.
  * Add LSB dependency header to init.d scripts (Closes: #462754)
  * Package now includes init.d script (Closes: #242715)

 -- Petter Reinholdtsen <email address hidden> Mon, 24 Mar 2008 23:49:54 +0100