r42089 - in /desktop/unstable/gnome-menus/debian: changelog patches/08_settings-menus.patch patches/09_games-menu.patch patches/30-gnome-calculator-desktop-file.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Wed Jul 23 22:05:16 UTC 2014
Author: pochu
Date: Wed Jul 23 22:05:16 2014
New Revision: 42089
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42089
Log:
* New upstream release.
* debian/patches/30-gnome-calculator-desktop-file.patch:
+ Removed. It was integrated in the new upstream release.
* debian/patches/:
+ debian/patches/*: refreshed.
Modified:
desktop/unstable/gnome-menus/debian/changelog
desktop/unstable/gnome-menus/debian/patches/08_settings-menus.patch
desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch
desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch
desktop/unstable/gnome-menus/debian/patches/series
Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=42089&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Wed Jul 23 22:05:16 2014
@@ -1,4 +1,4 @@
-gnome-menus (3.8.0-3) UNRELEASED; urgency=low
+gnome-menus (3.10.1-1) UNRELEASED; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/control.in:
@@ -15,6 +15,13 @@
[ Fabian Greffrath ]
* gnome-menus-blacklist: re-apply patch to correctly handle
menu files with missing ending newlines. Closes: #692141.
+
+ [ Pierangelo Mancusi ]
+ * New upstream release.
+ * debian/patches/30-gnome-calculator-desktop-file.patch:
+ + Removed. It was integrated in the new upstream release.
+ * debian/patches/:
+ + debian/patches/*: refreshed.
-- Emilio Pozuelo Monfort <pochu at debian.org> Mon, 10 Jun 2013 13:38:12 +0200
Modified: desktop/unstable/gnome-menus/debian/patches/08_settings-menus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/08_settings-menus.patch?rev=42089&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/08_settings-menus.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/08_settings-menus.patch [utf-8] Wed Jul 23 22:05:16 2014
@@ -1,11 +1,12 @@
-Index: gnome-menus-3.8.0/layout/gnome-applications.menu
+Index: a/layout/gnome-applications.menu
===================================================================
---- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14 15:48:17.509604188 -0400
-+++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14 15:57:09.689581931 -0400
-@@ -233,6 +233,118 @@
- <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
- </And>
- </Include>
+--- a/layout/gnome-applications.menu (revision 9)
++++ b/layout/gnome-applications.menu (working copy)
+@@ -259,6 +259,119 @@
+ <Filename>dconf-editor.desktop</Filename>
+ <Filename>setroubleshoot.desktop</Filename>
+ </Exclude>
++
+ <Menu>
+ <Name>Preferences</Name>
+ <Directory>Settings.directory</Directory>
Modified: 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=42089&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch [utf-8] Wed Jul 23 22:05:16 2014
@@ -1,11 +1,11 @@
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -99,8 +99,107 @@
+Index: a/layout/gnome-applications.menu
+===================================================================
+--- a/layout/gnome-applications.menu (revision 10)
++++ b/layout/gnome-applications.menu (working copy)
+@@ -115,8 +115,107 @@
<Include>
<And>
<Category>Game</Category>
-- </And>
-- </Include>
+ <Not><Category>ActionGame</Category></Not>
+ <Not><Category>AdventureGame</Category></Not>
+ <Not><Category>ArcadeGame</Category></Not>
@@ -17,8 +17,8 @@
+ <Not><Category>Simulation</Category></Not>
+ <Not><Category>SportsGame</Category></Not>
+ <Not><Category>StrategyGame</Category></Not>
-+ </And>
-+ </Include>
+ </And>
+ </Include>
+ <DefaultLayout inline="true" inline_limit="6" inline_header="false">
+ <Merge type="menus"/>
+ <Merge type="files"/>
@@ -110,11 +110,12 @@
</Menu> <!-- End Games -->
<!-- Graphics -->
-@@ -223,6 +322,7 @@
+@@ -238,6 +337,7 @@
+ <Include>
<And>
<Category>System</Category>
++ <Not><Category>Game</Category></Not>
<Not><Category>Settings</Category></Not>
-+ <Not><Category>Game</Category></Not>
- <Not><Filename>baobab.desktop</Filename></Not>
- <Not><Filename>gnome-system-log.desktop</Filename></Not>
- <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
+ <Not><Category>X-GNOME-Utilities</Category></Not>
+ </And>
+
Modified: desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch?rev=42089&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch [utf-8] Wed Jul 23 22:05:16 2014
@@ -1,45 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember at gmail.com>
-Date: Thu, 28 Mar 2013 22:54:34 +0100
-Subject: [PATCH] Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
- layout/gnome-applications.menu | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
- <Not><Filename>file-roller.desktop</Filename></Not>
- <Not><Filename>gnome-file-roller.desktop</Filename></Not>
- <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
-- <Not><Filename>gnome-calculator.desktop</Filename></Not>
- <Not><Filename>gcalctool.desktop</Filename></Not>
- <Not><Filename>gucharmap.desktop</Filename></Not>
- <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
- <Directory>X-GNOME-Utilities.directory</Directory>
- <Include>
- <Filename>file-roller.desktop</Filename>
-- <Filename>gnome-calculator.desktop</Filename>
-+ <Filename>gcalctool.desktop</Filename>
- <Filename>gnome-font-viewer.desktop</Filename>
- <Filename>gucharmap.desktop</Filename>
- <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
- <Not><Filename>gnome-eog.desktop</Filename></Not>
- <Not><Filename>gnome-file-roller.desktop</Filename></Not>
- <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-- <Not><Filename>gcalctool.desktop</Filename></Not>
- </And>
- </Include>
- </Menu> <!-- End Other -->
---
-1.8.3
-
Modified: desktop/unstable/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/series?rev=42089&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/patches/series [utf-8] Wed Jul 23 22:05:16 2014
@@ -5,4 +5,3 @@
08_settings-menus.patch
09_games-menu.patch
11_science-menu.patch
-30-gnome-calculator-desktop-file.patch
More information about the pkg-gnome-commits
mailing list