--- Begin Message ---
Package: glade
Version: 3.14.2-1
Severity: wishlist
Tags: patch
Hello glade maintainers,
I have recently packaged latest upstream release, 3.14.2.
Find changes on the patch attached.
Kind regards
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (900, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.7-trunk-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages glade depends on:
ii libc6 2.13-38
ii libgladeui-2-0 3.14.2-1
ii libglib2.0-0 2.34.3-1
ii libgtk-3-0 3.6.4-1
Versions of packages glade recommends:
pn devhelp <none>
ii libgtk-3-dev 3.6.4-1
glade suggests no packages.
-- no debconf information
Index: control.in
===================================================================
--- control.in (revision 36600)
+++ control.in (working copy)
@@ -9,13 +9,14 @@
debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
libxml2-dev (>= 2.4.0),
- libgtk-3-dev (>= 3.4.0),
- python-gi-dev (>= 2.29.4),
+ libgtk-3-dev (>= 3.6.0),
+ python-gi-dev (>= 2.90.4),
gtk-doc-tools (>= 1.13),
gnome-doc-utils (>= 0.18),
intltool (>= 0.41.0),
gobject-introspection (>= 0.10.1),
- libgirepository1.0-dev (>= 0.10.1)
+ libgirepository1.0-dev (>= 0.10.1),
+ itstool
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc
Standards-Version: 3.9.3
Index: control
===================================================================
--- control (revision 36600)
+++ control (working copy)
@@ -14,13 +14,14 @@
debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
libxml2-dev (>= 2.4.0),
- libgtk-3-dev (>= 3.4.0),
- python-gi-dev (>= 2.29.4),
+ libgtk-3-dev (>= 3.6.0),
+ python-gi-dev (>= 2.90.4),
gtk-doc-tools (>= 1.13),
gnome-doc-utils (>= 0.18),
intltool (>= 0.41.0),
gobject-introspection (>= 0.10.1),
- libgirepository1.0-dev (>= 0.10.1)
+ libgirepository1.0-dev (>= 0.10.1),
+ itstool
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc
Standards-Version: 3.9.3
Index: glade.install
===================================================================
--- glade.install (revision 36600)
+++ glade.install (working copy)
@@ -1,6 +1,4 @@
usr/bin
usr/share/icons/hicolor
usr/share/applications
-usr/share/omf
-usr/share/gnome
debian/glade.xpm usr/share/pixmaps/
Index: changelog
===================================================================
--- changelog (revision 36600)
+++ changelog (working copy)
@@ -1,3 +1,12 @@
+glade (3.14.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + add itstool as build dependency.
+ + upgrade libgtk-3-dev version depend
+
+ -- Hector Oron <[email protected]> Mon, 21 Jan 2013 01:42:30 +0100
+
glade (3.12.1-1) unstable; urgency=low
* New upstream release.
Index: patches/series
===================================================================
--- patches/series (revision 36600)
+++ patches/series (working copy)
@@ -1,2 +1 @@
-01_dont_hardcode_library_search_paths.patch
99_ltmain_as-needed.patch
Index: patches/01_dont_hardcode_library_search_paths.patch
===================================================================
--- patches/01_dont_hardcode_library_search_paths.patch (revision 36600)
+++ patches/01_dont_hardcode_library_search_paths.patch (working copy)
@@ -1,59 +0,0 @@
-Description: Don't hard-code library search paths
- Instead skip the directory when calling g_module_build_path () and let
- g_module_open () search the default system directories which includes the
- multiarch location.
-Author: Julien Cristau <[email protected]>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666241
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675977
-diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
-index bf9542e..b764a93 100644
---- a/gladeui/glade-utils.c
-+++ b/gladeui/glade-utils.c
-@@ -854,12 +854,12 @@ try_load_library (const gchar *library_path, const gchar *library_name)
- GModule *module = NULL;
- gchar *path;
-
-- path = g_module_build_path (library_path, library_name);
-- if (g_file_test (path, G_FILE_TEST_EXISTS))
-- {
-- if (!(module = g_module_open (path, G_MODULE_BIND_LAZY)))
-- g_warning ("Failed to load %s: %s", path, g_module_error ());
-- }
-+ if (library_path)
-+ path = g_module_build_path (library_path, library_name);
-+ else
-+ path = g_module_build_path (NULL, library_name);
-+ if (!(module = g_module_open (path, G_MODULE_BIND_LAZY)))
-+ g_debug ("Failed to load %s: %s", path, g_module_error ());
- g_free (path);
-
- return module;
-@@ -882,8 +882,6 @@ glade_util_load_library (const gchar *library_name)
- {
- gchar *default_paths[] = { (gchar *) glade_app_get_modules_dir (),
- NULL, /* <-- dynamically allocated */
-- "/lib",
-- "/usr/lib",
- "/usr/local/lib",
- NULL
- };
-@@ -909,7 +907,7 @@ glade_util_load_library (const gchar *library_name)
-
- if (!module)
- {
-- /* Search ${prefix}/lib after searching ${prefix}/lib/glade3/modules... */
-+ /* Search ${prefix}/lib after searching ${prefix}/lib/glade/modules... */
- default_paths[1] =
- g_build_filename (glade_app_get_modules_dir (), "..", "..", NULL);
-
-@@ -921,6 +919,10 @@ glade_util_load_library (const gchar *library_name)
- g_free (default_paths[1]);
- }
-
-+ /* Use default system paths */
-+ if (!module)
-+ module = try_load_library (NULL, library_name);
-+
- if (!module)
- g_critical ("Unable to load module '%s' from any search paths",
- library_name);
--- End Message ---
