r40370 - in /attic/libgnome/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 27 11:45:31 UTC 2013
Author: joss
Date: Fri Dec 27 11:45:30 2013
New Revision: 40370
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40370
Log:
* Add missing build-dependency on gnome-common.
* Migrate to multiarch. Closes: #642415, #731295.
+ Bump build-dependencies.
+ Split libgnome2-0 into libgnome-2-0 (library, MA: same) and
libgnome2-bin (binary, MA: foreign).
+ Make libgnome2-common MA: foreign and libgnome2-dev MA: same.
+ Keep libgnome2-0 arch: any and MA: same so that multi-arch
packages can still depend on it.
+ Update installation paths.
+ Build-depend on MA version of libbonobo.
* Remove gnome:Version.
* 00_as-needed.patch: dropped, obsolete.
* 03_multiarch.patch: revert the logic, use /usr/lib as a fallback in
search paths.
Added:
attic/libgnome/debian/libgnome-2-0.install
- copied, changed from r40369, attic/libgnome/debian/libgnome2-0.install
attic/libgnome/debian/libgnome2-bin.install
- copied, changed from r40369, attic/libgnome/debian/libgnome2-0.install
attic/libgnome/debian/libgnome2-bin.manpages
- copied unchanged from r40369, attic/libgnome/debian/libgnome2-0.manpages
Removed:
attic/libgnome/debian/libgnome2-0.install
attic/libgnome/debian/libgnome2-0.manpages
attic/libgnome/debian/libgnome2-0.shlibs
attic/libgnome/debian/patches/00_as-needed.patch
Modified:
attic/libgnome/debian/changelog
attic/libgnome/debian/control
attic/libgnome/debian/control.in
attic/libgnome/debian/libgnome2-dev.install
attic/libgnome/debian/patches/03_multiarch.patch
attic/libgnome/debian/patches/series
attic/libgnome/debian/rules
Modified: attic/libgnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/changelog?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/changelog [utf-8] (original)
+++ attic/libgnome/debian/changelog [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,9 +1,26 @@
-libgnome (2.32.1-5) UNRELEASED; urgency=low
-
+libgnome (2.32.1-5) unstable; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
* debian/control.in:
+ Move to section oldlibs.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 26 Oct 2013 16:54:53 +0200
+ [ Josselin Mouette ]
+ * Add missing build-dependency on gnome-common.
+ * Migrate to multiarch. Closes: #642415, #731295.
+ + Bump build-dependencies.
+ + Split libgnome2-0 into libgnome-2-0 (library, MA: same) and
+ libgnome2-bin (binary, MA: foreign).
+ + Make libgnome2-common MA: foreign and libgnome2-dev MA: same.
+ + Keep libgnome2-0 arch: any and MA: same so that multi-arch
+ packages can still depend on it.
+ + Update installation paths.
+ + Build-depend on MA version of libbonobo.
+ * Remove gnome:Version.
+ * 00_as-needed.patch: dropped, obsolete.
+ * 03_multiarch.patch: revert the logic, use /usr/lib as a fallback in
+ search paths.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 27 Dec 2013 12:07:07 +0100
libgnome (2.32.1-4) unstable; urgency=low
Modified: attic/libgnome/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/control?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/control [utf-8] (original)
+++ attic/libgnome/debian/control [utf-8] Fri Dec 27 11:45:30 2013
@@ -9,38 +9,63 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
dh-autoreconf,
libgnomevfs2-dev (>= 2.7.91-3),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libpopt-dev,
intltool (>= 0.40.0),
libgconf2-dev (>= 2.7.92),
libcanberra-dev,
libglib2.0-dev (>= 2.16.0),
- cdbs (>= 0.4.41),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
gtk-doc-tools (>= 1.0),
+ gnome-common,
docbook-xml
Build-Depends-Indep: libglib2.0-doc
Package: libgnome2-0
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libgnome2-common (>= ${gnome:Version}),
- libgnome2-common (<< ${gnome:NextVersion}),
- gvfs
+ libgnome-2-0 (= ${binary:Version}),
+ libgnome2-bin (= ${binary:Version})
+Description: The GNOME library - transition package
+ This convenience package is for upgrades.
+
+Package: libgnome2-bin
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libgnome2-0 (<< 2.32.1-5)
+Replaces: libgnome2-0 (<< 2.32.1-5)
+Description: The GNOME library - binary files
+ This package contains gnome-open, a utility that exposes functionality from
+ the base GNOME library.
+
+Package: libgnome-2-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libgnome2-common (= ${source:Version})
+Breaks: libgnome2-0 (<< 2.32.1-5)
+Replaces: libgnome2-0 (<< 2.32.1-5)
Description: The GNOME library - runtime files
This package contains the shared library for the base GNOME library
functions.
Package: libgnome2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
- libgnome2-0 (= ${binary:Version}),
+ libgnome-2-0 (= ${binary:Version}),
libglib2.0-dev,
libbonobo2-dev,
liborbit2-dev,
@@ -50,11 +75,12 @@
libpopt-dev
Suggests: libgnome2-doc
Description: The GNOME library - development files
- This package contains the shared library for the base GNOME library
- functions.
+ This package contains the static library and development headers for
+ the base GNOME library functions.
Package: libgnome2-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: gnome-panel (<< 2.28)
Suggests: desktop-base (>= 0.3.16)
@@ -75,7 +101,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: libgnome2-0 (= ${binary:Version}),
+Depends: libgnome-2-0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: The GNOME library - debugging symbols
Modified: attic/libgnome/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/control.in?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/control.in [utf-8] (original)
+++ attic/libgnome/debian/control.in [utf-8] Fri Dec 27 11:45:30 2013
@@ -4,38 +4,63 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
dh-autoreconf,
libgnomevfs2-dev (>= 2.7.91-3),
- libbonobo2-dev (>= 2.13.0),
+ libbonobo2-dev (>= 2.32.1-3~),
libpopt-dev,
intltool (>= 0.40.0),
libgconf2-dev (>= 2.7.92),
libcanberra-dev,
libglib2.0-dev (>= 2.16.0),
- cdbs (>= 0.4.41),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
gtk-doc-tools (>= 1.0),
+ gnome-common,
docbook-xml
Build-Depends-Indep: libglib2.0-doc
Package: libgnome2-0
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libgnome2-common (>= ${gnome:Version}),
- libgnome2-common (<< ${gnome:NextVersion}),
- gvfs
+ libgnome-2-0 (= ${binary:Version}),
+ libgnome2-bin (= ${binary:Version})
+Description: The GNOME library - transition package
+ This convenience package is for upgrades.
+
+Package: libgnome2-bin
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: libgnome2-0 (<< 2.32.1-5)
+Replaces: libgnome2-0 (<< 2.32.1-5)
+Description: The GNOME library - binary files
+ This package contains gnome-open, a utility that exposes functionality from
+ the base GNOME library.
+
+Package: libgnome-2-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libgnome2-common (= ${source:Version})
+Breaks: libgnome2-0 (<< 2.32.1-5)
+Replaces: libgnome2-0 (<< 2.32.1-5)
Description: The GNOME library - runtime files
This package contains the shared library for the base GNOME library
functions.
Package: libgnome2-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
- libgnome2-0 (= ${binary:Version}),
+ libgnome-2-0 (= ${binary:Version}),
libglib2.0-dev,
libbonobo2-dev,
liborbit2-dev,
@@ -45,11 +70,12 @@
libpopt-dev
Suggests: libgnome2-doc
Description: The GNOME library - development files
- This package contains the shared library for the base GNOME library
- functions.
+ This package contains the static library and development headers for
+ the base GNOME library functions.
Package: libgnome2-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: gnome-panel (<< 2.28)
Suggests: desktop-base (>= 0.3.16)
@@ -70,7 +96,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: libgnome2-0 (= ${binary:Version}),
+Depends: libgnome-2-0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: The GNOME library - debugging symbols
Copied: attic/libgnome/debian/libgnome-2-0.install (from r40369, attic/libgnome/debian/libgnome2-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/libgnome-2-0.install?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/libgnome2-0.install [utf-8] (original)
+++ attic/libgnome/debian/libgnome-2-0.install [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,4 +1,3 @@
-usr/lib/libgnome-2.so.*
-usr/lib/bonobo/monikers/libmoniker_extra_2.so
-usr/lib/bonobo/servers/
-usr/bin/
+usr/lib/*/libgnome-2.so.*
+usr/lib/*/bonobo/monikers/libmoniker_extra_2.so
+usr/lib/*/bonobo/servers/
Copied: attic/libgnome/debian/libgnome2-bin.install (from r40369, attic/libgnome/debian/libgnome2-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/libgnome2-bin.install?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/libgnome2-0.install [utf-8] (original)
+++ attic/libgnome/debian/libgnome2-bin.install [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,4 +1 @@
-usr/lib/libgnome-2.so.*
-usr/lib/bonobo/monikers/libmoniker_extra_2.so
-usr/lib/bonobo/servers/
usr/bin/
Modified: attic/libgnome/debian/libgnome2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/libgnome2-dev.install?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/libgnome2-dev.install [utf-8] (original)
+++ attic/libgnome/debian/libgnome2-dev.install [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,4 +1,4 @@
usr/include
-usr/lib/pkgconfig
-usr/lib/libgnome-2.a
-usr/lib/libgnome-2.so
+usr/lib/*/pkgconfig
+usr/lib/*/libgnome-2.a
+usr/lib/*/libgnome-2.so
Modified: attic/libgnome/debian/patches/03_multiarch.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/patches/03_multiarch.patch?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/patches/03_multiarch.patch [utf-8] (original)
+++ attic/libgnome/debian/patches/03_multiarch.patch [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,52 +1,83 @@
-diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c
-index fa8e62d..3f32d39 100644
---- a/libgnome/gnome-program.c
-+++ b/libgnome/gnome-program.c
-@@ -1669,27 +1669,38 @@ gnome_program_parse_args (GnomeProgram *program)
+Index: libgnome-2.32.1/libgnome/gnome-program.c
+===================================================================
+--- libgnome-2.32.1.orig/libgnome/gnome-program.c 2013-12-27 12:30:31.129282398 +0100
++++ libgnome-2.32.1/libgnome/gnome-program.c 2013-12-27 12:31:01.156201289 +0100
+@@ -935,7 +935,7 @@ gnome_program_locate_file (GnomeProgram
+
+ switch (domain) {
+ case GNOME_FILE_DOMAIN_LIBDIR:
+- prefix_rel = "/lib";
++ prefix_rel = "/lib/" MULTIARCH;
+ attr_name = GNOME_PARAM_GNOME_LIBDIR;
+ attr_rel = "";
+ break;
+@@ -1512,10 +1512,10 @@ get_module_path (void)
+
+ if (module_path_env)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- module_path_env, LIBGNOME_LIBDIR, NULL);
++ module_path_env, LIBGNOME_LIBDIR, "/usr/lib", NULL);
+ else
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- LIBGNOME_LIBDIR, NULL);
++ LIBGNOME_LIBDIR, "/usr/lib", NULL);
+
+ result = split_file_list (module_path);
+ g_free (module_path);
+@@ -1669,29 +1669,41 @@ gnome_program_parse_args (GnomeProgram *
static char *
find_accessibility_module (GnomeProgram *program, const char *libname)
{
- char *sub;
-+ char *sub0, *sub1;
++ char *fname0;
++ char *fname1;
++ char *sub0;
++ char *sub1;
char *path;
- char *fname;
- char *retval;
+- char *fname;
+- char *retval;
- fname = g_strconcat (libname, "." G_MODULE_SUFFIX, NULL);
+- fname = g_strconcat (libname, "." G_MODULE_SUFFIX, NULL);
- sub = g_strconcat ("gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
-+ sub0 = g_strconcat (MULTIARCH, G_DIR_SEPARATOR_S, "gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
-+ sub1 = g_strconcat ("gtk-2.0/modules", G_DIR_SEPARATOR_S, fname, NULL);
++ fname0 = g_strconcat (libname, "." G_MODULE_SUFFIX, NULL);
++ fname1 = g_strconcat ("../", fname0, NULL);
++ sub0 = g_strconcat ("gtk-2.0/modules", G_DIR_SEPARATOR_S, fname0, NULL);
++ sub1 = g_strconcat ("../", sub0, NULL);
- path = gnome_program_locate_file (
+- path = gnome_program_locate_file (
- program, GNOME_FILE_DOMAIN_LIBDIR, sub, TRUE, NULL);
++ /* Whoever wrote gnome_program_locate_file needs hanging.
++ We're stuck with ugly workarounds. */
+
+- g_free (sub);
++ path = gnome_program_locate_file (
+ program, GNOME_FILE_DOMAIN_LIBDIR, sub0, TRUE, NULL);
-- g_free (sub);
-+ if (path) {
-+ retval = path;
-+ goto out;
-+ }
-+
-+ path = gnome_program_locate_file (
-+ program, GNOME_FILE_DOMAIN_LIBDIR, sub1, TRUE, NULL);
-
- if (path)
-+ if (path) {
- retval = path;
+- retval = path;
- else
- retval = gnome_program_locate_file (
-- program, GNOME_FILE_DOMAIN_LIBDIR,
++ if (!path)
++ path = gnome_program_locate_file (
++ program, GNOME_FILE_DOMAIN_LIBDIR, sub1, TRUE, NULL);
++ if (!path)
++ path = gnome_program_locate_file (
++ program, GNOME_FILE_DOMAIN_LIBDIR,
++ fname0, TRUE, NULL);
++ if (!path)
++ path = gnome_program_locate_file (
+ program, GNOME_FILE_DOMAIN_LIBDIR,
- fname, TRUE, NULL);
-+ goto out;
-+ }
-+
-+ retval = gnome_program_locate_file (
-+ program, GNOME_FILE_DOMAIN_LIBDIR, fname, TRUE, NULL);
++ fname1, TRUE, NULL);
-+out:
- g_free (fname);
+- g_free (fname);
+ g_free (sub0);
+ g_free (sub1);
++ g_free (fname0);
++ g_free (fname1);
- return retval;
+- return retval;
++ return path;
}
+
+ static gboolean
Modified: attic/libgnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/patches/series?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/patches/series [utf-8] (original)
+++ attic/libgnome/debian/patches/series [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,4 +1,3 @@
-00_as-needed.patch
02_path_max.patch
03_multiarch.patch
04_disable_deprecated.patch
Modified: attic/libgnome/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libgnome/debian/rules?rev=40370&op=diff
==============================================================================
--- attic/libgnome/debian/rules [utf-8] (original)
+++ attic/libgnome/debian/rules [utf-8] Fri Dec 27 11:45:30 2013
@@ -1,18 +1,19 @@
#!/usr/bin/make -f
+
+TARBALL_EXT = tar.bz2
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
CFLAGS += -include debian.h
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
makebuilddir::
echo '#define MULTIARCH "${DEB_HOST_MULTIARCH}"' >debian.h
More information about the pkg-gnome-commits
mailing list