r30611 - in /desktop/experimental/gnome-menus/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 16 12:47:52 UTC 2011
Author: sjoerd
Date: Sun Oct 16 12:47:52 2011
New Revision: 30611
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30611
Log:
* New upstream release
* Partial sync from Ubuntu, ensure we're using the same package names and
initial 3.2.0 packaging
* debian/patches/01_default_prefix.patch: Refreshed
Added:
desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install
desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.symbols
desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
Removed:
desktop/experimental/gnome-menus/debian/gir1.2-gmenu-2.0.install
desktop/experimental/gnome-menus/debian/libgnome-menu-dev.install
desktop/experimental/gnome-menus/debian/libgnome-menu2.install
desktop/experimental/gnome-menus/debian/libgnome-menu2.shlibs
desktop/experimental/gnome-menus/debian/python-gmenu.install
Modified:
desktop/experimental/gnome-menus/debian/changelog
desktop/experimental/gnome-menus/debian/control.in
desktop/experimental/gnome-menus/debian/gnome-menus.install
desktop/experimental/gnome-menus/debian/gnome-menus.triggers
desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
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=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/changelog [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,3 +1,12 @@
+gnome-menus (3.2.0.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Partial sync from Ubuntu, ensure we're using the same package names and
+ initial 3.2.0 packaging
+ * debian/patches/01_default_prefix.patch: Refreshed
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 16 Oct 2011 13:23:30 +0100
+
gnome-menus (3.0.1-2) unstable; urgency=low
* Upload to unstable.
Modified: desktop/experimental/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/control.in?rev=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/control.in [utf-8] Sun Oct 16 12:47:52 2011
@@ -5,8 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.73),
- libglib2.0-dev (>= 2.15.2),
- python-all-dev,
+ libglib2.0-dev (>= 2.29.15),
gnome-pkg-tools,
python-support (>= 0.6),
intltool (>= 0.40.0),
@@ -21,9 +20,7 @@
Package: gnome-menus
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- python-gmenu (= ${binary:Version})
+ ${misc:Depends}
Breaks: gnome-panel (<< 2.91),
gnome-control-center (<< 2.91),
alacarte (<< 0.13.2-2)
@@ -37,7 +34,7 @@
Also contained here are the GNOME menu layout configuration files, .directory
files and assorted menu related utility programs.
-Package: libgnome-menu2
+Package: libgnome-menu-3-0
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -52,12 +49,12 @@
.
This package contains the shared library.
-Package: libgnome-menu-dev
+Package: libgnome-menu-3-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libgnome-menu2 (= ${binary:Version}),
- gir1.2-gmenu-2.0 (= ${binary:Version}),
+ libgnome-menu-3-0 (= ${binary:Version}),
+ gir1.2-gmenu-3.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.15.2)
Replaces: gir-repository-dev (<< 0.6.5-6)
Description: GNOME implementation of the freedesktop menu specification
@@ -71,35 +68,17 @@
.
This package contains the development headers.
-Package: python-gmenu
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- python-gtk2
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: GNOME implementation of the freedesktop menu specification
- The package contains an implementation of the draft
- "Desktop Menu Specification" from freedesktop.org:
- .
- http://www.freedesktop.org/Standards/menu-spec
- .
- Also contained here are the GNOME menu layout configuration files, .directory
- files and assorted menu related utility programs.
- .
- This package contains the Python binding.
-
-Package: gir1.2-gmenu-2.0
+Package: gir1.2-gmenu-3.0
Section: libs
Architecture: any
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: gobject-introspection-repository, gir1.0-gmenu-2.0
+Conflicts: gobject-introspection-repository
Description: GObject introspection data for the GNOME menu library
This package contains introspection data for GNOME menu, an
implementation of the desktop menu specification from freedesktop.org.
+ .
It can be used by languages supporting dynamic bindings with
the GIRepository format.
+
Added: desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install?rev=30611&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install (added)
+++ desktop/experimental/gnome-menus/debian/gir1.2-gmenu-3.0.install [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0
Modified: desktop/experimental/gnome-menus/debian/gnome-menus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.install?rev=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.install [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.install [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,9 +1,6 @@
-etc
-usr/bin
-usr/share/locale
-usr/share/applications
-usr/share/gnome-menus/ui
-usr/share/desktop-directories
+debian/tmp/etc
+debian/tmp/usr/share/locale
debian/gnome-menus-blacklist /usr/sbin
debian/menus.blacklist /etc/gnome
+debian/tmp/usr/share/desktop-directories
debian/desktop-files/*.directory /usr/share/desktop-directories
Modified: desktop/experimental/gnome-menus/debian/gnome-menus.triggers
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/gnome-menus.triggers?rev=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/gnome-menus.triggers [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/gnome-menus.triggers [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,1 +1,2 @@
interest /usr/share/applications
+interest gmenucache
Added: desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install?rev=30611&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install (added)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.install [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/*.so.*
Added: desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.symbols?rev=30611&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.symbols (added)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-0.symbols [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,0 +1,45 @@
+libgnome-menu-3.so.0 libgnome-menu-3-0 #MINVER#
+ gmenu_tree_alias_get_aliased_directory at Base 3.2.0.1
+ gmenu_tree_alias_get_aliased_entry at Base 3.2.0.1
+ gmenu_tree_alias_get_aliased_item_type at Base 3.2.0.1
+ gmenu_tree_alias_get_directory at Base 3.2.0.1
+ gmenu_tree_alias_get_type at Base 3.2.0.1
+ gmenu_tree_directory_get_comment at Base 3.2.0.1
+ gmenu_tree_directory_get_desktop_file_path at Base 3.2.0.1
+ gmenu_tree_directory_get_generic_name at Base 3.2.0.1
+ gmenu_tree_directory_get_icon at Base 3.2.0.1
+ gmenu_tree_directory_get_is_nodisplay at Base 3.2.0.1
+ gmenu_tree_directory_get_menu_id at Base 3.2.0.1
+ gmenu_tree_directory_get_name at Base 3.2.0.1
+ gmenu_tree_directory_get_parent at Base 3.2.0.1
+ gmenu_tree_directory_get_type at Base 3.2.0.1
+ gmenu_tree_directory_iter at Base 3.2.0.1
+ gmenu_tree_directory_make_path at Base 3.2.0.1
+ gmenu_tree_entry_get_app_info at Base 3.2.0.1
+ gmenu_tree_entry_get_desktop_file_id at Base 3.2.0.1
+ gmenu_tree_entry_get_desktop_file_path at Base 3.2.0.1
+ gmenu_tree_entry_get_is_excluded at Base 3.2.0.1
+ gmenu_tree_entry_get_parent at Base 3.2.0.1
+ gmenu_tree_entry_get_type at Base 3.2.0.1
+ gmenu_tree_flags_get_type at Base 3.2.0.1
+ gmenu_tree_get_canonical_menu_path at Base 3.2.0.1
+ gmenu_tree_get_directory_from_path at Base 3.2.0.1
+ gmenu_tree_get_entry_by_id at Base 3.2.0.1
+ gmenu_tree_get_root_directory at Base 3.2.0.1
+ gmenu_tree_get_type at Base 3.2.0.1
+ gmenu_tree_header_get_directory at Base 3.2.0.1
+ gmenu_tree_header_get_type at Base 3.2.0.1
+ gmenu_tree_item_ref at Base 3.2.0.1
+ gmenu_tree_item_unref at Base 3.2.0.1
+ gmenu_tree_iter_get_alias at Base 3.2.0.1
+ gmenu_tree_iter_get_directory at Base 3.2.0.1
+ gmenu_tree_iter_get_entry at Base 3.2.0.1
+ gmenu_tree_iter_get_header at Base 3.2.0.1
+ gmenu_tree_iter_get_type at Base 3.2.0.1
+ gmenu_tree_iter_next at Base 3.2.0.1
+ gmenu_tree_iter_ref at Base 3.2.0.1
+ gmenu_tree_iter_unref at Base 3.2.0.1
+ gmenu_tree_load_sync at Base 3.2.0.1
+ gmenu_tree_new at Base 3.2.0.1
+ gmenu_tree_new_for_path at Base 3.2.0.1
+ gmenu_tree_separator_get_type at Base 3.2.0.1
Added: desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install?rev=30611&op=file
==============================================================================
--- desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install (added)
+++ desktop/experimental/gnome-menus/debian/libgnome-menu-3-dev.install [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,0 +1,5 @@
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gir-1.0
Modified: desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch?rev=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/patches/01_default_prefix.patch [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,8 +1,8 @@
-Index: gnome-menus-3.0.0/libmenu/gmenu-tree.c
-===================================================================
---- gnome-menus-3.0.0.orig/libmenu/gmenu-tree.c 2011-04-11 00:35:40.828974496 +0200
-+++ gnome-menus-3.0.0/libmenu/gmenu-tree.c 2011-04-11 00:45:53.891971611 +0200
-@@ -528,6 +528,16 @@ canonicalize_basename (GMenuTree *tree,
+diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
+index f580af0..68fc33b 100644
+--- a/libmenu/gmenu-tree.c
++++ b/libmenu/gmenu-tree.c
+@@ -389,6 +389,16 @@ canonicalize_basename (GMenuTree *tree,
}
}
@@ -17,11 +17,11 @@
+}
+
static gboolean
- gmenu_tree_canonicalize_path (GMenuTree *tree)
- {
-@@ -540,13 +550,10 @@ gmenu_tree_canonicalize_path (GMenuTree
+ gmenu_tree_canonicalize_path (GMenuTree *tree,
+ GError **error)
+@@ -411,13 +421,10 @@ gmenu_tree_canonicalize_path (GMenuTree *tree,
{
- gmenu_tree_remove_menu_file_monitors (tree);
+ menu_file = tree->basename;
- if (strcmp (tree->basename, "applications.menu") == 0 &&
- g_getenv ("XDG_MENU_PREFIX"))
@@ -35,7 +35,7 @@
canonicalize_basename (tree, prefixed_basename);
g_free (prefixed_basename);
}
-@@ -1923,13 +1930,10 @@ load_parent_merge_file (GMenuTree *
+@@ -1875,13 +1882,10 @@ load_parent_merge_file (GMenuTree *tree,
found = FALSE;
menu_file = g_strconcat (menu_name, ".menu", NULL);
@@ -51,16 +51,12 @@
found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
layout, prefixed_basename,
canonical_basedir);
-Index: gnome-menus-3.0.0/simple-editor/GMenuSimpleEditor/menutreemodel.py
-===================================================================
---- gnome-menus-3.0.0.orig/simple-editor/GMenuSimpleEditor/menutreemodel.py 2011-04-11 00:46:32.236159071 +0200
-+++ gnome-menus-3.0.0/simple-editor/GMenuSimpleEditor/menutreemodel.py 2011-04-11 00:50:14.801247125 +0200
-@@ -105,11 +105,11 @@ class MenuTreeModel (Gtk.TreeStore):
- self.icon_theme = Gtk.IconTheme.get_default ()
-
- if (len (menu_files) < 1):
-- menu_files = ["applications.menu", "settings.menu"]
-+ menu_files = ["applications.menu"]
+diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+index 2eded47..94a2559 100644
+--- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
++++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
+@@ -58,8 +58,8 @@ class MenuTreeModel (Gtk.TreeStore):
+ menu_files = ["applications.menu"]
for menu_file in menu_files:
- if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
@@ -68,5 +64,5 @@
+ if menu_file == "applications.menu":
+ menu_file = os.environ.get("XDG_MENU_PREFIX", "gnome-") + menu_file
- tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
- tree.sort_key = gmenu.SORT_DISPLAY_NAME
+ tree = GObject.new (GMenu.Tree, menu_basename = menu_file, flags = GMenu.TreeFlags.INCLUDE_EXCLUDED|GMenu.TreeFlags.SORT_DISPLAY_NAME)
+ tree.load_sync ()
Modified: desktop/experimental/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-menus/debian/rules?rev=30611&op=diff
==============================================================================
--- desktop/experimental/gnome-menus/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-menus/debian/rules [utf-8] Sun Oct 16 12:47:52 2011
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
DEB_BUILDDIR = debian/build
-DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-autotools.mk
@@ -19,11 +18,8 @@
build/gnome-menus:: $(OUTFILES)
binary-install/gnome-menus::
- mv debian/gnome-menus/etc/xdg/menus/applications.menu debian/gnome-menus/etc/xdg/menus/gnome-applications.menu
-
-binary-install/python-gmenu::
- # force executable bit on files looking like python scripts
- egrep -rlZ '^#!(.*)python' debian/python-gmenu/usr/lib/ | xargs -0 chmod a+x --
+ mv debian/gnome-menus/etc/xdg/menus/applications.menu \
+ debian/gnome-menus/etc/xdg/menus/gnome-applications.menu
clean::
-rm -f $(OUTFILES)
More information about the pkg-gnome-commits
mailing list