Bug#694435: unblock: gnome-menus/3.4.2-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gnome-menus for:
- a bugfix in the blacklist script
- a translation update
- removing support for the Debian menu, which can only cause trouble
with gnome-shell when enabled
gnome-menus (3.4.2-5) unstable; urgency=low
* gnome-menus-blacklist: patch from Fabian Greffrath to handle
correctly menu files with missing ending newlines. Closes: #692141.
* de.po: updated German translation by Holger Wansing.
Closes: #693531.
* Drop Debian menu support entirely. In the case it gets enabled by
mistake by users, it breaks the shell beyond all repair.
Closes: #694356.
Index: debian/patches/05_debian_menu.patch
===================================================================
--- debian/patches/05_debian_menu.patch (révision 36220)
+++ debian/patches/05_debian_menu.patch (copie de travail)
@@ -1,16 +0,0 @@
-Index: gnome-menus-3.4.2/layout/applications.menu
-===================================================================
---- gnome-menus-3.4.2.orig/layout/applications.menu 2012-05-18 22:07:48.359105100 +0200
-+++ gnome-menus-3.4.2/layout/applications.menu 2012-05-18 22:07:49.191105070 +0200
-@@ -156,4 +156,11 @@
- <Merge type="files" />
- </Layout>
-
-+ <!-- The Debian menu -->
-+ <Menu>
-+ <Name>Debian</Name>
-+ <MergeFile>debian-menu.menu</MergeFile>
-+ <Directory>Debian.directory</Directory>
-+ </Menu>
-+
- </Menu> <!-- End Applications -->
Index: debian/patches/series
===================================================================
--- debian/patches/series (révision 36220)
+++ debian/patches/series (copie de travail)
@@ -1,6 +1,5 @@
01_default_prefix.patch
03_kde-legacydirs.patch
-05_debian_menu.patch
08_settings-menus.patch
09_games-menu.patch
10_use-default-python-path.patch
Index: debian/changelog
===================================================================
Index: debian/po-up/de.po
===================================================================
Index: debian/gnome-menus-blacklist
===================================================================
--- debian/gnome-menus-blacklist (révision 36220)
+++ debian/gnome-menus-blacklist (copie de travail)
@@ -62,6 +62,8 @@
if l.startswith ("NoDisplay="):
continue
out.write(l)
+ if not l.endswith ("\n"):
+ out.write("\n")
out.write ("NoDisplay=true\n")
out.close()
unblock gnome-menus/3.4.2-5
Thanks,
--
.''`. Josselin Mouette
: :' :
`. `'
`-
Reply to: