Package: gnome-lokkit
Version: 0.50.22-7.2
Severity: minor
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch
Hi,
In the ubuntu version of gnome-lokkit, we have fixed a number of Lintian
warnings that are currently being reported against the package.
This is the Ubuntu changelog:
* 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.
We thought you might be interested in doing the same.
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500,
'hardy-backports'), (500, 'hardy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-16-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u gnome-lokkit-0.50.22/gnome-lokkit.desktop
gnome-lokkit-0.50.22/gnome-lokkit.desktop
--- gnome-lokkit-0.50.22/gnome-lokkit.desktop
+++ gnome-lokkit-0.50.22/gnome-lokkit.desktop
@@ -27,5 +27,5 @@
Comment[uk]=ðÒÏÓÔÉÊ ËÏÎƦÇÕÒÁÔÏÒ ÂÒÁÎÄÍÁÕÅÒÁ
-Exec=gnome-lokkit
-Icon=gnome-lokkit/gnome-lokkit-logo.png
-Terminal=0
+Exec=gksu gnome-lokkit
+Icon=gnome-lokkit-logo
+Terminal=false
Type=Application
diff -u gnome-lokkit-0.50.22/Makefile.am gnome-lokkit-0.50.22/Makefile.am
--- gnome-lokkit-0.50.22/Makefile.am
+++ gnome-lokkit-0.50.22/Makefile.am
@@ -8,7 +8,7 @@
gnome-lokkit.console \
autogen.sh
-Applicationsdir = $(datadir)/gnome/apps/System
+Applicationsdir = $(datadir)/applications
Applications_DATA = gnome-lokkit.desktop
sysconfigdir = $(sysconfdir)/X11/sysconfig
diff -u gnome-lokkit-0.50.22/debian/control gnome-lokkit-0.50.22/debian/control
--- gnome-lokkit-0.50.22/debian/control
+++ gnome-lokkit-0.50.22/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Chris Lawrence <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4), libnewt-dev (>> 0.52), libpopt-dev,
libgnome-dev, automake1.4, docbook-utils, libtool, gettext (>= 0.11.5-1), cvs
+Build-Depends: debhelper (>> 4), libnewt-dev (>> 0.52), libpopt-dev,
libgnome-dev, automake1.4, docbook-utils, libtool, gettext (>= 0.11.5), cvs
Standards-Version: 3.6.2
Package: lokkit
diff -u gnome-lokkit-0.50.22/debian/gnome-lokkit.menu
gnome-lokkit-0.50.22/debian/gnome-lokkit.menu
--- gnome-lokkit-0.50.22/debian/gnome-lokkit.menu
+++ gnome-lokkit-0.50.22/debian/gnome-lokkit.menu
@@ -1,3 +1,3 @@
-?package(gnome-lokkit):needs="X11" section="Apps/System"\
+?package(gnome-lokkit):needs="X11" section="Applications/System/Security"\
hints="Firewall,Gnome" title="gnome-lokkit" command="/usr/sbin/gnome-lokkit"\
icon="/usr/share/pixmaps/gnome-lokkit/gnome-lokkit-logo.xpm"
diff -u gnome-lokkit-0.50.22/debian/lokkit.menu
gnome-lokkit-0.50.22/debian/lokkit.menu
--- gnome-lokkit-0.50.22/debian/lokkit.menu
+++ gnome-lokkit-0.50.22/debian/lokkit.menu
@@ -1,2 +1,2 @@
-?package(lokkit):needs="text" section="Apps/System" hints="Firewall"\
+?package(lokkit):needs="text" section="Applications/System/Security"
hints="Firewall"\
title="lokkit" command="/usr/sbin/lokkit"
diff -u gnome-lokkit-0.50.22/debian/rules gnome-lokkit-0.50.22/debian/rules
--- gnome-lokkit-0.50.22/debian/rules
+++ gnome-lokkit-0.50.22/debian/rules
@@ -55,7 +55,7 @@
rm -f build-stamp configure-stamp build-arch-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) maintainer-clean
+ [ ! -f Makefile ] || $(MAKE) maintainer-clean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -76,6 +76,10 @@
# Add here commands to install the package into debian/tmp.
$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
FWSCRIPT='\"/etc/default/lokkit\"' CFLAGS="$(CFLAGS) -DDEBIAN"
+
+ # Install icon for the .desktop file
+ mkdir -p $(CURDIR)/debian/gnome-lokkit/usr/share/pixmaps
+ install -m 0644 pixmaps/gnome-lokkit-logo.png
$(CURDIR)/debian/gnome-lokkit/usr/share/pixmaps
dh_movefiles
diff -u gnome-lokkit-0.50.22/debian/gnome-lokkit.files
gnome-lokkit-0.50.22/debian/gnome-lokkit.files
--- gnome-lokkit-0.50.22/debian/gnome-lokkit.files
+++ gnome-lokkit-0.50.22/debian/gnome-lokkit.files
@@ -3 +3 @@
-usr/share/gnome/apps
+usr/share/applications
diff -u gnome-lokkit-0.50.22/debian/changelog
gnome-lokkit-0.50.22/debian/changelog
