r18021 - in /desktop/experimental/gnome-settings-daemon/debian: changelog control control.in gnome-settings-daemon.install patches/30_pkgconfig-path.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Dec 27 16:23:32 UTC 2008
Author: joss
Date: Sat Dec 27 16:23:32 2008
New Revision: 18021
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18021
Log:
Revert changes related to gnome-session 2.24
Added:
desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
desktop/experimental/gnome-settings-daemon/debian/patches/series
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=18021&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog Sat Dec 27 16:23:32 2008
@@ -8,8 +8,6 @@
* 02_missing_libs.patch: explicitly add X11 libraries to
SETTINGS_PLUGINS since plugins are actually relying on them being
available.
- * 30_pkgconfig-path.patch: removed, now g-s-d is started with the
- standard autostart mechanism.
* 70_relibtoolize.patch: new patch, relibtoolize the source.
* 99_ltmain_as-needed.patch: new patch, make --as-needed work.
* Pass -O1 -z defs --as-needed to the linker.
@@ -20,8 +18,8 @@
* gnome-settings-daemon.postinst: remove /etc/gnome/config/xrdb.
* Install .ad files in /etc/gnome/config to replace the ones from
capplets-data which are still used.
- * g-s-d breaks gnome-session < 2.24 because of the startup mechanism
- change.
+ * Do not install the autostart file since we still use gnome-session
+ 2.22 which will start g-s-d by hand.
-- Josselin Mouette <joss at debian.org> Sat, 27 Dec 2008 11:29:41 +0100
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=18021&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control Sat Dec 27 16:23:32 2008
@@ -44,7 +44,6 @@
banshee (<< 0.13.2+dfsg-7),
totem (<< 2.22.0),
gnome-control-center (<< 1:2.21.5)
-Breaks: gnome-session (<< 2.24)
Description: GNOME settings daemon
The package contains the GNOME daemon which handles the session settings
Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=18021&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in Sat Dec 27 16:23:32 2008
@@ -44,7 +44,6 @@
banshee (<< 0.13.2+dfsg-7),
totem (<< 2.22.0),
gnome-control-center (<< 1:2.21.5)
-Breaks: gnome-session (<< 2.24)
Description: GNOME settings daemon
The package contains the GNOME daemon which handles the session settings
Modified: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install?rev=18021&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install (original)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install Sat Dec 27 16:23:32 2008
@@ -1,4 +1,3 @@
-debian/tmp/etc/xdg
debian/tmp/etc/gconf/schemas
debian/tmp/usr/lib/gnome-settings-daemon*
debian/tmp/usr/share/icons
Added: desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch?rev=18021&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch Sat Dec 27 16:23:32 2008
@@ -1,0 +1,11 @@
+--- gnome-settings-daemon/data/gnome-settings-daemon.pc.in.orig 2007-11-03 02:19:59.340704956 +0100
++++ gnome-settings-daemon/data/gnome-settings-daemon.pc.in 2007-11-03 02:20:30.994508804 +0100
+@@ -2,6 +2,8 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++libexecdir=@libexecdir@
++binary=${libexecdir}/gnome-settings-daemon
+
+ Name: gnome-settings-daemon
+ Description: Utility library for accessing gnome-settings-daemon over DBUS
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=18021&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series Sat Dec 27 16:23:32 2008
@@ -1,5 +1,6 @@
01_xrdb.patch
02_missing_libs.patch
11_sleepkey.patch
+30_pkgconfig-path.patch
70_relibtoolize.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list