[SCM] libebml packaging branch, master, updated. debian/0.7.7-3.1-11-gb4d0046

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5b237b0f3e17836448094ca191b1c5debf369e55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 29 16:50:09 2010 +0200

    remove debian/patches/010_propagate_cflags.diff hack

diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
deleted file mode 100644
index b00d38e..0000000
--- a/debian/patches/010_propagate_cflags.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libebml-0.7.6.orig/make/linux/Makefile
-+++ libebml-0.7.6/make/linux/Makefile
-@@ -64,6 +64,7 @@
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
- objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
- 
-+CXXFLAGS+=$(CUSTOMFLAGS)
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
diff --git a/debian/patches/series b/debian/patches/series
index ec26a2e..79275e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-010_propagate_cflags.diff -p1
 020_invalid_cast.diff -p1
 030_g++-4.3.diff
diff --git a/debian/rules b/debian/rules
index 7accbbd..b79922f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ configure-stamp:
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(MAKE) -C make/linux CUSTOMFLAGS="$(CFLAGS)"
+	$(MAKE) -C make/linux
 	touch build-stamp
 
 clean:

-- 
libebml packaging