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

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit bdfed60dfe967a96888bb5574dfebba818a8e83d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 9 12:20:41 2010 +0100

    don't set CFLAGS in debian/rules, upstream build system overrides this anyways

diff --git a/debian/rules b/debian/rules
index f3f346a..a03b3f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ MAKEFLAGS += $(PARALLEL_FLAGS)
 
 include debian/confflags
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,--as-needed
 
 build: build-stamp
@@ -24,18 +23,18 @@ build-stamp:
 	cp debian/debian-version.sh version.sh
 	chmod +x version.sh
 	# Build static lib
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
+	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/static
 	$(MAKE) distclean
 	# Build shared lib
-	CFLAGS="$(CFLAGS) $(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
+	CFLAGS="$(shared_extra_cflags)" LDFLAGS="$(LDFLAGS)" ./configure $(shared_confflags)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/shared
 ifeq ($(do_opt),yes)
 	$(MAKE) distclean
 	# Build opt lib
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags)
+	LDFLAGS="$(LDFLAGS)" ./configure $(opt_confflags)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt
 endif

-- 
x264 packaging