Package: galternatives
Version: 0.13.5+nmu2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
*** /tmp/tmpISoGDu
In Ubuntu, we've applied the attached patch to achieve the following:
* Merge from debian unstable (LP: #605311). Remaining changes:
- Update desktop file to current standards and remove empty TryExec
- galternatives.desktop.in, galternatives.desktop: add Settings in
Categories
to install icon in Settings menu entry
- debian/galternatives.menu: update section to Applications/System/
Administration
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers maverick-updates
APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500,
'maverick')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.35-7-generic (SMP w/1 CPU core)
Locale: LANG=es_ES.utf8, LC_CTYPE=es_ES.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru galternatives-0.13.5+nmu2/debian/changelog galternatives-0.13.5+nmu2ubuntu1/debian/changelog
diff -Nru galternatives-0.13.5+nmu2/debian/galternatives.menu galternatives-0.13.5+nmu2ubuntu1/debian/galternatives.menu
--- galternatives-0.13.5+nmu2/debian/galternatives.menu 2005-08-18 03:11:06.000000000 +0200
+++ galternatives-0.13.5+nmu2ubuntu1/debian/galternatives.menu 2010-07-14 10:51:39.000000000 +0200
@@ -1,6 +1,6 @@
?package(galternatives):\
needs="x11"\
-section="Apps/System"\
+section="Applications/System/Administration"\
title="Alternatives Configurator"\
longtitle="Allows you to choose the default applications to provide some features."\
icon="/usr/share/pixmaps/galternatives.xpm"\
diff -Nru galternatives-0.13.5+nmu2/galternatives.desktop galternatives-0.13.5+nmu2ubuntu1/galternatives.desktop
--- galternatives-0.13.5+nmu2/galternatives.desktop 2010-06-25 20:42:12.000000000 +0200
+++ galternatives-0.13.5+nmu2ubuntu1/galternatives.desktop 2010-07-14 10:51:39.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Name=Alternatives Configurator
Name[cs]=Nastavení alternativ
Name[es]=Configurador de alternativas
@@ -15,9 +14,7 @@
Comment[sv]=Konfigurera systemets standardalternativ
Type=Application
Exec=/usr/sbin/galternatives
-TryExec=
-Icon=/usr/share/pixmaps/galternatives.png
-X-GNOME-DocPath=
+Icon=galternatives
Terminal=false
-Categories=GTK;Application;System;
+Categories=Settings;GTK;System;
StartupNotify=true
diff -Nru galternatives-0.13.5+nmu2/galternatives.desktop.in galternatives-0.13.5+nmu2ubuntu1/galternatives.desktop.in
--- galternatives-0.13.5+nmu2/galternatives.desktop.in 2004-06-15 00:04:11.000000000 +0200
+++ galternatives-0.13.5+nmu2ubuntu1/galternatives.desktop.in 2010-07-14 10:51:39.000000000 +0200
@@ -1,13 +1,10 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
_Name=Alternatives Configurator
_Comment=Configure the system default alternatives
Type=Application
Exec=/usr/sbin/galternatives
-TryExec=
-Icon=/usr/share/pixmaps/galternatives.png
-X-GNOME-DocPath=
+Icon=galternatives
Terminal=false
-Categories=GTK;Application;System;
+Categories=Settings;GTK;System;
StartupNotify=true
