r40060 - in /desktop/experimental/gnome-control-center/debian: changelog control control.in patches/background-Fix-compilation-with-libsocialweb.patch patches/background-Fix-test-chooser-dialog-build-with-some-l.patch patches/series
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Oct 21 19:07:30 UTC 2013
Author: sjoerd
Date: Mon Oct 21 19:07:29 2013
New Revision: 40060
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40060
Log:
* New upstream release
* debian/patches/background-Fix-compilation-with-libsocialweb.patch
+ Fix compilation with libsocialweb
* debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch
+ Fix compilation with more strictl linkers
Added:
desktop/experimental/gnome-control-center/debian/patches/background-Fix-compilation-with-libsocialweb.patch
desktop/experimental/gnome-control-center/debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch
Modified:
desktop/experimental/gnome-control-center/debian/changelog
desktop/experimental/gnome-control-center/debian/control
desktop/experimental/gnome-control-center/debian/control.in
desktop/experimental/gnome-control-center/debian/patches/series
Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=40060&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Mon Oct 21 19:07:29 2013
@@ -1,3 +1,13 @@
+gnome-control-center (1:3.10.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/background-Fix-compilation-with-libsocialweb.patch
+ + Fix compilation with libsocialweb
+ * debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch
+ + Fix compilation with more strictl linkers
+
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 21 Oct 2013 20:32:34 +0200
+
gnome-control-center (1:3.8.3-3) unstable; urgency=low
* Drop recommends on gnome-session, it doesn't seem to be needed anymore
Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=40060&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Mon Oct 21 19:07:29 2013
@@ -19,7 +19,7 @@
gnome-common,
gnome-pkg-tools (>= 0.10),
gnome-settings-daemon-dev (>= 3.7.3),
- gsettings-desktop-schemas-dev (>= 3.7.2.2),
+ gsettings-desktop-schemas-dev (>= 3.9.91),
gtk-doc-tools,
intltool (>= 0.37.1),
libcanberra-gtk3-dev,
@@ -31,14 +31,14 @@
libdbus-glib-1-dev (>= 0.32),
libgdk-pixbuf2.0-dev (>= 2.23.0),
libgirepository1.0-dev,
- libglib2.0-dev (>= 2.35.1),
+ libglib2.0-dev (>= 2.37.7),
libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
- libgnome-desktop-3-dev (>= 3.7.5),
+ libgnome-desktop-3-dev (>= 3.9.90),
libgnome-menu-3-dev,
libgnomekbd-dev (>= 2.91.91),
libibus-1.0-dev (>= 1.5.2),
- libgoa-1.0-dev (>= 3.8.1),
- libgtk-3-dev (>= 3.7.7),
+ libgoa-1.0-dev (>= 3.9.90),
+ libgtk-3-dev (>= 3.9.12),
libgtop2-dev,
libnm-glib-dev (>= 0.9.8) [linux-any],
libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
@@ -61,6 +61,7 @@
network-manager-dev (>= 0.9.8) [linux-any],
libnm-util-dev (>= 0.9.8) [linux-any],
libnm-glib-dev (>= 0.9.8) [linux-any],
+ libmm-glib-dev [linux-any],
shared-mime-info
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-control-center/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-control-center/
Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=40060&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Mon Oct 21 19:07:29 2013
@@ -14,7 +14,7 @@
gnome-common,
gnome-pkg-tools (>= 0.10),
gnome-settings-daemon-dev (>= 3.7.3),
- gsettings-desktop-schemas-dev (>= 3.7.2.2),
+ gsettings-desktop-schemas-dev (>= 3.9.91),
gtk-doc-tools,
intltool (>= 0.37.1),
libcanberra-gtk3-dev,
@@ -26,14 +26,14 @@
libdbus-glib-1-dev (>= 0.32),
libgdk-pixbuf2.0-dev (>= 2.23.0),
libgirepository1.0-dev,
- libglib2.0-dev (>= 2.35.1),
+ libglib2.0-dev (>= 2.37.7),
libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
- libgnome-desktop-3-dev (>= 3.7.5),
+ libgnome-desktop-3-dev (>= 3.9.90),
libgnome-menu-3-dev,
libgnomekbd-dev (>= 2.91.91),
libibus-1.0-dev (>= 1.5.2),
- libgoa-1.0-dev (>= 3.8.1),
- libgtk-3-dev (>= 3.7.7),
+ libgoa-1.0-dev (>= 3.9.90),
+ libgtk-3-dev (>= 3.9.12),
libgtop2-dev,
libnm-glib-dev (>= 0.9.8) [linux-any],
libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
@@ -56,6 +56,7 @@
network-manager-dev (>= 0.9.8) [linux-any],
libnm-util-dev (>= 0.9.8) [linux-any],
libnm-glib-dev (>= 0.9.8) [linux-any],
+ libmm-glib-dev [linux-any],
shared-mime-info
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-control-center/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-control-center/
Added: desktop/experimental/gnome-control-center/debian/patches/background-Fix-compilation-with-libsocialweb.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/background-Fix-compilation-with-libsocialweb.patch?rev=40060&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/background-Fix-compilation-with-libsocialweb.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/background-Fix-compilation-with-libsocialweb.patch [utf-8] Mon Oct 21 19:07:29 2013
@@ -0,0 +1,36 @@
+From 1ee2ac79b47eae725bd8d1d54adfaa06086ebae8 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 21 Oct 2013 20:29:12 +0200
+Subject: [PATCH] background: Fix compilation with libsocialweb
+
+When compiling with libsocialweb:
+./.libs/libbackground-chooser.a(cc-background-chooser-dialog.o): In
+ function `cc_background_chooser_dialog_init':
+/home/sjoerd/Debian/build-area/gnome-control-center-3.10.1/panels/background/cc-background-chooser-dialog.c:282:
+ undefined reference to `bg_flickr_source_new'
+
+Ensuring the flicker-source source files are part of
+libbackground-chooser.la fixes this
+---
+ panels/background/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index 2766207..58e39aa 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -49,9 +49,9 @@ libbackground_la_SOURCES = \
+ libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
+
+ if WITH_LIBSOCIALWEB
+-libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
++libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
+ INCLUDES += $(SOCIALWEB_CFLAGS)
+-libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
++libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS)
+ endif
+
+ noinst_PROGRAMS = test-chooser-dialog
+--
+1.8.4.rc3
+
Added: desktop/experimental/gnome-control-center/debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch?rev=40060&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/background-Fix-test-chooser-dialog-build-with-some-l.patch [utf-8] Mon Oct 21 19:07:29 2013
@@ -0,0 +1,28 @@
+From f08a22526c050d2032c926c5bc045927a646ea4a Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Wed, 16 Oct 2013 12:01:36 +0200
+Subject: [PATCH] background: Fix test-chooser-dialog build with some linkers
+
+List missing libs for the libbackground-chooser.la convenience library.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=709302
+---
+ panels/background/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index f24f8b3..2766207 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
++
+ libbackground_la_SOURCES = \
+ cc-background-panel.c \
+ cc-background-panel.h
+--
+1.8.4.rc3
+
Modified: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=40060&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Mon Oct 21 19:07:29 2013
@@ -1,2 +1,4 @@
01_menu_category.patch
06_handle_passwd_with_ldap.patch
+background-Fix-test-chooser-dialog-build-with-some-l.patch
+background-Fix-compilation-with-libsocialweb.patch
More information about the pkg-gnome-commits
mailing list