Merge lp:~kelemeng/gnome-menus/bug943387 into lp:ubuntu/precise/gnome-menus

[Gabor Kelemen]

[Ken VanDine (ken-vandine)]

Merged into lp:~ubuntu-desktop/gnome-menus/ubuntu and uploaded, thanks!

review: Approve

=== added file 'debian/patches/70_ubuntu-directories.patch'
--- debian/patches/70_ubuntu-directories.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/70_ubuntu-directories.patch	2012-02-29 16:45:21 +0000
@@ -0,0 +1,24 @@
+Index: gnome-menus/po/POTFILES.in
+===================================================================
+--- gnome-menus.orig/po/POTFILES.in	2012-02-29 16:07:05.876553000 +0100
++++ gnome-menus/po/POTFILES.in	2012-02-29 16:07:30.582693062 +0100
+@@ -20,3 +20,19 @@
+ simple-editor/GMenuSimpleEditor/main.py
+ simple-editor/GMenuSimpleEditor/maindialog.py
+ simple-editor/GMenuSimpleEditor/menufilewriter.py
++debian/desktop-files/ActionGames.directory.in
++debian/desktop-files/AdventureGames.directory.in
++debian/desktop-files/ArcadeGames.directory.in
++debian/desktop-files/BlocksGames.directory.in
++debian/desktop-files/BoardGames.directory.in
++debian/desktop-files/CardGames.directory.in
++debian/desktop-files/Debian.directory.in
++debian/desktop-files/GnomeScience.directory.in
++debian/desktop-files/KidsGames.directory.in
++debian/desktop-files/LogicGames.directory.in
++debian/desktop-files/RolePlayingGames.directory.in
++debian/desktop-files/Settings-System.directory.in
++debian/desktop-files/Settings.directory.in
++debian/desktop-files/SimulationGames.directory.in
++debian/desktop-files/SportsGames.directory.in
++debian/desktop-files/StrategyGames.directory.in
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-02-06 15:35:07 +0000
+++ debian/patches/series	2012-02-29 16:45:21 +0000
@@ -9,3 +9,4 @@
 11_science-menu.patch
 21_default-python-in-shebang.patch
 22_directory-suffix-for-icons.patch
+70_ubuntu-directories.patch