r27495 - in /packages/experimental/gnome-shell/debian: changelog control control.in gnome-shell.lintian-overrides patches/02_rpath-bluetooth-applet.patch patches/series rules shlibs.local
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Mon Apr 11 21:07:32 UTC 2011
Author: hertzog
Date: Mon Apr 11 21:07:13 2011
New Revision: 27495
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27495
Log:
* New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to
add an RPATH so that the compilation doesn't fail when g-ir-scanner
tries to analyze libgnome-shell.so linked against
libgnome-bluetooth-applet.so.0 which is in a private directory.
* Add a lintian override for the RPATH that we can't avoid.
* Teach dpkg-shlibdeps how to find that private lib and add the
corresponding dependency in debian/slibs.local.
* Update and add a bunch of build-depends to match the latest configure
requirements.
* Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends
because they are needed to benefit from the improved UI associated to the
respective status bar applet.
Added:
packages/experimental/gnome-shell/debian/gnome-shell.lintian-overrides
packages/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch
packages/experimental/gnome-shell/debian/shlibs.local
Modified:
packages/experimental/gnome-shell/debian/changelog
packages/experimental/gnome-shell/debian/control
packages/experimental/gnome-shell/debian/control.in
packages/experimental/gnome-shell/debian/patches/series
packages/experimental/gnome-shell/debian/rules
Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=27495&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Mon Apr 11 21:07:13 2011
@@ -1,4 +1,6 @@
-gnome-shell (3.0.0.2-1) UNRELEASED; urgency=low
+gnome-shell (3.0.0.2-1) experimental; urgency=low
+
+ * Team upload.
[ Frederic Peters ]
* New upstream release (2.91.93).
@@ -10,15 +12,24 @@
[ Raphaël Hertzog ]
* New upstream release (3.0.0.2).
- * Put libgnome-bluetooth in Build-Conflicts since build fails when bluetooth
- support is enabled. The libgnome-bluetooth-applet library is not found
- even if gnome-bluetooth is installed.
+ * New patch 02_rpath-bluetooth-applet.patch by Rico Tzschichholz to
+ add an RPATH so that the compilation doesn't fail when g-ir-scanner
+ tries to analyze libgnome-shell.so linked against
+ libgnome-bluetooth-applet.so.0 which is in a private directory.
+ * Add a lintian override for the RPATH that we can't avoid.
+ * Teach dpkg-shlibdeps how to find that private lib and add the
+ corresponding dependency in debian/slibs.local.
+ * Update and add a bunch of build-depends to match the latest configure
+ requirements.
+ * Add gir1.2-gnomebluetooth-1.0 and gir1.2-networkmanager-1.0 to Depends
+ because they are needed to benefit from the improved UI associated to the
+ respective status bar applet.
[ Laurent Bigonville ]
* debian/control.in: {Build-}Depends against gir1.2-mutter-3.0 instead of
gir1.2-mutter-2.91
- -- Laurent Bigonville <bigon at debian.org> Mon, 11 Apr 2011 00:44:26 +0200
+ -- Raphaël Hertzog <hertzog at debian.org> Mon, 11 Apr 2011 21:03:31 +0000
gnome-shell (2.91.92-1) experimental; urgency=low
Modified: packages/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control?rev=27495&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control [utf-8] Mon Apr 11 21:07:13 2011
@@ -7,7 +7,7 @@
Section: gnome
Priority: extra
Maintainer: Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Laurent Bigonville <bigon at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Laurent Bigonville <bigon at debian.org>
Build-Depends: cdbs,
debhelper (>= 7),
autotools-dev,
@@ -26,18 +26,22 @@
gir1.2-polkit-1.0,
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
+ gnome-bluetooth (>= 3.0.0),
+ gsettings-desktop-schemas-dev (>= 0.1.7),
libcroco3-dev (>= 0.6),
libdbus-glib-1-dev,
libgconf2-dev,
libgirepository1.0-dev (>= 0.9),
- libglib2.0-dev,
+ libglib2.0-dev (>= 2.25.9),
libglib2.0-bin (>= 2.25.11),
+ libgnome-bluetooth-dev (>= 3.0.0),
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-menu-dev,
libgstreamer0.10-dev (>= 0.10.16),
libgtk-3-dev (>= 3.0.0),
+ libnm-glib-dev (>= 0.8.995),
libstartup-notification0-dev,
- libmutter-dev (>= 2.91.93),
+ libmutter-dev (>= 3.0.0),
librsvg2-dev,
libwnck-dev,
libclutter-1.0-dev (>= 1.5.15),
@@ -45,13 +49,12 @@
libxss-dev,
libpulse-dev,
libcanberra-dev,
- libecal1.2-dev (>= 1.6.0),
- libedataserver1.2-dev (>= 1.2.0),
- libedataserverui1.2-dev (>= 1.2.0),
+ libecal1.2-dev (>= 2.32),
+ libedataserver1.2-dev (>= 3.0.0),
+ libedataserverui-3.0-dev (>= 3.0.0),
libtelepathy-glib-dev (>= 0.13.12),
libtelepathy-logger-dev (>= 0.2.4),
libpolkit-agent-1-dev (>= 0.100)
-Build-Conflicts: libgnome-bluetooth-dev
Standards-Version: 3.9.1
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gnome-shell
@@ -70,7 +73,9 @@
gnome-icon-theme-symbolic (>= 2.91),
gir1.2-gconf-2.0,
gir1.2-gkbd-3.0,
+ gir1.2-gnomebluetooth-1.0,
gir1.2-mutter-3.0,
+ gir1.2-networkmanager-1.0,
gir1.2-polkit-1.0,
gir1.2-upowerglib-1.0,
gir1.2-telepathyglib-0.12,
Modified: packages/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control.in?rev=27495&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control.in [utf-8] Mon Apr 11 21:07:13 2011
@@ -21,18 +21,22 @@
gir1.2-polkit-1.0,
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
+ gnome-bluetooth (>= 3.0.0),
+ gsettings-desktop-schemas-dev (>= 0.1.7),
libcroco3-dev (>= 0.6),
libdbus-glib-1-dev,
libgconf2-dev,
libgirepository1.0-dev (>= 0.9),
- libglib2.0-dev,
+ libglib2.0-dev (>= 2.25.9),
libglib2.0-bin (>= 2.25.11),
+ libgnome-bluetooth-dev (>= 3.0.0),
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-menu-dev,
libgstreamer0.10-dev (>= 0.10.16),
libgtk-3-dev (>= 3.0.0),
+ libnm-glib-dev (>= 0.8.995),
libstartup-notification0-dev,
- libmutter-dev (>= 2.91.93),
+ libmutter-dev (>= 3.0.0),
librsvg2-dev,
libwnck-dev,
libclutter-1.0-dev (>= 1.5.15),
@@ -40,13 +44,12 @@
libxss-dev,
libpulse-dev,
libcanberra-dev,
- libecal1.2-dev (>= 1.6.0),
- libedataserver1.2-dev (>= 1.2.0),
- libedataserverui1.2-dev (>= 1.2.0),
+ libecal1.2-dev (>= 2.32),
+ libedataserver1.2-dev (>= 3.0.0),
+ libedataserverui-3.0-dev (>= 3.0.0),
libtelepathy-glib-dev (>= 0.13.12),
libtelepathy-logger-dev (>= 0.2.4),
libpolkit-agent-1-dev (>= 0.100)
-Build-Conflicts: libgnome-bluetooth-dev
Standards-Version: 3.9.1
Homepage: http://live.gnome.org/GnomeShell
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gnome-shell
@@ -65,7 +68,9 @@
gnome-icon-theme-symbolic (>= 2.91),
gir1.2-gconf-2.0,
gir1.2-gkbd-3.0,
+ gir1.2-gnomebluetooth-1.0,
gir1.2-mutter-3.0,
+ gir1.2-networkmanager-1.0,
gir1.2-polkit-1.0,
gir1.2-upowerglib-1.0,
gir1.2-telepathyglib-0.12,
Added: packages/experimental/gnome-shell/debian/gnome-shell.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/gnome-shell.lintian-overrides?rev=27495&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/gnome-shell.lintian-overrides (added)
+++ packages/experimental/gnome-shell/debian/gnome-shell.lintian-overrides [utf-8] Mon Apr 11 21:07:13 2011
@@ -1,0 +1,3 @@
+# It's the only way we have to let gnome-shell find the private library it
+# links against through libgnome-shell.so
+gnome-shell: binary-or-shlib-defines-rpath usr/bin/gnome-shell /usr/lib/gnome-bluetooth
Added: packages/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch?rev=27495&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch (added)
+++ packages/experimental/gnome-shell/debian/patches/02_rpath-bluetooth-applet.patch [utf-8] Mon Apr 11 21:07:13 2011
@@ -1,0 +1,28 @@
+Description: Define rpath for linking against gnome-bluetooth
+ Modified by Raphael Hertzog to actually make it work.
+Author: Rico Tzschichholz <ricotz at ubuntu.com>
+Forwarded: no
+Last-Update: 2011-04-11
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -254,7 +254,7 @@ shell-enum-types.c: shell-enum-types.c.i
+ rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+
+-libgnome_shell_la_LDFLAGS = -avoid-version
++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir)
+ libgnome_shell_la_LIBADD = \
+ -lm \
+ $(GNOME_SHELL_LIBS) \
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -900,7 +900,7 @@ run_js_test_LDFLAGS = -export-dynamic
+ run_js_test_SOURCES = \
+ run-js-test.c
+
+-libgnome_shell_la_LDFLAGS = -avoid-version
++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir)
+ libgnome_shell_la_LIBADD = \
+ -lm \
+ $(GNOME_SHELL_LIBS) \
Modified: packages/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/series?rev=27495&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/patches/series [utf-8] Mon Apr 11 21:07:13 2011
@@ -1,1 +1,2 @@
01_favorite_apps.patch
+02_rpath-bluetooth-applet.patch
Modified: packages/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/rules?rev=27495&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/rules [utf-8] Mon Apr 11 21:07:13 2011
@@ -15,5 +15,6 @@
DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes
DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell
+DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth
DEB_INSTALL_CHANGELOGS_ALL = debian/upstream.gitlog
Added: packages/experimental/gnome-shell/debian/shlibs.local
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/shlibs.local?rev=27495&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/shlibs.local (added)
+++ packages/experimental/gnome-shell/debian/shlibs.local [utf-8] Mon Apr 11 21:07:13 2011
@@ -1,0 +1,1 @@
+libgnome-bluetooth-applet 0 gnome-bluetooth (>= 3.0.0)
More information about the pkg-gnome-commits
mailing list