Package: menu-xdg Version: 0.2 Tags: patch Hello,
Attached is a patch which fixes a few bugs in menu-xdg. Hopefully you'll be able to incorporate it into an upload soon, ideally in time for Sarge. I've included a changelog entry as if I were performing an NMU, to describe for you the changes I've made and why. More information on the Ubuntu fix can be found at https://bugzilla.ubuntu.com/show_bug.cgi?id=8539. For the record, the duplicate entry problem it fixes, though ostensibly for GNOME, has popped up from time to time on the KDE lists as well (and I can reproduce it here). If you prefer simply to have me NMU, let me know (and ideally check the changes for correctness) and I can do that instead. Cheers, Christopher Martin
--- menu-xdg-0.2/debian/changelog +++ menu-xdg-0.2.1/debian/changelog @@ -1,3 +1,13 @@ +menu-xdg (0.2.1) unstable; urgency=low + + * NMU + * Apply Ubuntu fix that prevents duplicate Debian menu entries. + * Add Replaces for old versions of kdelibs-bin. (Closes: #245677) + * Work around the problem where update-menus would fail on systems with many + packages installed. (Closes: #297322) + + -- Christopher Martin <[EMAIL PROTECTED]> Thu, 21 Apr 2005 14:56:15 -0400 + menu-xdg (0.2) unstable; urgency=low * Add section name to apps filename to differentiate entries. --- menu-xdg-0.2/debian/control +++ menu-xdg-0.2.1/debian/control @@ -10,6 +10,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: menu Conflicts: menu (<< 2.1.14) +Replaces: kdelibs-bin (<= 4:3.2.2-1) Description: freedesktop.org menu compliant window manager scripts menu-xdg contains menu-methods to convert the Debian menu structure to the freedesktop.org xdg menu structure. --- menu-xdg-0.2/debian/menu-xdg.menu-method +++ menu-xdg-0.2.1/debian/menu-xdg.menu-method @@ -13,7 +13,7 @@ function Dirs() = ifempty($section,ifroot( - "<AppDir>/var/lib/menu-xdg/applications/menu-xdg</AppDir>\n" + "<AppDir>/var/lib/menu-xdg/applications</AppDir>\n" "<DirectoryDir>/var/lib/menu-xdg/desktop-directories/menu-xdg</DirectoryDir>\n", "<DirectoryDir>" parent(parent(prefix())) --- menu-xdg-0.2/xdg-desktop-entry-spec-apps +++ menu-xdg-0.2.1/xdg-desktop-entry-spec-apps @@ -38,7 +38,7 @@ rootsection = ""; -prerun = "rm -rf " prefix() "/*"; +prerun = "find " prefix() "/* | xargs rm -rf"; preoutput = ""; --- menu-xdg-0.2/xdg-desktop-entry-spec-dirs +++ menu-xdg-0.2.1/xdg-desktop-entry-spec-dirs @@ -42,7 +42,7 @@ rootsection = ""; -prerun = "rm -rf " prefix() "/*"; +prerun = "find " prefix() "/* | xargs rm -rf"; preoutput = ""; --- menu-xdg-0.2/xdg-menu-spec +++ menu-xdg-0.2.1/xdg-menu-spec @@ -13,7 +13,7 @@ function Dirs() = ifempty($section,ifroot( - "<AppDir>/var/lib/menu-xdg/applications/menu-xdg</AppDir>\n" + "<AppDir>/var/lib/menu-xdg/applications</AppDir>\n" "<DirectoryDir>/var/lib/menu-xdg/desktop-directories/menu-xdg</DirectoryDir>\n", "<DirectoryDir>" parent(parent(prefix()))