r39912 - in /desktop/unstable/gnome-menus/debian: changelog gnome-menus-blacklist gnome-menus.postinst

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Wed Oct 16 19:27:43 2013
New Revision: 39912

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39912
Log:
gnome-menus-blacklist: re-apply patch to correctly handle
menu files with missing ending newlines. Closes: #692141.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/gnome-menus-blacklist
    desktop/unstable/gnome-menus/debian/gnome-menus.postinst

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=39912&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog	[utf-8] Wed Oct 16 19:27:43 2013
@@ -11,6 +11,10 @@
     - Fix apps showing in "Other" that already show in other categories. 
   * debian/patches/08_settings-menus.patch:
     + Exclude "Sundry" items so that they aren't duplicated in the menus
+
+  [ Fabian Greffrath ]
+  * gnome-menus-blacklist: re-apply patch to correctly handle
+    menu files with missing ending newlines. Closes: #692141.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 10 Jun 2013 13:38:12 +0200
 

Modified: desktop/unstable/gnome-menus/debian/gnome-menus-blacklist
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus-blacklist?rev=39912&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus-blacklist	[utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus-blacklist	[utf-8] Wed Oct 16 19:27:43 2013
@@ -64,6 +64,8 @@
                 if l.startswith ("NoDisplay="):
                     continue
                 fp_out.write(l)
+        if not l.endswith ("\n"):
+            fp_out.write("\n")
         fp_out.write("NoDisplay=true\n")
 
     # Set mtime so that the file is not touched unless it has changed

Modified: desktop/unstable/gnome-menus/debian/gnome-menus.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.postinst?rev=39912&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.postinst	[utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.postinst	[utf-8] Wed Oct 16 19:27:43 2013
@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 3.6.1-1; then
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 3.8.0-3~; then
     # Clean up old files generated by buggy script
     # See #692141
     rm -f /usr/share/gnome/applications/*.desktop