[SCM] libmatroska packaging branch, master, updated. upstream/1.0.0-21-g3c30531

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83b1afee94a502a0e2e6cfe539b80ba5bc851589
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Aug 2 13:19:12 2010 +0200

    Drop all patches, not needed anymore.

diff --git a/debian/control b/debian/control
index 265a802..b29b7f6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Fabian Greffrath <fabian+debian at greffrath.com>
 Build-Depends: debhelper (>= 7.0.50~),
- libebml-dev (>= 1.0.0),
- quilt
+ libebml-dev (>= 1.0.0)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/pkg-multimedia/libmatroska.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libmatroska.git;a=summary
diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
deleted file mode 100644
index 670f1e4..0000000
--- a/debian/patches/010_propagate_cflags.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmatroska-0.8.0.orig/make/linux/Makefile
-+++ libmatroska-0.8.0/make/linux/Makefile
-@@ -70,6 +70,7 @@
- 
- objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
- 
-+CXXFLAGS+=$(CUSTOMFLAGS)
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
- 		-Wshadow
- COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
diff --git a/debian/patches/020_missing_timestamp.diff b/debian/patches/020_missing_timestamp.diff
deleted file mode 100644
index 0404710..0000000
--- a/debian/patches/020_missing_timestamp.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmatroska-0.8.0.orig/matroska/KaxConfig.h
-+++ libmatroska-0.8.0/matroska/KaxConfig.h
-@@ -36,6 +36,11 @@
- 
- #define LIBMATROSKA_NAMESPACE       libmatroska
- 
-+// For compilers that don't define __TIMESTAMP__ (e.g. gcc 2.95, gcc 3.2)
-+#ifndef __TIMESTAMP__
-+#define __TIMESTAMP__ __DATE__ " " __TIME__
-+#endif
-+
- #if defined(NO_NAMESPACE) // for older GCC
- # define START_LIBMATROSKA_NAMESPACE
- # define END_LIBMATROSKA_NAMESPACE
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2633860..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-010_propagate_cflags.diff -p1
-020_missing_timestamp.diff -p1

-- 
libmatroska packaging