r25868 - in /desktop/experimental/gnome-settings-daemon/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Dec 11 15:29:50 UTC 2010
Author: sjoerd
Date: Sat Dec 11 15:29:47 2010
New Revision: 25868
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25868
Log:
First round of g-s-d updates
Removed:
desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch
desktop/experimental/gnome-settings-daemon/debian/patches/03_maintainer_mode.patch
desktop/experimental/gnome-settings-daemon/debian/patches/10_clipboard_crash.patch
desktop/experimental/gnome-settings-daemon/debian/patches/12_monitor_network_fs.patch
desktop/experimental/gnome-settings-daemon/debian/patches/20_gstreamer.patch
desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch
desktop/experimental/gnome-settings-daemon/debian/patches/70_relibtoolize.patch
desktop/experimental/gnome-settings-daemon/debian/patches/99_ltmain_as-needed.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/13_monitor_kfreebsd.patch
desktop/experimental/gnome-settings-daemon/debian/patches/series
desktop/experimental/gnome-settings-daemon/debian/rules
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat Dec 11 15:29:47 2010
@@ -1,3 +1,31 @@
+gnome-settings-daemon (2.91.5-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/control.in: Update build-depends to gnome 3.0 versions
+ * debian/patches/01_xrdb.patch
+ - Removed. g-s-d no longer manages xrdb
+ * debian/patches/03_maintainer_mode.patch
+ - Removed. Fixed upstream
+ * debian/patches/10_clipboard_crash.patch
+ - Removed. Fixed upstream.
+ * debian/patches/12_monitor_network_fs.patch
+ - Removed. Fixed upstream
+ * debian/patches/13_monitor_kfreebsd.patch
+ - Updated
+ * debian/patches/20_gstreamer.patch
+ - Removed. Time to move to pulseaudio by default...
+ * debian/patches/30_pkgconfig-path.patch:
+ - Removed. Fixed upstream
+ * debian/patches/70_relibtoolize.patch
+ - Removed, moving to dh_autoreconf
+ * debian/patches/99_ltmain_as-needed.patch
+ - Removed, moving to dh_autoreconf
+ * debian/gnome-settings-daemon.install
+ - Updated
+ * Switch to dh_autoreconf and trigger list-missing
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 11 Dec 2010 15:29:15 +0000
+
gnome-settings-daemon (2.30.2-2) unstable; urgency=low
* 13_monitor_kfreebsd.patch: new patch. Don’t monitor fdescfs.
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Sat Dec 11 15:29:47 2010
@@ -13,11 +13,11 @@
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.17.3),
- libgtk2.0-dev (>= 2.16.0),
+ libglib2.0-dev (>= 2.27.3),
+ libgtk3.0-dev,
+ libgtk2.0-dev (>= 2.22.0),
libgconf2-dev (>= 2.6.1),
- libgnome-desktop-dev (>= 2.29.92),
- libnotify-dev (>= 0.4.3),
+ libnotify-dev (>= 0.7.0),
libxt-dev,
libxi-dev,
libxrandr-dev,
@@ -29,7 +29,8 @@
libxklavier-dev (>= 5.0),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- gnome-pkg-tools
+ gnome-pkg-tools,
+ gsettings-desktop-schemas-dev
Standards-Version: 3.9.0
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
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=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Sat Dec 11 15:29:47 2010
@@ -5,14 +5,15 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
debhelper (>= 5),
+ dh_autoreconf,
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.17.3),
- libgtk2.0-dev (>= 2.16.0),
+ libglib2.0-dev (>= 2.27.3),
+ libgtk3.0-dev,
+ libgtk2.0-dev (>= 2.22.0),
libgconf2-dev (>= 2.6.1),
- libgnome-desktop-dev (>= 2.29.92),
- libnotify-dev (>= 0.4.3),
+ libnotify-dev (>= 0.7.0),
libxt-dev,
libxi-dev,
libxrandr-dev,
@@ -24,7 +25,8 @@
libxklavier-dev (>= 5.0),
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
- gnome-pkg-tools
+ gnome-pkg-tools,
+ gsettings-desktop-schemas-dev
Standards-Version: 3.9.0
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
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=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install [utf-8] Sat Dec 11 15:29:47 2010
@@ -1,8 +1,9 @@
-debian/tmp/etc/gconf
debian/tmp/etc/xdg/autostart /usr/share/gnome
debian/tmp/usr/lib/gnome-settings-daemon*
debian/tmp/usr/share/icons
debian/tmp/usr/share/locale
-debian/tmp/usr/share/gnome-settings-daemon/*.ui
-debian/tmp/usr/share/gnome-settings-daemon/xrdb/* /etc/gnome/config
+debian/tmp/usr/share/gnome-settings-daemon
debian/tmp/usr/share/gnome-control-center
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/GConf
+debian/tmp/usr/share/glib-2.0
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/13_monitor_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/13_monitor_kfreebsd.patch?rev=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/13_monitor_kfreebsd.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/13_monitor_kfreebsd.patch [utf-8] Sat Dec 11 15:29:47 2010
@@ -1,12 +1,12 @@
-Index: gnome-settings-daemon-2.30.2/plugins/housekeeping/gsd-disk-space.c
-===================================================================
---- gnome-settings-daemon-2.30.2.orig/plugins/housekeeping/gsd-disk-space.c 2010-10-20 00:44:46.946684561 +0200
-+++ gnome-settings-daemon-2.30.2/plugins/housekeeping/gsd-disk-space.c 2010-10-20 00:45:11.782683265 +0200
-@@ -316,6 +316,7 @@ ldsm_mount_should_ignore (GUnixMountEntr
+diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
+index 392dcbd..5e815f1 100644
+--- a/plugins/housekeeping/gsd-disk-space.c
++++ b/plugins/housekeeping/gsd-disk-space.c
+@@ -457,6 +457,7 @@ ldsm_mount_should_ignore (GUnixMountEntry *mount)
"devfs",
"devpts",
"ecryptfs",
+ "fdescfs",
+ "gfs",
+ "gfs2",
"kernfs",
- "linprocfs",
- "proc",
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=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sat Dec 11 15:29:47 2010
@@ -1,10 +1,1 @@
-01_xrdb.patch
-02_missing_libs.patch
-03_maintainer_mode.patch
-10_clipboard_crash.patch
-12_monitor_network_fs.patch
13_monitor_kfreebsd.patch
-20_gstreamer.patch
-30_pkgconfig-path.patch
-70_relibtoolize.patch
-99_ltmain_as-needed.patch
Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=25868&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] Sat Dec 11 15:29:47 2010
@@ -4,14 +4,18 @@
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/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+common-binary-post-install-arch:: list-missing
LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--warn-unresolved-symbols -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-pulse
-
binary-install/gnome-settings-daemon::
find debian -name '*.a' -delete
find debian -name '*.la' -delete
+
+common-binary-post-install-arch:: list-missing
More information about the pkg-gnome-commits
mailing list