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

Proposed by Gabor Kelemen
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~kelemeng/gnome-menus/bug943387
Merge into: lp:ubuntu/precise/gnome-menus
Diff against target: 37 lines (+25/-0)
2 files modified
debian/patches/70_ubuntu-directories.patch (+24/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/gnome-menus/bug943387
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Ubuntu branches Pending
Review via email: mp+95208@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/70_ubuntu-directories.patch'
2--- debian/patches/70_ubuntu-directories.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/70_ubuntu-directories.patch 2012-02-29 16:45:21 +0000
4@@ -0,0 +1,24 @@
5+Index: gnome-menus/po/POTFILES.in
6+===================================================================
7+--- gnome-menus.orig/po/POTFILES.in 2012-02-29 16:07:05.876553000 +0100
8++++ gnome-menus/po/POTFILES.in 2012-02-29 16:07:30.582693062 +0100
9+@@ -20,3 +20,19 @@
10+ simple-editor/GMenuSimpleEditor/main.py
11+ simple-editor/GMenuSimpleEditor/maindialog.py
12+ simple-editor/GMenuSimpleEditor/menufilewriter.py
13++debian/desktop-files/ActionGames.directory.in
14++debian/desktop-files/AdventureGames.directory.in
15++debian/desktop-files/ArcadeGames.directory.in
16++debian/desktop-files/BlocksGames.directory.in
17++debian/desktop-files/BoardGames.directory.in
18++debian/desktop-files/CardGames.directory.in
19++debian/desktop-files/Debian.directory.in
20++debian/desktop-files/GnomeScience.directory.in
21++debian/desktop-files/KidsGames.directory.in
22++debian/desktop-files/LogicGames.directory.in
23++debian/desktop-files/RolePlayingGames.directory.in
24++debian/desktop-files/Settings-System.directory.in
25++debian/desktop-files/Settings.directory.in
26++debian/desktop-files/SimulationGames.directory.in
27++debian/desktop-files/SportsGames.directory.in
28++debian/desktop-files/StrategyGames.directory.in
29
30=== modified file 'debian/patches/series'
31--- debian/patches/series 2012-02-06 15:35:07 +0000
32+++ debian/patches/series 2012-02-29 16:45:21 +0000
33@@ -9,3 +9,4 @@
34 11_science-menu.patch
35 21_default-python-in-shebang.patch
36 22_directory-suffix-for-icons.patch
37+70_ubuntu-directories.patch

Subscribers

People subscribed via source and target branches

to all changes: