r17987 - in /desktop/experimental/gnome-menus/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 26 16:40:21 UTC 2008
Author: joss
Date: Fri Dec 26 16:40:21 2008
New Revision: 17987
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17987
Log:
* New upstream release.
* Bump intltool requirement; drop the libxml-parser-perl one.
* Bump shlibs version to 2.23.3.
* 01_preferences-legacydir.patch, 02_applications-legacydir.patch,
04_settings-legacydir.patch: dropped, obsolete.
* Don’t rename preferences.menu, it doesn’t exist anymore.
* gnome-menus.preinst: remove gnome-preferences.menu upon upgrade.
* 06_menus_rename.patch: drop obsolete part.
* 08_menus_prefix.patch: refreshed.
* 11_science-menu.patch: updated to apply cleanly.
* 12_merge_duplicates.patch: do not re-sort merged menus that are not
inlined.
Added:
desktop/experimental/gnome-menus/debian/gnome-menus.preinst
Removed:
desktop/experimental/gnome-menus/debian/patches/01_preferences-legacydir.patch
desktop/experimental/gnome-menus/debian/patches/02_applications-legacydir.patch
desktop/experimental/gnome-menus/debian/patches/04_settings-legacydir.patch
Modified:
desktop/experimental/gnome-menus/debian/changelog
desktop/experimental/gnome-menus/debian/control
desktop/experimental/gnome-menus/debian/control.in
desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs
desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch
desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch
desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch
desktop/experimental/gnome-menus/debian/patches/12_merge_duplicates.patch
desktop/experimental/gnome-menus/debian/patches/series
desktop/experimental/gnome-menus/debian/rules
Modified: desktop/experimental/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/changelog?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog (original)
+++ desktop/experimental/gnome-menus/debian/changelog Fri Dec 26 16:40:21 2008
@@ -1,8 +1,23 @@
-gnome-menus (2.22.2-5) UNRELEASED; urgency=low
-
+gnome-menus (2.24.2-1) experimental; urgency=low
+
+ [ Loic Minier ]
* Drop Encoding=UTF-8 from debian/desktop-files/*.directory.in; deprecated.
* Don't purge /usr/lib/python2.?/site-packages/GMenuSimpleEditor during
first configuration.
+
+ [ Josselin Mouette ]
+ * New upstream release.
+ * Bump intltool requirement; drop the libxml-parser-perl one.
+ * Bump shlibs version to 2.23.3.
+ * 01_preferences-legacydir.patch, 02_applications-legacydir.patch,
+ 04_settings-legacydir.patch: dropped, obsolete.
+ * Donât rename preferences.menu, it doesnât exist anymore.
+ * gnome-menus.preinst: remove gnome-preferences.menu upon upgrade.
+ * 06_menus_rename.patch: drop obsolete part.
+ * 08_menus_prefix.patch: refreshed.
+ * 11_science-menu.patch: updated to apply cleanly.
+ * 12_merge_duplicates.patch: do not re-sort merged menus that are not
+ inlined.
-- Loic Minier <lool at dooz.org> Fri, 24 Oct 2008 15:00:10 +0200
Modified: desktop/experimental/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control (original)
+++ desktop/experimental/gnome-menus/debian/control Fri Dec 26 16:40:21 2008
@@ -2,17 +2,16 @@
Section: gnome
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.37.2),
cdbs (>= 0.4.43),
libglib2.0-dev (>= 2.15.2),
python-all-dev,
- libxml-parser-perl,
gnome-pkg-tools,
dpkg-dev (>= 1.13.19),
python-support (>= 0.6),
quilt,
- intltool
+ intltool (>= 0.40.0)
Standards-Version: 3.8.0
XS-Python-Version: >= 2.3
Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in (original)
+++ desktop/experimental/gnome-menus/debian/control.in Fri Dec 26 16:40:21 2008
@@ -7,12 +7,11 @@
cdbs (>= 0.4.43),
libglib2.0-dev (>= 2.15.2),
python-all-dev,
- libxml-parser-perl,
gnome-pkg-tools,
dpkg-dev (>= 1.13.19),
python-support (>= 0.6),
quilt,
- intltool
+ intltool (>= 0.40.0)
Standards-Version: 3.8.0
XS-Python-Version: >= 2.3
Added: desktop/experimental/gnome-menus/debian/gnome-menus.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.preinst?rev=17987&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.preinst (added)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.preinst Fri Dec 26 16:40:21 2008
@@ -1,0 +1,29 @@
+#! /bin/sh
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "2.22.2-4"; then
+ rm_conffile gnome-menus "/etc/xdg/menus/gnome-preferences.menu"
+ fi
+esac
+
+#DEBHELPER#
Modified: desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs (original)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs Fri Dec 26 16:40:21 2008
@@ -1,1 +1,1 @@
-libgnome-menu 2 libgnome-menu2 (>= 2.15.4)
+libgnome-menu 2 libgnome-menu2 (>= 2.23.3)
Modified: desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch (original)
+++ desktop/experimental/gnome-menus/debian/patches/06_menus_rename.patch Fri Dec 26 16:40:21 2008
@@ -1,21 +1,8 @@
-Index: gnome-menus-2.18.3/layout/settings.menu
+Index: gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py
===================================================================
---- 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>
-- <MergeFile>preferences.menu</MergeFile>
-+ <MergeFile>gnome-preferences.menu</MergeFile>
- </Menu>
-
- <!-- System Settings -->
-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 @@
+--- gnome-menus-2.24.2.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-11-25 14:01:14.000000000 +0100
++++ gnome-menus-2.24.2/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-12-26 17:02:53.075589286 +0100
+@@ -104,7 +104,7 @@ class MenuTreeModel (gtk.TreeStore):
self.icon_theme = gtk.icon_theme_get_default ()
if (len (menu_files) < 1):
Modified: desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch (original)
+++ desktop/experimental/gnome-menus/debian/patches/08_menus_prefix.patch Fri Dec 26 16:40:21 2008
@@ -1,8 +1,8 @@
-Index: gnome-menus-2.18.3/libmenu/gmenu-tree.c
+Index: gnome-menus-2.24.2/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 @@
+--- gnome-menus-2.24.2.orig/libmenu/gmenu-tree.c 2008-11-25 14:01:14.000000000 +0100
++++ gnome-menus-2.24.2/libmenu/gmenu-tree.c 2008-12-26 17:08:16.271594014 +0100
+@@ -608,15 +608,24 @@ gmenu_tree_lookup (const char *menu_
GMenuTreeFlags flags)
{
GMenuTree *retval;
@@ -29,7 +29,7 @@
g_assert (retval != NULL);
-@@ -2030,6 +2039,8 @@
+@@ -2103,6 +2112,8 @@ resolve_default_merge_dirs (GMenuTree
root = menu_layout_node_get_root (layout);
menu_name = menu_layout_node_root_get_name (root);
Modified: desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch (original)
+++ desktop/experimental/gnome-menus/debian/patches/11_science-menu.patch Fri Dec 26 16:40:21 2008
@@ -1,8 +1,8 @@
-Index: gnome-menus-2.22.2/layout/applications.menu
+Index: gnome-menus-2.24.2/layout/applications.menu
===================================================================
---- gnome-menus-2.22.2.orig/layout/applications.menu 2008-07-15 11:35:21.198702340 +0200
-+++ gnome-menus-2.22.2/layout/applications.menu 2008-07-15 12:57:02.580461684 +0200
-@@ -66,10 +66,23 @@
+--- gnome-menus-2.24.2.orig/layout/applications.menu 2008-12-26 17:08:38.587592137 +0100
++++ gnome-menus-2.24.2/layout/applications.menu 2008-12-26 17:10:25.727590587 +0100
+@@ -65,10 +65,23 @@
<Include>
<And>
<Category>Education</Category>
@@ -26,26 +26,24 @@
<!-- Games -->
<Menu>
<Name>Games</Name>
-Index: gnome-menus-2.22.2/desktop-directories/Accessories.directory.in
+Index: gnome-menus-2.24.2/desktop-directories/Education.directory.in
===================================================================
---- gnome-menus-2.22.2.orig/desktop-directories/Accessories.directory.in 2008-07-15 12:10:13.983680738 +0200
-+++ gnome-menus-2.22.2/desktop-directories/Accessories.directory.in 2008-07-15 12:10:26.746693844 +0200
-@@ -1,6 +1,6 @@
+--- gnome-menus-2.24.2.orig/desktop-directories/Education.directory.in 2008-11-25 14:01:14.000000000 +0100
++++ gnome-menus-2.24.2/desktop-directories/Education.directory.in 2008-12-26 17:10:25.731589699 +0100
+@@ -1,4 +1,4 @@
+ [Desktop Entry]
+ _Name=Education
+-Icon=applications-science
++Icon=applications-accessories
+ Type=Directory
+Index: gnome-menus-2.24.2/desktop-directories/Utility.directory.in
+===================================================================
+--- gnome-menus-2.24.2.orig/desktop-directories/Utility.directory.in 2008-12-26 17:10:52.531587812 +0100
++++ gnome-menus-2.24.2/desktop-directories/Utility.directory.in 2008-12-26 17:11:01.619588523 +0100
+@@ -1,5 +1,5 @@
[Desktop Entry]
_Name=Accessories
_Comment=Desktop accessories
-Icon=applications-accessories
+Icon=applications-utilities
Type=Directory
- Encoding=UTF-8
-Index: gnome-menus-2.22.2/desktop-directories/Education.directory.in
-===================================================================
---- gnome-menus-2.22.2.orig/desktop-directories/Education.directory.in 2008-07-15 12:09:35.190681209 +0200
-+++ gnome-menus-2.22.2/desktop-directories/Education.directory.in 2008-07-15 12:09:54.228993550 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- _Name=Education
--Icon=applications-science
-+Icon=applications-accessories
- Type=Directory
- Encoding=UTF-8
Modified: desktop/experimental/gnome-menus/debian/patches/12_merge_duplicates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/12_merge_duplicates.patch?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/12_merge_duplicates.patch (original)
+++ desktop/experimental/gnome-menus/debian/patches/12_merge_duplicates.patch Fri Dec 26 16:40:21 2008
@@ -1,11 +1,11 @@
Debian #447823 and #444587
GNOME #490483
-Index: gnome-menus-2.22.2/libmenu/gmenu-tree.c
+Index: gnome-menus-2.24.2/libmenu/gmenu-tree.c
===================================================================
---- gnome-menus-2.22.2.orig/libmenu/gmenu-tree.c 2008-08-29 11:18:36.063994586 +0200
-+++ gnome-menus-2.22.2/libmenu/gmenu-tree.c 2008-08-29 11:21:00.868667108 +0200
-@@ -3440,6 +3440,73 @@ process_only_unallocated (GMenuTree
+--- gnome-menus-2.24.2.orig/libmenu/gmenu-tree.c 2008-12-26 17:32:49.935593279 +0100
++++ gnome-menus-2.24.2/libmenu/gmenu-tree.c 2008-12-26 17:37:37.047586983 +0100
+@@ -3548,6 +3548,73 @@ process_only_unallocated (GMenuTree
static void process_layout_info (GMenuTree *tree,
GMenuTreeDirectory *directory);
@@ -50,7 +50,7 @@
+ MenuLayoutValues *layout_values)
+{
+ /* Only sort if needed */
-+ if (layout_values->inline_header || layout_values->inline_alias)
++ if (!layout_values->inline_menus || layout_values->inline_header || layout_values->inline_alias)
+ return;
+
+ directory->contents = g_slist_sort (directory->contents,
@@ -79,7 +79,7 @@
static void
check_pending_separator (GMenuTreeDirectory *directory)
{
-@@ -3663,6 +3730,8 @@ merge_subdirs (GMenuTree *tree,
+@@ -3771,6 +3838,8 @@ merge_subdirs (GMenuTree *tree,
g_slist_free (subdirs);
g_slist_free (except);
@@ -88,7 +88,7 @@
}
static void
-@@ -3767,6 +3836,8 @@ merge_subdirs_and_entries (GMenuTree
+@@ -3875,6 +3944,8 @@ merge_subdirs_and_entries (GMenuTree
g_slist_free (items);
g_slist_free (except_subdirs);
g_slist_free (except_entries);
Modified: desktop/experimental/gnome-menus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/series?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/series (original)
+++ desktop/experimental/gnome-menus/debian/patches/series Fri Dec 26 16:40:21 2008
@@ -1,7 +1,4 @@
-01_preferences-legacydir.patch
-02_applications-legacydir.patch
03_kde-legacydirs.patch
-04_settings-legacydir.patch
05_debian_menu.patch
06_menus_rename.patch
08_menus_prefix.patch
Modified: desktop/experimental/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/rules?rev=17987&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/rules (original)
+++ desktop/experimental/gnome-menus/debian/rules Fri Dec 26 16:40:21 2008
@@ -46,7 +46,6 @@
binary-install/gnome-menus::
mv debian/gnome-menus/etc/xdg/menus/applications.menu debian/gnome-menus/etc/xdg/menus/gnome-applications.menu
- mv debian/gnome-menus/etc/xdg/menus/preferences.menu debian/gnome-menus/etc/xdg/menus/gnome-preferences.menu
mv debian/gnome-menus/etc/xdg/menus/settings.menu debian/gnome-menus/etc/xdg/menus/gnome-settings.menu
binary-install/python-gmenu::
More information about the pkg-gnome-commits
mailing list