diff -Nru libglade2-2.6.4/debian/changelog libglade2-2.6.4/debian/changelog --- libglade2-2.6.4/debian/changelog 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/changelog 2013-12-26 14:07:02.000000000 +0000 @@ -1,34 +1,29 @@ -libglade2 (1:2.6.4-1ubuntu4) trusty; urgency=medium +libglade2 (1:2.6.4-2) unstable; urgency=low - * Build using dh-autoreconf. - - -- Matthias Klose Sun, 15 Dec 2013 13:56:55 +0100 + [ Emilio Pozuelo Monfort ] + * debian/libglade2-dev.lintian: + - Removed, libglade2-dev depends on python now. -libglade2 (1:2.6.4-1ubuntu3) saucy; urgency=low + [ Loïc Minier ] + * Fix globbing in watch file. + [ Josselin Mouette ] + * Patch from Steve Langasek to add MA support. Closes: #650787. + + Use MA installation paths. + + Switch do DH compat 9. + + Update {build-,}dependencies. + * Bump shlibs to take the new module path into account. * Use python:any dependency in the -dev package. + * Drop the .la file. + * 01_pre-multiarch_path.patch: new patch. Search modules in + the pre-multiarch version’s path. + * Bump standards version. + * Fix spelling error in description. Closes: #687367. + * Move to section oldlibs. + * Switch to 3.0 quilt format. + * Use dh-autoreconf. Closes: #558573. - -- Dmitrijs Ledkovs Mon, 16 Sep 2013 15:39:21 +0100 - -libglade2 (1:2.6.4-1ubuntu2) quantal; urgency=low - - * debian/patches/glade_multiarch_compat.patch: - - look to the old glade lib for compatibility (lp: #1003964) - - -- Sebastien Bacher Mon, 04 Jun 2012 19:26:04 +0200 - -libglade2 (1:2.6.4-1ubuntu1) precise; urgency=low - - * Build for multiarch. - - -- Steve Langasek Fri, 02 Dec 2011 16:34:19 -0800 - -libglade2 (1:2.6.4-1build1) lucid; urgency=low - - * rebuild rest of main for armel armv7/thumb2 optimization; - UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 - - -- Alexander Sack Sat, 06 Mar 2010 13:33:11 +0100 + -- Josselin Mouette Thu, 26 Dec 2013 12:56:27 +0100 libglade2 (1:2.6.4-1) unstable; urgency=low diff -Nru libglade2-2.6.4/debian/control libglade2-2.6.4/debian/control --- libglade2-2.6.4/debian/control 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/control 2013-12-26 14:29:58.000000000 +0000 @@ -2,15 +2,16 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. + Source: libglade2 Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Andreas Rottmann +Maintainer: Andreas Rottmann Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge -Standards-Version: 3.8.1 +Standards-Version: 3.9.4 Build-Depends: cdbs (>= 0.4.93~), - debhelper (>= 8.1.3~), + debhelper (>= 9), + dh-autoreconf, libgtk2.0-dev (>= 2.6.0), libglib2.0-dev (>= 2.10.0), python (>= 2.0), @@ -18,7 +19,6 @@ libatk1.0-dev (>= 1.9.0), zlib1g-dev, gnome-pkg-tools (>= 0.7), - dh-autoreconf, autotools-dev, dpkg-dev (>= 1.13.19), libglib2.0-doc, @@ -27,12 +27,12 @@ Package: libglade2-0 Architecture: any Multi-Arch: same -Section: libs +Section: oldlibs Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: library to load .glade files at runtime - This library allows to load externally stored user interfaces into + This library allows one to load externally stored user interfaces into programs. This allows alteration of the interface without recompilation of the program. . @@ -46,11 +46,11 @@ libglade2-0 (= ${binary:Version}), libgtk2.0-dev (>= 2.0.6), libxml2-dev, - python:any + python:any (>= 2.0) Replaces: libglade2-0 (<< 2.0.1-10) Suggests: glade | glade-gnome Description: development files for libglade - This library allows to load externally stored user interfaces into + This library allows one to load externally stored user interfaces into programs. This allows alteration of the interface without recompilation of the program. . diff -Nru libglade2-2.6.4/debian/control.in libglade2-2.6.4/debian/control.in --- libglade2-2.6.4/debian/control.in 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/control.in 2013-12-26 14:07:02.000000000 +0000 @@ -1,12 +1,12 @@ Source: libglade2 Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Andreas Rottmann +Maintainer: Andreas Rottmann Uploaders: @GNOME_TEAM@ -Standards-Version: 3.8.1 +Standards-Version: 3.9.4 Build-Depends: cdbs (>= 0.4.93~), - debhelper (>= 8.1.3~), + debhelper (>= 9), + dh-autoreconf, libgtk2.0-dev (>= 2.6.0), libglib2.0-dev (>= 2.10.0), python (>= 2.0), @@ -14,7 +14,6 @@ libatk1.0-dev (>= 1.9.0), zlib1g-dev, gnome-pkg-tools (>= 0.7), - dh-autoreconf, autotools-dev, dpkg-dev (>= 1.13.19), libglib2.0-doc, @@ -23,12 +22,12 @@ Package: libglade2-0 Architecture: any Multi-Arch: same -Section: libs +Section: oldlibs Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: library to load .glade files at runtime - This library allows to load externally stored user interfaces into + This library allows one to load externally stored user interfaces into programs. This allows alteration of the interface without recompilation of the program. . @@ -42,11 +41,11 @@ libglade2-0 (= ${binary:Version}), libgtk2.0-dev (>= 2.0.6), libxml2-dev, - python:any + python:any (>= 2.0) Replaces: libglade2-0 (<< 2.0.1-10) Suggests: glade | glade-gnome Description: development files for libglade - This library allows to load externally stored user interfaces into + This library allows one to load externally stored user interfaces into programs. This allows alteration of the interface without recompilation of the program. . diff -Nru libglade2-2.6.4/debian/libglade2-dev.install libglade2-2.6.4/debian/libglade2-dev.install --- libglade2-2.6.4/debian/libglade2-dev.install 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/libglade2-dev.install 2013-12-26 14:07:02.000000000 +0000 @@ -1,5 +1,5 @@ usr/include -usr/lib/*/libglade-2.0.{a,la,so} +usr/lib/*/libglade-2.0.{a,so} usr/lib/*/pkgconfig usr/bin usr/share/gtk-doc diff -Nru libglade2-2.6.4/debian/libglade2-dev.lintian libglade2-2.6.4/debian/libglade2-dev.lintian --- libglade2-2.6.4/debian/libglade2-dev.lintian 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/libglade2-dev.lintian 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libglade2-dev: python-script-but-no-python-dep ./usr/bin/libglade-convert diff -Nru libglade2-2.6.4/debian/patches/01_pre-multiarch_path.patch libglade2-2.6.4/debian/patches/01_pre-multiarch_path.patch --- libglade2-2.6.4/debian/patches/01_pre-multiarch_path.patch 1970-01-01 00:00:00.000000000 +0000 +++ libglade2-2.6.4/debian/patches/01_pre-multiarch_path.patch 2013-12-26 14:07:02.000000000 +0000 @@ -0,0 +1,12 @@ +Index: libglade2-2.6.4/glade/glade-init.c +=================================================================== +--- libglade2-2.6.4.orig/glade/glade-init.c 2009-03-17 15:19:00.000000000 +0100 ++++ libglade2-2.6.4/glade/glade-init.c 2013-12-26 12:54:42.313268959 +0100 +@@ -185,6 +185,7 @@ get_module_path (void) + + module_path = g_strconcat (module_path_env ? module_path_env : "", + module_path_env ? G_SEARCHPATH_SEPARATOR_S : "", ++ "/usr/lib/libglade/2.0/", G_SEARCHPATH_SEPARATOR_S, + default_dir, NULL); + + result = pango_split_file_list (module_path); diff -Nru libglade2-2.6.4/debian/patches/glade_multiarch_compat.patch libglade2-2.6.4/debian/patches/glade_multiarch_compat.patch --- libglade2-2.6.4/debian/patches/glade_multiarch_compat.patch 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/patches/glade_multiarch_compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---- glade/glade-init.c.gnome 2012-06-04 19:19:02.102282407 +0200 -+++ glade/glade-init.c 2012-06-04 19:23:21.930284204 +0200 -@@ -267,9 +267,15 @@ - module = find_module (module_path, library); - - if (!module) { -- g_warning("Could not load support for `%s': %s", library, -- g_module_error()); -- return; -+ gchar **result; -+ result = pango_split_file_list ("/usr/lib/libglade/2.0/"); -+ module = find_module (result, library); -+ g_strfreev (result); -+ if (!module) { -+ g_warning("Could not load support for `%s': %s", library, -+ g_module_error()); -+ return; -+ } - } - - if (!g_module_symbol(module, "glade_module_register_widgets", diff -Nru libglade2-2.6.4/debian/patches/series libglade2-2.6.4/debian/patches/series --- libglade2-2.6.4/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libglade2-2.6.4/debian/patches/series 2013-12-26 14:07:02.000000000 +0000 @@ -0,0 +1 @@ +01_pre-multiarch_path.patch diff -Nru libglade2-2.6.4/debian/rules libglade2-2.6.4/debian/rules --- libglade2-2.6.4/debian/rules 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/rules 2013-12-26 14:07:02.000000000 +0000 @@ -3,7 +3,6 @@ include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk @@ -11,5 +10,5 @@ GNOME_MODULE := libglade DEB_DH_INSTALL_ARGS += --sourcedir=debian/tmp -DEB_DH_MAKESHLIBS_ARGS_libglade2-0 += -V 'libglade2-0 (>= 1:2.6.1)' +DEB_DH_MAKESHLIBS_ARGS_libglade2-0 += -V 'libglade2-0 (>= 1:2.6.4-2~)' DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) diff -Nru libglade2-2.6.4/debian/source/format libglade2-2.6.4/debian/source/format --- libglade2-2.6.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ libglade2-2.6.4/debian/source/format 2014-02-13 12:05:15.480400964 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libglade2-2.6.4/debian/watch libglade2-2.6.4/debian/watch --- libglade2-2.6.4/debian/watch 2014-02-13 12:05:15.000000000 +0000 +++ libglade2-2.6.4/debian/watch 2012-01-06 13:48:06.000000000 +0000 @@ -1,4 +1,4 @@ version=2 -http://ftp.gnome.org/pub/GNOME/sources/libglade/([\d\.]+)[02468]/ \ +http://ftp.gnome.org/pub/GNOME/sources/libglade/([\d\.]+[02468])/ \ libglade-(.*)\.tar\.gz \ debian uupdate