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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat May 29 15:06:58 UTC 2010


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

    remove debian/patches/030_g++-4.3.diff, merged upstream

diff --git a/debian/patches/030_g++-4.3.diff b/debian/patches/030_g++-4.3.diff
deleted file mode 100644
index e05ce14..0000000
--- a/debian/patches/030_g++-4.3.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- libebml-0.7.7.orig/ebml/EbmlBinary.h
-+++ libebml-0.7.7/ebml/EbmlBinary.h
-@@ -38,6 +38,7 @@
- #define LIBEBML_BINARY_H
- 
- #include <string>
-+#include <cstring>
- 
- #include "EbmlTypes.h"
- #include "EbmlElement.h"
---- libebml-0.7.7.orig/ebml/EbmlEndian.h
-+++ libebml-0.7.7/ebml/EbmlEndian.h
-@@ -39,6 +39,7 @@
- #define LIBEBML_ENDIAN_H
- 
- #include <algorithm>
-+#include <cstring>
- 
- #include "EbmlConfig.h" // contains _ENDIANESS_
- 
---- libebml-0.7.7.orig/ebml/c/libebml_t.h
-+++ libebml-0.7.7/ebml/c/libebml_t.h
-@@ -123,10 +123,6 @@
-     MODE_SAFE
- } open_mode;
- 
--#if !defined(min)
--#define min(x,y) ((x)<(y) ? (x) : (y))
--#endif
--
- #ifdef __cplusplus
- }
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 736bb43..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-030_g++-4.3.diff

-- 
libebml packaging



More information about the pkg-multimedia-commits mailing list