r11993 - in /desktop/unstable/gnome-menus/debian: ./ desktop-files/ patches/ po-up/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Jul 17 20:21:50 UTC 2007
Author: joss
Date: Tue Jul 17 20:21:50 2007
New Revision: 11993
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11993
Log:
* Debian.directory: don't display the Debian menu by default. It can
* Convert patches to quilt; build-depend on quilt.
* Remove pycompat and the dh_python call.
* Make the included menu translatable; build-depend on intltool.
* 09_games-menu.patch: split the games menu in submenus following the
desktop specification keywords. Use a default layout that doesn't
show them unless there are at least 8 games in the submenu. This
should avoid showing submenus by default while making the menu
usable for people with lots of games installed.
* The desktop-files/ directory contains desktop entries for these
submenus.
* The po-up/ directory contains translations for these entries.
Added:
desktop/unstable/gnome-menus/debian/desktop-files/
desktop/unstable/gnome-menus/debian/desktop-files/ActionGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/AdventureGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/ArcadeGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/BlocksGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/BoardGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/CardGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/Debian.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/KidsGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/LogicGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/RolePlayingGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/SimulationGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/SportsGames.directory.in
desktop/unstable/gnome-menus/debian/desktop-files/StrategyGames.directory.in
desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch
desktop/unstable/gnome-menus/debian/patches/series
desktop/unstable/gnome-menus/debian/po-up/
desktop/unstable/gnome-menus/debian/po-up/debian.pot
desktop/unstable/gnome-menus/debian/po-up/fr.po
Removed:
desktop/unstable/gnome-menus/debian/Debian.directory
desktop/unstable/gnome-menus/debian/pycompat
Modified:
desktop/unstable/gnome-menus/debian/changelog
desktop/unstable/gnome-menus/debian/control
desktop/unstable/gnome-menus/debian/control.in
desktop/unstable/gnome-menus/debian/gnome-menus.install
desktop/unstable/gnome-menus/debian/patches/01_preferences-legacydir.patch
desktop/unstable/gnome-menus/debian/patches/02_applications-legacydir.patch
desktop/unstable/gnome-menus/debian/patches/03_kde-legacydirs.patch
desktop/unstable/gnome-menus/debian/patches/04_settings-legacydir.patch
desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch
desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch
desktop/unstable/gnome-menus/debian/patches/08_menus_prefix.patch
desktop/unstable/gnome-menus/debian/patches/10_use-default-python-path.patch
desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch
desktop/unstable/gnome-menus/debian/rules
Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog (original)
+++ desktop/unstable/gnome-menus/debian/changelog Tue Jul 17 20:21:50 2007
@@ -1,9 +1,20 @@
gnome-menus (2.18.3-2) UNRELEASED; urgency=low
- * Debian.directory: don't display the Debian menu by default. It can
+ * Debian.directory: don't display the Debian menu by default. It can
be enabled with the menu editor.
-
- -- Josselin Mouette <joss at debian.org> Mon, 16 Jul 2007 19:54:58 +0200
+ * Convert patches to quilt; build-depend on quilt.
+ * Remove pycompat and the dh_python call.
+ * Make the included menu translatable; build-depend on intltool.
+ * 09_games-menu.patch: split the games menu in submenus following the
+ desktop specification keywords. Use a default layout that doesn't
+ show them unless there are at least 8 games in the submenu. This
+ should avoid showing submenus by default while making the menu
+ usable for people with lots of games installed.
+ * The desktop-files/ directory contains desktop entries for these
+ submenus.
+ * The po-up/ directory contains translations for these entries.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 17 Jul 2007 22:03:38 +0200
gnome-menus (2.18.3-1) unstable; urgency=low
Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control (original)
+++ desktop/unstable/gnome-menus/debian/control Tue Jul 17 20:21:50 2007
@@ -11,7 +11,9 @@
gnome-pkg-tools,
libgnomevfs2-dev (>= 2.14),
dpkg-dev (>= 1.13.19),
- python-central (>= 0.5)
+ python-central (>= 0.5),
+ quilt,
+ intltool
Standards-Version: 3.7.2
XS-Python-Version: >= 2.3
Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in (original)
+++ desktop/unstable/gnome-menus/debian/control.in Tue Jul 17 20:21:50 2007
@@ -11,7 +11,9 @@
gnome-pkg-tools,
libgnomevfs2-dev (>= 2.14),
dpkg-dev (>= 1.13.19),
- python-central (>= 0.5)
+ python-central (>= 0.5),
+ quilt,
+ intltool
Standards-Version: 3.7.2
XS-Python-Version: >= 2.3
Added: desktop/unstable/gnome-menus/debian/desktop-files/ActionGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/ActionGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/ActionGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/ActionGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Action
+_Comment=Action games
+Icon=weather-storm
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/AdventureGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/AdventureGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/AdventureGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/AdventureGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,5 @@
+[Desktop Entry]
+_Name=Adventure
+_Comment=Adventure style games
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/ArcadeGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/ArcadeGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/ArcadeGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/ArcadeGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Arcade
+_Comment=Arcade style games
+Icon=gnome-joystick
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/BlocksGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/BlocksGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/BlocksGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/BlocksGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Falling blocks
+_Comment=Falling blocks games
+Icon=gnome-gnometris
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/BoardGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/BoardGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/BoardGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/BoardGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Board
+_Comment=Board games
+Icon=desktop
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/CardGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/CardGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/CardGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/CardGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Cards
+_Comment=Card games
+Icon=gnome-aisleriot
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/Debian.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/Debian.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/Debian.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/Debian.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,7 @@
+[Desktop Entry]
+_Name=Debian
+_Comment=The Debian menu
+Icon=debian-logo
+Type=Directory
+Encoding=UTF-8
+NoDisplay=true
Added: desktop/unstable/gnome-menus/debian/desktop-files/KidsGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/KidsGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/KidsGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/KidsGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Kids
+_Comment=Games for kids
+Icon=gnome-amusements
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/LogicGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/LogicGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/LogicGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/LogicGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Logic
+_Comment=Logic and puzzle games
+Icon=system-run
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/RolePlayingGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/RolePlayingGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/RolePlayingGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/RolePlayingGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Role playing
+_Comment=Role playing games
+Icon=stock_person
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/SimulationGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/SimulationGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/SimulationGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/SimulationGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,5 @@
+[Desktop Entry]
+_Name=Simulation
+_Comment=Simulation games
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/SportsGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/SportsGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/SportsGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/SportsGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,6 @@
+[Desktop Entry]
+_Name=Sports
+_Comment=Sports games
+Icon=stock_scores
+Type=Directory
+Encoding=UTF-8
Added: desktop/unstable/gnome-menus/debian/desktop-files/StrategyGames.directory.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/desktop-files/StrategyGames.directory.in?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/desktop-files/StrategyGames.directory.in (added)
+++ desktop/unstable/gnome-menus/debian/desktop-files/StrategyGames.directory.in Tue Jul 17 20:21:50 2007
@@ -1,0 +1,5 @@
+[Desktop Entry]
+_Name=Strategy
+_Comment=Strategy games
+Type=Directory
+Encoding=UTF-8
Modified: desktop/unstable/gnome-menus/debian/gnome-menus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/gnome-menus.install?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/gnome-menus.install (original)
+++ desktop/unstable/gnome-menus/debian/gnome-menus.install Tue Jul 17 20:21:50 2007
@@ -2,4 +2,4 @@
debian/tmp/usr/bin
debian/tmp/usr/share
layout/settings.menu /etc/xdg/menus
-debian/Debian.directory /usr/share/desktop-directories
+debian/desktop-files/*.directory /usr/share/desktop-directories
Modified: desktop/unstable/gnome-menus/debian/patches/01_preferences-legacydir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/01_preferences-legacydir.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/01_preferences-legacydir.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/01_preferences-legacydir.patch Tue Jul 17 20:21:50 2007
@@ -1,5 +1,7 @@
---- layout/preferences.menu 2004-11-09 16:06:30.000000000 +0100
-+++ layout/preferences.menu.new 2004-12-07 14:21:31.075510264 +0100
+Index: gnome-menus-2.18.3/layout/preferences.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/preferences.menu 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/layout/preferences.menu 2007-07-17 18:45:03.832470983 +0200
@@ -9,6 +9,9 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
Modified: desktop/unstable/gnome-menus/debian/patches/02_applications-legacydir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/02_applications-legacydir.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/02_applications-legacydir.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/02_applications-legacydir.patch Tue Jul 17 20:21:50 2007
@@ -1,5 +1,7 @@
---- layout/applications.menu 2004-11-09 16:06:30.000000000 +0100
-+++ layout/applications.menu.new 2004-12-07 14:44:52.528783788 +0100
+Index: gnome-menus-2.18.3/layout/applications.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/applications.menu 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/layout/applications.menu 2007-07-17 18:45:15.977163070 +0200
@@ -10,6 +10,7 @@
<KDELegacyDirs/>
<LegacyDir>/etc/X11/applnk</LegacyDir>
Modified: desktop/unstable/gnome-menus/debian/patches/03_kde-legacydirs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/03_kde-legacydirs.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/03_kde-legacydirs.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/03_kde-legacydirs.patch Tue Jul 17 20:21:50 2007
@@ -1,6 +1,7 @@
-diff -urN gnome-menus-2.15.91.orig/layout/applications.menu gnome-menus-2.15.91/layout/applications.menu
---- gnome-menus-2.15.91.orig/layout/applications.menu 2006-08-13 18:46:25.000000000 +0200
-+++ gnome-menus-2.15.91/layout/applications.menu 2006-08-13 18:46:45.000000000 +0200
+Index: gnome-menus-2.18.3/layout/applications.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/applications.menu 2007-07-17 18:45:15.977163070 +0200
++++ gnome-menus-2.18.3/layout/applications.menu 2007-07-17 18:45:19.033337231 +0200
@@ -7,7 +7,6 @@
<Directory>Applications.directory</Directory>
Modified: desktop/unstable/gnome-menus/debian/patches/04_settings-legacydir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/04_settings-legacydir.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/04_settings-legacydir.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/04_settings-legacydir.patch Tue Jul 17 20:21:50 2007
@@ -1,6 +1,7 @@
-diff -urN gnome-menus-2.15.91.orig/layout/settings.menu gnome-menus-2.15.91/layout/settings.menu
---- gnome-menus-2.15.91.orig/layout/settings.menu 2005-07-11 15:12:19.000000000 +0200
-+++ gnome-menus-2.15.91/layout/settings.menu 2006-08-13 18:50:47.000000000 +0200
+Index: gnome-menus-2.18.3/layout/settings.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/settings.menu 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/layout/settings.menu 2007-07-17 18:45:21.573481986 +0200
@@ -6,6 +6,9 @@
<Name>Desktop</Name>
<Directory>Desktop.directory</Directory>
Modified: desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/06_menus_rename.patch Tue Jul 17 20:21:50 2007
@@ -1,6 +1,8 @@
---- layout/settings.menu.orig 2005-07-11 15:12:19.000000000 +0200
-+++ layout/settings.menu 2007-02-17 14:12:41.000000000 +0100
-@@ -16,7 +16,7 @@
+Index: gnome-menus-2.18.3/layout/settings.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/settings.menu 2007-07-17 18:45:21.573481986 +0200
++++ gnome-menus-2.18.3/layout/settings.menu 2007-07-17 18:45:28.541879092 +0200
+@@ -24,7 +24,7 @@
<!-- Merge in these other files as submenus -->
<Menu>
<Name>Preferences</Name>
@@ -9,8 +11,10 @@
</Menu>
<!-- System Settings -->
---- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig 2006-05-05 15:49:03.000000000 +0200
-+++ simple-editor/GMenuSimpleEditor/menutreemodel.py 2007-02-17 14:11:23.000000000 +0100
+Index: gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/menutreemodel.py
+===================================================================
+--- gnome-menus-2.18.3.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/menutreemodel.py 2007-07-17 18:45:28.541879092 +0200
@@ -106,7 +106,7 @@
self.icon_theme = gtk.icon_theme_get_default ()
Modified: desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/07_gnomevfs.patch Tue Jul 17 20:21:50 2007
@@ -1,6 +1,7 @@
-diff -Naur gnome-menus-2.18.0-old/configure.in gnome-menus-2.18.0/configure.in
---- gnome-menus-2.18.0-old/configure.in 2007-03-12 19:52:10.000000000 +0100
-+++ gnome-menus-2.18.0/configure.in 2007-04-25 07:03:58.000000000 +0200
+Index: gnome-menus-2.18.3/configure.in
+===================================================================
+--- gnome-menus-2.18.3.orig/configure.in 2007-07-02 19:16:04.000000000 +0200
++++ gnome-menus-2.18.3/configure.in 2007-07-17 18:45:33.894184102 +0200
@@ -39,6 +39,9 @@
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0)
AC_SUBST(GLIB_CFLAGS)
@@ -36,9 +37,10 @@
GNOME_COMPILE_WARNINGS(yes)
AC_ARG_ENABLE(deprecations,
-diff -Naur gnome-menus-2.18.0-old/libmenu/Makefile.am gnome-menus-2.18.0/libmenu/Makefile.am
---- gnome-menus-2.18.0-old/libmenu/Makefile.am 2007-03-12 19:49:27.000000000 +0100
-+++ gnome-menus-2.18.0/libmenu/Makefile.am 2007-04-25 07:04:25.000000000 +0200
+Index: gnome-menus-2.18.3/libmenu/Makefile.am
+===================================================================
+--- gnome-menus-2.18.3.orig/libmenu/Makefile.am 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/libmenu/Makefile.am 2007-07-17 18:45:33.894184102 +0200
@@ -3,6 +3,7 @@
INCLUDES = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
@@ -70,9 +72,10 @@
$(NULL)
libgnome_menu_la_LDFLAGS = \
-version-info $(LIB_MENU_LT_VERSION) \
-diff -Naur gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c
---- gnome-menus-2.18.0-old/libmenu/menu-monitor-gnomevfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-menus-2.18.0/libmenu/menu-monitor-gnomevfs.c 2007-04-25 07:03:58.000000000 +0200
+Index: gnome-menus-2.18.3/libmenu/menu-monitor-gnomevfs.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-menus-2.18.3/libmenu/menu-monitor-gnomevfs.c 2007-07-17 18:45:33.898184330 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2005 Red Hat, Inc.
Modified: desktop/unstable/gnome-menus/debian/patches/08_menus_prefix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/08_menus_prefix.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/08_menus_prefix.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/08_menus_prefix.patch Tue Jul 17 20:21:50 2007
@@ -1,5 +1,7 @@
---- libmenu/gmenu-tree.c.orig 2006-12-21 19:59:13.000000000 +0100
-+++ libmenu/gmenu-tree.c 2006-12-21 20:21:26.000000000 +0100
+Index: gnome-menus-2.18.3/libmenu/gmenu-tree.c
+===================================================================
+--- gnome-menus-2.18.3.orig/libmenu/gmenu-tree.c 2007-07-17 20:17:22.288089582 +0200
++++ gnome-menus-2.18.3/libmenu/gmenu-tree.c 2007-07-17 20:17:51.833773294 +0200
@@ -588,15 +588,24 @@
GMenuTreeFlags flags)
{
Added: desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch (added)
+++ desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch Tue Jul 17 20:21:50 2007
@@ -1,0 +1,113 @@
+Index: gnome-menus-2.18.3/layout/applications.menu
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/applications.menu 2007-07-17 22:11:29.102267285 +0200
++++ gnome-menus-2.18.3/layout/applications.menu 2007-07-17 22:13:05.971787565 +0200
+@@ -73,11 +73,100 @@
+ <Menu>
+ <Name>Games</Name>
+ <Directory>Games.directory</Directory>
++ <OnlyUnallocated/>
+ <Include>
+ <And>
+ <Category>Game</Category>
+ </And>
+ </Include>
++ <DefaultLayout inline="true" inline_limit="8" inline_header="false">
++ <Merge type="menus"/>
++ <Merge type="files"/>
++ </DefaultLayout>
++ <Menu>
++ <Name>Action</Name>
++ <Directory>ActionGames.directory</Directory>
++ <Include>
++ <Category>ActionGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Adventure</Name>
++ <Directory>AdventureGames.directory</Directory>
++ <Include>
++ <Category>AdventureGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Arcade</Name>
++ <Directory>ArcadeGames.directory</Directory>
++ <Include>
++ <Category>ArcadeGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Board</Name>
++ <Directory>BoardGames.directory</Directory>
++ <Include>
++ <Category>BoardGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Blocks</Name>
++ <Directory>BlocksGames.directory</Directory>
++ <Include>
++ <Category>BlocksGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Cards</Name>
++ <Directory>CardGames.directory</Directory>
++ <Include>
++ <Category>CardGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Kids</Name>
++ <Directory>KidsGames.directory</Directory>
++ <Include>
++ <Category>KidsGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Logic</Name>
++ <Directory>LogicGames.directory</Directory>
++ <Include>
++ <Category>LogicGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Role Playing</Name>
++ <Directory>RolePlayingGames.directory</Directory>
++ <Include>
++ <Category>RolePlaying</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Simulation</Name>
++ <Directory>SimulationGames.directory</Directory>
++ <Include>
++ <Category>Simulation</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Sports</Name>
++ <Directory>SportsGames.directory</Directory>
++ <Include>
++ <Category>SportsGame</Category>
++ </Include>
++ </Menu>
++ <Menu>
++ <Name>Strategy</Name>
++ <Directory>StrategyGames.directory</Directory>
++ <Include>
++ <Category>StrategyGame</Category>
++ </Include>
++ </Menu>
+ </Menu> <!-- End Games -->
+
+ <!-- Graphics -->
+@@ -146,6 +235,7 @@
+ <Category>Application</Category>
+ <Not><Category>Core</Category></Not>
+ <Not><Category>Settings</Category></Not>
++ <Not><Category>Game</Category></Not>
+ </And>
+ </Include>
+ </Menu> <!-- End Other -->
Modified: desktop/unstable/gnome-menus/debian/patches/10_use-default-python-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/10_use-default-python-path.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/10_use-default-python-path.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/10_use-default-python-path.patch Tue Jul 17 20:21:50 2007
@@ -1,6 +1,7 @@
-diff -urN gnome-menus-2.14.0.orig/simple-editor/gmenu-simple-editor.in gnome-menus-2.14.0/simple-editor/gmenu-simple-editor.in
---- gnome-menus-2.14.0.orig/simple-editor/gmenu-simple-editor.in 2005-08-02 11:35:47.000000000 +0200
-+++ gnome-menus-2.14.0/simple-editor/gmenu-simple-editor.in 2006-07-27 22:28:47.000000000 +0200
+Index: gnome-menus-2.18.3/simple-editor/gmenu-simple-editor.in
+===================================================================
+--- gnome-menus-2.18.3.orig/simple-editor/gmenu-simple-editor.in 2007-07-02 19:15:26.000000000 +0200
++++ gnome-menus-2.18.3/simple-editor/gmenu-simple-editor.in 2007-07-17 18:45:40.274547699 +0200
@@ -20,9 +20,6 @@
import sys
Modified: desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/70_reautogen.patch Tue Jul 17 20:21:50 2007
@@ -6,9 +6,10 @@
automake-1.9
rm -rf autom4te.cache
-diff -Nur gnome-menus-2.18.3/aclocal.m4 gnome-menus-2.18.3.new/aclocal.m4
---- gnome-menus-2.18.3/aclocal.m4 2007-07-02 19:17:14.000000000 +0200
-+++ gnome-menus-2.18.3.new/aclocal.m4 2007-07-03 19:57:07.000000000 +0200
+Index: gnome-menus-2.18.3/aclocal.m4
+===================================================================
+--- gnome-menus-2.18.3.orig/aclocal.m4 2007-07-02 19:17:14.000000000 +0200
++++ gnome-menus-2.18.3/aclocal.m4 2007-07-17 18:45:45.754860004 +0200
@@ -11,5784 +11,4698 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -15374,9 +15375,10 @@
+]) # _AM_PROG_TAR
m4_include([acinclude.m4])
-diff -Nur gnome-menus-2.18.3/configure gnome-menus-2.18.3.new/configure
---- gnome-menus-2.18.3/configure 2007-07-02 19:17:17.000000000 +0200
-+++ gnome-menus-2.18.3.new/configure 2007-07-03 19:57:10.000000000 +0200
+Index: gnome-menus-2.18.3/configure
+===================================================================
+--- gnome-menus-2.18.3.orig/configure 2007-07-02 19:17:17.000000000 +0200
++++ gnome-menus-2.18.3/configure 2007-07-17 18:45:45.782861600 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -20035,9 +20037,10 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Nur gnome-menus-2.18.3/desktop-directories/Makefile.in gnome-menus-2.18.3.new/desktop-directories/Makefile.in
---- gnome-menus-2.18.3/desktop-directories/Makefile.in 2007-07-02 19:17:21.000000000 +0200
-+++ gnome-menus-2.18.3.new/desktop-directories/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/desktop-directories/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/desktop-directories/Makefile.in 2007-07-02 19:17:21.000000000 +0200
++++ gnome-menus-2.18.3/desktop-directories/Makefile.in 2007-07-17 18:45:45.782861600 +0200
@@ -95,13 +95,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20054,9 +20057,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/layout/Makefile.in gnome-menus-2.18.3.new/layout/Makefile.in
---- gnome-menus-2.18.3/layout/Makefile.in 2007-07-02 19:17:22.000000000 +0200
-+++ gnome-menus-2.18.3.new/layout/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/layout/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/layout/Makefile.in 2007-07-02 19:17:22.000000000 +0200
++++ gnome-menus-2.18.3/layout/Makefile.in 2007-07-17 18:45:45.782861600 +0200
@@ -95,13 +95,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20073,9 +20077,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/libmenu/Makefile.in gnome-menus-2.18.3.new/libmenu/Makefile.in
---- gnome-menus-2.18.3/libmenu/Makefile.in 2007-07-02 19:17:22.000000000 +0200
-+++ gnome-menus-2.18.3.new/libmenu/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/libmenu/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/libmenu/Makefile.in 2007-07-02 19:17:22.000000000 +0200
++++ gnome-menus-2.18.3/libmenu/Makefile.in 2007-07-17 18:45:45.782861600 +0200
@@ -69,8 +69,8 @@
entry-directories.h gmenu-tree.c gmenu-tree.h menu-layout.c \
menu-layout.h menu-monitor.c menu-monitor.h \
@@ -20142,9 +20147,10 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-monitor-inotify.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-monitor.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu-util.Plo at am__quote@
-diff -Nur gnome-menus-2.18.3/ltmain.sh gnome-menus-2.18.3.new/ltmain.sh
---- gnome-menus-2.18.3/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
-+++ gnome-menus-2.18.3.new/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
+Index: gnome-menus-2.18.3/ltmain.sh
+===================================================================
+--- gnome-menus-2.18.3.orig/ltmain.sh 2007-02-17 10:05:30.000000000 +0100
++++ gnome-menus-2.18.3/ltmain.sh 2007-07-17 18:45:45.790862055 +0200
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -20178,9 +20184,10 @@
esac
;;
no)
-diff -Nur gnome-menus-2.18.3/Makefile.in gnome-menus-2.18.3.new/Makefile.in
---- gnome-menus-2.18.3/Makefile.in 2007-07-02 19:17:23.000000000 +0200
-+++ gnome-menus-2.18.3.new/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/Makefile.in 2007-07-02 19:17:23.000000000 +0200
++++ gnome-menus-2.18.3/Makefile.in 2007-07-17 18:45:45.790862055 +0200
@@ -109,13 +109,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20197,9 +20204,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/python/Makefile.in gnome-menus-2.18.3.new/python/Makefile.in
---- gnome-menus-2.18.3/python/Makefile.in 2007-07-02 19:17:22.000000000 +0200
-+++ gnome-menus-2.18.3.new/python/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/python/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/python/Makefile.in 2007-07-02 19:17:22.000000000 +0200
++++ gnome-menus-2.18.3/python/Makefile.in 2007-07-17 18:45:45.790862055 +0200
@@ -113,13 +113,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20216,9 +20224,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in gnome-menus-2.18.3.new/simple-editor/GMenuSimpleEditor/Makefile.in
---- gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
-+++ gnome-menus-2.18.3.new/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
++++ gnome-menus-2.18.3/simple-editor/GMenuSimpleEditor/Makefile.in 2007-07-17 18:45:45.790862055 +0200
@@ -96,13 +96,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20235,9 +20244,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/simple-editor/Makefile.in gnome-menus-2.18.3.new/simple-editor/Makefile.in
---- gnome-menus-2.18.3/simple-editor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
-+++ gnome-menus-2.18.3.new/simple-editor/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/simple-editor/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/simple-editor/Makefile.in 2007-07-02 19:17:22.000000000 +0200
++++ gnome-menus-2.18.3/simple-editor/Makefile.in 2007-07-17 18:45:45.790862055 +0200
@@ -109,13 +109,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -20254,9 +20264,10 @@
GREP = @GREP@
HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
-diff -Nur gnome-menus-2.18.3/util/Makefile.in gnome-menus-2.18.3.new/util/Makefile.in
---- gnome-menus-2.18.3/util/Makefile.in 2007-07-02 19:17:23.000000000 +0200
-+++ gnome-menus-2.18.3.new/util/Makefile.in 2007-07-03 19:57:11.000000000 +0200
+Index: gnome-menus-2.18.3/util/Makefile.in
+===================================================================
+--- gnome-menus-2.18.3.orig/util/Makefile.in 2007-07-02 19:17:23.000000000 +0200
++++ gnome-menus-2.18.3/util/Makefile.in 2007-07-17 18:45:45.790862055 +0200
@@ -111,13 +111,14 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
Added: desktop/unstable/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/series?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/series (added)
+++ desktop/unstable/gnome-menus/debian/patches/series Tue Jul 17 20:21:50 2007
@@ -1,0 +1,11 @@
+01_preferences-legacydir.patch
+02_applications-legacydir.patch
+03_kde-legacydirs.patch
+04_settings-legacydir.patch
+05_debian_menu.patch
+06_menus_rename.patch
+07_gnomevfs.patch
+08_menus_prefix.patch
+09_games-menu.patch
+10_use-default-python-path.patch
+70_reautogen.patch
Added: desktop/unstable/gnome-menus/debian/po-up/debian.pot
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/po-up/debian.pot?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/po-up/debian.pot (added)
+++ desktop/unstable/gnome-menus/debian/po-up/debian.pot Tue Jul 17 20:21:50 2007
@@ -1,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-17 21:53+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/desktop-files/ActionGames.directory.in.h:1
+msgid "Action"
+msgstr ""
+
+#: ../../debian/desktop-files/ActionGames.directory.in.h:2
+msgid "Action games"
+msgstr ""
+
+#: ../../debian/desktop-files/AdventureGames.directory.in.h:1
+msgid "Adventure"
+msgstr ""
+
+#: ../../debian/desktop-files/AdventureGames.directory.in.h:2
+msgid "Adventure style games"
+msgstr ""
+
+#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1
+msgid "Arcade"
+msgstr ""
+
+#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2
+msgid "Arcade style games"
+msgstr ""
+
+#: ../../debian/desktop-files/BlocksGames.directory.in.h:1
+msgid "Falling blocks"
+msgstr ""
+
+#: ../../debian/desktop-files/BlocksGames.directory.in.h:2
+msgid "Falling blocks games"
+msgstr ""
+
+#: ../../debian/desktop-files/BoardGames.directory.in.h:1
+msgid "Board"
+msgstr ""
+
+#: ../../debian/desktop-files/BoardGames.directory.in.h:2
+msgid "Board games"
+msgstr ""
+
+#: ../../debian/desktop-files/CardGames.directory.in.h:1
+msgid "Card games"
+msgstr ""
+
+#: ../../debian/desktop-files/CardGames.directory.in.h:2
+msgid "Cards"
+msgstr ""
+
+#: ../../debian/desktop-files/Debian.directory.in.h:1
+msgid "Debian"
+msgstr ""
+
+#: ../../debian/desktop-files/Debian.directory.in.h:2
+msgid "The Debian menu"
+msgstr ""
+
+#: ../../debian/desktop-files/KidsGames.directory.in.h:1
+msgid "Games for kids"
+msgstr ""
+
+#: ../../debian/desktop-files/KidsGames.directory.in.h:2
+msgid "Kids"
+msgstr ""
+
+#: ../../debian/desktop-files/LogicGames.directory.in.h:1
+msgid "Logic"
+msgstr ""
+
+#: ../../debian/desktop-files/LogicGames.directory.in.h:2
+msgid "Logic and puzzle games"
+msgstr ""
+
+#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1
+msgid "Role playing"
+msgstr ""
+
+#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2
+msgid "Role playing games"
+msgstr ""
+
+#: ../../debian/desktop-files/SimulationGames.directory.in.h:1
+msgid "Simulation"
+msgstr ""
+
+#: ../../debian/desktop-files/SimulationGames.directory.in.h:2
+msgid "Simulation games"
+msgstr ""
+
+#: ../../debian/desktop-files/SportsGames.directory.in.h:1
+msgid "Sports"
+msgstr ""
+
+#: ../../debian/desktop-files/SportsGames.directory.in.h:2
+msgid "Sports games"
+msgstr ""
+
+#: ../../debian/desktop-files/StrategyGames.directory.in.h:1
+msgid "Strategy"
+msgstr ""
+
+#: ../../debian/desktop-files/StrategyGames.directory.in.h:2
+msgid "Strategy games"
+msgstr ""
Added: desktop/unstable/gnome-menus/debian/po-up/fr.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/po-up/fr.po?rev=11993&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/po-up/fr.po (added)
+++ desktop/unstable/gnome-menus/debian/po-up/fr.po Tue Jul 17 20:21:50 2007
@@ -1,0 +1,120 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-17 21:53+0200\n"
+"PO-Revision-Date: 2007-07-17 19:11+0200\n"
+"Last-Translator: Josselin Mouette <joss at debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../debian/desktop-files/ActionGames.directory.in.h:1
+msgid "Action"
+msgstr "Action"
+
+#: ../../debian/desktop-files/ActionGames.directory.in.h:2
+msgid "Action games"
+msgstr "Jeux d'action"
+
+#: ../../debian/desktop-files/AdventureGames.directory.in.h:1
+msgid "Adventure"
+msgstr "Aventure"
+
+#: ../../debian/desktop-files/AdventureGames.directory.in.h:2
+msgid "Adventure style games"
+msgstr "Jeux d'aventure"
+
+#: ../../debian/desktop-files/ArcadeGames.directory.in.h:1
+msgid "Arcade"
+msgstr "Arcade"
+
+#: ../../debian/desktop-files/ArcadeGames.directory.in.h:2
+msgid "Arcade style games"
+msgstr "Jeux d'arcade"
+
+#: ../../debian/desktop-files/BlocksGames.directory.in.h:1
+msgid "Falling blocks"
+msgstr "Chute de blocs"
+
+#: ../../debian/desktop-files/BlocksGames.directory.in.h:2
+msgid "Falling blocks games"
+msgstr "Jeux de blocs qui chutent"
+
+#: ../../debian/desktop-files/BoardGames.directory.in.h:1
+msgid "Board"
+msgstr "Plateau"
+
+#: ../../debian/desktop-files/BoardGames.directory.in.h:2
+msgid "Board games"
+msgstr "Jeux de plateau"
+
+#: ../../debian/desktop-files/CardGames.directory.in.h:1
+msgid "Card games"
+msgstr "Jeux de cartes"
+
+#: ../../debian/desktop-files/CardGames.directory.in.h:2
+msgid "Cards"
+msgstr "Cartes"
+
+#: ../../debian/desktop-files/Debian.directory.in.h:1
+msgid "Debian"
+msgstr "Debian"
+
+#: ../../debian/desktop-files/Debian.directory.in.h:2
+msgid "The Debian menu"
+msgstr "Le menu Debian"
+
+#: ../../debian/desktop-files/KidsGames.directory.in.h:1
+msgid "Games for kids"
+msgstr "Jeux pour les enfants"
+
+#: ../../debian/desktop-files/KidsGames.directory.in.h:2
+msgid "Kids"
+msgstr "Enfants"
+
+#: ../../debian/desktop-files/LogicGames.directory.in.h:1
+msgid "Logic"
+msgstr "Réflexion"
+
+#: ../../debian/desktop-files/LogicGames.directory.in.h:2
+msgid "Logic and puzzle games"
+msgstr "Jeux de réflexion et de logique"
+
+#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:1
+msgid "Role playing"
+msgstr "Jeux de rôle"
+
+#: ../../debian/desktop-files/RolePlayingGames.directory.in.h:2
+msgid "Role playing games"
+msgstr "Jeux de rôle"
+
+#: ../../debian/desktop-files/SimulationGames.directory.in.h:1
+msgid "Simulation"
+msgstr "Simulation"
+
+#: ../../debian/desktop-files/SimulationGames.directory.in.h:2
+msgid "Simulation games"
+msgstr "Jeux de simulation"
+
+#: ../../debian/desktop-files/SportsGames.directory.in.h:1
+msgid "Sports"
+msgstr "Sports"
+
+#: ../../debian/desktop-files/SportsGames.directory.in.h:2
+msgid "Sports games"
+msgstr "Simulations sportives"
+
+#: ../../debian/desktop-files/StrategyGames.directory.in.h:1
+msgid "Strategy"
+msgstr "Stratégie"
+
+#: ../../debian/desktop-files/StrategyGames.directory.in.h:2
+msgid "Strategy games"
+msgstr "Jeux de stratégie"
Modified: desktop/unstable/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/rules?rev=11993&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/rules (original)
+++ desktop/unstable/gnome-menus/debian/rules Tue Jul 17 20:21:50 2007
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -10,6 +10,14 @@
PY_VERSIONS = $(shell pyversions --requested debian/control)
DEB_BUILDDIR := build
+
+INFILES = $(wildcard debian/desktop-files/*.directory.in)
+OUTFILES = $(INFILES:.directory.in=.directory)
+
+%.directory: %.directory.in
+ intltool-merge -d debian/po-up $< $@
+
+build/gnome-menus:: $(OUTFILES)
configure-stamp-%:
mkdir build-$*
@@ -45,7 +53,6 @@
# force executable bit on files looking like python scripts
egrep -rlZ '^#!(.*)python' debian/python-gmenu/usr/lib/ | xargs -0 chmod a+x --
dh_pycentral
- dh_python
clean::
-rm -rf $(DEB_BUILDDIR)
@@ -53,4 +60,8 @@
-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
-
+ -rm -f $(OUTFILES)
+ ( for i in $(INFILES); do echo ../$$i; done) > debian/po-up/POTFILES.in
+ cd debian/po-up && intltool-update -g debian --pot && \
+ for i in *.po; do intltool-update -g debian --dist $${i%.po}; done
+ rm -f debian/po-up/POTFILES.in
More information about the pkg-gnome-commits
mailing list