Package: menu-xdg
Version: 0.2.2
Severity: normal
Hello Chris,
I have made two NMUs of menu-xdg but I fail to send the patches,
so here is the patch between 0.2.2 and 0.2.
I will probably make a third NMU to add section .desktop file
generation.
Cheers,
--
Bill. <[EMAIL PROTECTED]>
Imagine a large red swirl here.
diff -Nru /tmp/MuSs0nxcxJ/menu-xdg-0.2/debian/changelog
/tmp/AHopUmnqL6/menu-xdg-0.2.2/debian/changelog
--- /tmp/MuSs0nxcxJ/menu-xdg-0.2/debian/changelog 2004-11-04
02:46:42.000000000 +0100
+++ /tmp/AHopUmnqL6/menu-xdg-0.2.2/debian/changelog 2005-12-13
18:34:37.000000000 +0100
@@ -1,3 +1,25 @@
+menu-xdg (0.2.2) unstable; urgency=low
+
+ * NMU
+ * xdg-menu-spec: remove useless prerun definition.
+ * xdg-desktop-entry-spec-apps, xdg-desktop-entry-spec-dirs:
+ - adds removemenu config options.
+ - prerun: remove menus more cleanly. This actually fix #297322.
+
+
+ -- Bill Allombert <[EMAIL PROTECTED]> Tue, 13 Dec 2005 16:04:26 +0100
+
+menu-xdg (0.2.1) unstable; urgency=low
+
+ * NMU
+ * Apply fix from Christopher Martin:
+ + Use 'find | xargs rm 'instead of 'rm *' to remove .desktop files.
+ packages installed. (Closes: #297322)
+ + Set <AppDir> to /var/lib/menu-xdg/applications to avoid duplicate
+ menu entries. (Closes: #328055, #317567, #324545)
+
+ -- Bill Allombert <[EMAIL PROTECTED]> Tue, 18 Oct 2005 19:11:12 +0200
+
menu-xdg (0.2) unstable; urgency=low
* Add section name to apps filename to differentiate entries.
diff -Nru /tmp/MuSs0nxcxJ/menu-xdg-0.2/debian/menu-xdg.menu-method
/tmp/AHopUmnqL6/menu-xdg-0.2.2/debian/menu-xdg.menu-method
--- /tmp/MuSs0nxcxJ/menu-xdg-0.2/debian/menu-xdg.menu-method 2004-11-03
23:55:47.000000000 +0100
+++ /tmp/AHopUmnqL6/menu-xdg-0.2.2/debian/menu-xdg.menu-method 2005-12-13
16:02:17.000000000 +0100
@@ -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()))
@@ -43,8 +43,6 @@
rootsection = "";
-prerun = "rm -rf " prefix() "/" "debian-menu.menu";
-
preoutput = "<!DOCTYPE Menu PUBLIC \"-//freedesktop//DTD Menu 0.8//EN\"\n
\"http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd\";>\n<!--
Automatically generated do not edit -->\n";
rootprefix = "/var/lib/menu-xdg/menus";
diff -Nru /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-desktop-entry-spec-apps
/tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-desktop-entry-spec-apps
--- /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-desktop-entry-spec-apps 2004-11-04
02:31:12.000000000 +0100
+++ /tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-desktop-entry-spec-apps 2005-12-13
17:49:20.000000000 +0100
@@ -38,7 +38,13 @@
rootsection = "";
-prerun = "rm -rf " prefix() "/*";
+prerun = "test -d " prefix() " && ("
+ "find " prefix() " -type f -exec rm {} \\; ;"
+ "find " prefix() " -depth -type d -exec rmdir {} \\;)";
+
+removemenu = "test -d " prefix() " && ("
+ "find " prefix() " -type f -exec rm {} \\; ;"
+ "find " prefix() " -depth -type d -exec rmdir {} \\;)";
preoutput = "";
diff -Nru /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-desktop-entry-spec-dirs
/tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-desktop-entry-spec-dirs
--- /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-desktop-entry-spec-dirs 2004-08-02
16:35:38.000000000 +0200
+++ /tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-desktop-entry-spec-dirs 2005-12-13
17:49:31.000000000 +0100
@@ -42,7 +42,13 @@
rootsection = "";
-prerun = "rm -rf " prefix() "/*";
+prerun = "test -d " prefix() " && ("
+ "find " prefix() " -type f -exec rm {} \\; ;"
+ "find " prefix() " -depth -type d -exec rmdir {} \\;)";
+
+removemenu = "test -d " prefix() " && ("
+ "find " prefix() " -type f -exec rm {} \\; ;"
+ "find " prefix() " -depth -type d -exec rmdir {} \\;)";
preoutput = "";
diff -Nru /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-menu-spec
/tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-menu-spec
--- /tmp/MuSs0nxcxJ/menu-xdg-0.2/xdg-menu-spec 2004-11-03 23:55:47.000000000
+0100
+++ /tmp/AHopUmnqL6/menu-xdg-0.2.2/xdg-menu-spec 2005-12-13
16:02:17.000000000 +0100
@@ -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()))
@@ -43,8 +43,6 @@
rootsection = "";
-prerun = "rm -rf " prefix() "/" "debian-menu.menu";
-
preoutput = "<!DOCTYPE Menu PUBLIC \"-//freedesktop//DTD Menu 0.8//EN\"\n
\"http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd\";>\n<!--
Automatically generated do not edit -->\n";
rootprefix = "/var/lib/menu-xdg/menus";
