[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1442.1+git781d30-1-12-g15df13c

[lool at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 1a69dd6d9c4c8ef2ce3847f6192587c758cbf481
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Feb 21 12:21:59 2010 +0100

    Don't override CFLAGS/LDFLAGS from environment

diff --git a/debian/rules b/debian/rules
index 56bbf12..38a232c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,14 +16,8 @@ static_confflags = $(common_confflags)
 # XXX why is --enable-visualize only used in the shared build?
 shared_confflags = $(common_confflags) --enable-shared --enable-pic --enable-visualize
 
-CFLAGS = -Wall -g
-LDFLAGS = -Wl,--as-needed
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+LDFLAGS += -Wl,--as-needed
 
 build: build-stamp
 build-stamp: debian/stamp-patched

-- 
x264 packaging