r10787 - in /desktop/unstable/nautilus/debian: changelog control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun May  6 08:42:44 2007
New Revision: 10787

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10787
Log:
* Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
  cdbs >= 0.4.41.
* Prepend -z defs to LDFLAGS for additional safety.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control.in
    desktop/unstable/nautilus/debian/rules

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=10787&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sun May  6 08:42:44 2007
@@ -1,3 +1,11 @@
+nautilus (2.18.1-3) UNRELEASED; urgency=low
+
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+    cdbs >= 0.4.41.
+  * Prepend -z defs to LDFLAGS for additional safety.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 06 May 2007 10:41:50 +0200
+
 nautilus (2.18.1-2) unstable; urgency=low
 
   * 10_location_titlebar.patch: include gnome-vfs-utils.h

Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=10787&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Sun May  6 08:42:44 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15),  libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.14.0), libpango1.0-dev (>= 1.1.2), x11proto-core-dev
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.41), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15),  libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.14.0), libpango1.0-dev (>= 1.1.2), x11proto-core-dev
 Standards-Version: 3.7.2
 
 Package: nautilus

Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=10787&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules (original)
+++ desktop/unstable/nautilus/debian/rules Sun May  6 08:42:44 2007
@@ -13,5 +13,5 @@
 DEB_DH_STRIP_ARGS += --dbg-package=nautilus-dbg
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.17.90)'