r38326 - in /desktop/wheezy/gnome-settings-daemon/debian: changelog rules

Mon Jun 3 08:00:05 UTC 2013

Author: manphiz-guest
Date: Mon Jun  3 08:00:05 2013
New Revision: 38326

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38326
Log:
* Backport from sid:
  - Disable "-Wl,-z,defs" on mipsel to fix segfault.

Modified:
    desktop/wheezy/gnome-settings-daemon/debian/changelog
    desktop/wheezy/gnome-settings-daemon/debian/rules

Modified: desktop/wheezy/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gnome-settings-daemon/debian/changelog?rev=38326&op=diff
==============================================================================

--- desktop/wheezy/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/wheezy/gnome-settings-daemon/debian/changelog [utf-8] Mon Jun  3 08:00:05 2013
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.4.2+git20121218.7c1322-3+deb7u1) UNRELEASED; urgency=low
+
+  * Backport from sid:
+    - Disable "-Wl,-z,defs" on mipsel to fix segfault.
+
+ -- Xiyue Deng <manphiz-guest at users.alioth.debian.org>  Mon, 03 Jun 2013 00:53:30 -0700
+
 gnome-settings-daemon (3.4.2+git20121218.7c1322-3) unstable; urgency=low
 
   * 06_a11y_gdm_leak.patch: backported from git master. Reset keyboard

Modified: desktop/wheezy/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gnome-settings-daemon/debian/rules?rev=38326&op=diff
==============================================================================
--- desktop/wheezy/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/wheezy/gnome-settings-daemon/debian/rules [utf-8] Mon Jun  3 08:00:05 2013
@@ -7,7 +7,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-ifneq ($(DEB_HOST_ARCH_CPU),ia64)
+ifneq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),ia64 mipsel))
   LDFLAGS += -Wl,-z,defs
 endif
 LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed


