r20633 - in /packages/unstable/clutter/debian: changelog control rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Jul 10 13:01:57 2009
New Revision: 20633

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20633
Log:
Use LDFLAGS/CFLAGS vars directly to avoid overriding them completely; bdep
on cdbs >= 0.4.41.

Modified:
    packages/unstable/clutter/debian/changelog
    packages/unstable/clutter/debian/control
    packages/unstable/clutter/debian/rules

Modified: packages/unstable/clutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter/debian/changelog?rev=20633&op=diff
==============================================================================
--- packages/unstable/clutter/debian/changelog (original)
+++ packages/unstable/clutter/debian/changelog Fri Jul 10 13:01:57 2009
@@ -2,6 +2,8 @@
 
   * Downgrade pkg-config dep to a recommends.
   * Update download URL in copyright.
+  * Use LDFLAGS/CFLAGS vars directly to avoid overriding them completely; bdep
+    on cdbs >= 0.4.41.
 
  -- Loïc Minier <lool at dooz.org>  Fri, 10 Jul 2009 14:57:00 +0200
 

Modified: packages/unstable/clutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter/debian/control?rev=20633&op=diff
==============================================================================
--- packages/unstable/clutter/debian/control (original)
+++ packages/unstable/clutter/debian/control Fri Jul 10 13:01:57 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Uploaders: Rob Bradford <robster at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, libgl1-mesa-dev|libgl-dev, libgtk2.0-dev, gtk-doc-tools
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.41), libgl1-mesa-dev|libgl-dev, libgtk2.0-dev, gtk-doc-tools
 Standards-Version: 3.8.2
 
 Package: libclutter-0.8-0

Modified: packages/unstable/clutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter/debian/rules?rev=20633&op=diff
==============================================================================
--- packages/unstable/clutter/debian/rules (original)
+++ packages/unstable/clutter/debian/rules Fri Jul 10 13:01:57 2009
@@ -5,13 +5,13 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
 DEB_COMPRESS_EXCLUDE = .c
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc
 
 CPU=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ifeq ($(CPU),arm)
-DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-march=armv5t"
+CFLAGS += -march=armv5t
 endif
 
 common-binary-predeb-arch:: list-missing