[SCM] libzen/master: Drop all patches -- applied upstream
hyperair at users.alioth.debian.org
hyperair at users.alioth.debian.org
Thu Jan 26 08:40:31 UTC 2012
The following commit has been merged in the master branch:
commit 9bbc628d277fa8e0c3267e647a0443854de8fad5
Author: Chow Loong Jin <hyperair at debian.org>
Date: Wed Jan 25 03:31:57 2012 +0800
Drop all patches -- applied upstream
diff --git a/debian/patches/0001-Unbundle-TinyXml-use-system-TinyXml.patch b/debian/patches/0001-Unbundle-TinyXml-use-system-TinyXml.patch
deleted file mode 100644
index c172a23..0000000
--- a/debian/patches/0001-Unbundle-TinyXml-use-system-TinyXml.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Mon, 2 Jan 2012 16:02:27 +0800
-Subject: Unbundle TinyXml (use system TinyXml)
-
----
- Project/GNU/Library/Makefile.am | 5 +----
- Project/GNU/Library/libzen.pc.in | 1 +
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am
-index 6db6130..208a210 100755
---- a/Project/GNU/Library/Makefile.am
-+++ b/Project/GNU/Library/Makefile.am
-@@ -24,10 +24,7 @@ libzen_la_SOURCES = \
- ../../../Source/ZenLib/Format/Http/Http_Cookies.cpp \
- ../../../Source/ZenLib/Format/Http/Http_Handler.cpp \
- ../../../Source/ZenLib/Format/Http/Http_Request.cpp \
-- ../../../Source/ZenLib/Format/Http/Http_Utils.cpp \
-- ../../../Source/ZenLib/TinyXml/tinyxml.cpp \
-- ../../../Source/ZenLib/TinyXml/tinyxmlerror.cpp \
-- ../../../Source/ZenLib/TinyXml/tinyxmlparser.cpp
-+ ../../../Source/ZenLib/Format/Http/Http_Utils.cpp
-
- libzen_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
-diff --git a/Project/GNU/Library/libzen.pc.in b/Project/GNU/Library/libzen.pc.in
-index 3217c85..12278f6 100755
---- a/Project/GNU/Library/libzen.pc.in
-+++ b/Project/GNU/Library/libzen.pc.in
-@@ -11,3 +11,4 @@ Version: @PACKAGE_VERSION@
- Description: ZenLib
- Libs: -L at libdir@ -lzen -lpthread
- Cflags: -I${includedir}
-+Requires: tinyxml
---
diff --git a/debian/patches/0002-Expand-Doxygen-generated-documentation.patch b/debian/patches/0002-Expand-Doxygen-generated-documentation.patch
deleted file mode 100644
index b622c45..0000000
--- a/debian/patches/0002-Expand-Doxygen-generated-documentation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Mon, 2 Jan 2012 18:23:25 +0800
-Subject: Expand Doxygen generated documentation
-
----
- Source/Doc/Doxyfile | 11 +++--------
- 1 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/Source/Doc/Doxyfile b/Source/Doc/Doxyfile
-index fc345ff..b7ac3fe 100755
---- a/Source/Doc/Doxyfile
-+++ b/Source/Doc/Doxyfile
-@@ -57,14 +57,9 @@ WARN_LOGFILE =
- #---------------------------------------------------------------------------
- # configuration options related to the input files
- #---------------------------------------------------------------------------
--INPUT = ../ZenLib/Conf.h \
-- ../ZenLib/Utils.h \
-- ../ZenLib/Ztring.h \
-- ../ZenLib/ZtringList.h \
-- ../ZenLib/ZtringListList.h \
-- ../ZenLib/ZtringListListF.h
--FILE_PATTERNS =
--RECURSIVE = NO
-+INPUT = ../ZenLib/
-+FILE_PATTERNS = *.h
-+RECURSIVE = YES
- EXCLUDE =
- EXCLUDE_SYMLINKS = NO
- EXCLUDE_PATTERNS =
---
diff --git a/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch b/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch
deleted file mode 100644
index 9eb2b39..0000000
--- a/debian/patches/0003-Amend-conditions-for-NEED_SIZET.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Fri, 20 Jan 2012 19:50:10 +0800
-Subject: Amend conditions for NEED_SIZET
-
-When size_t is an unsigned int, and unsigned int and unsigned long have the same
-size, int32u gets defined as unsigned int. However, unsigned long/size_t is
-still treated as distinct from unsigned int by the compiler, and as such a
-size_t overload is needed.
-
-Also detect the case where size_t is typedefed as unsigned int instead of
-unsigned long before defining NEED_SIZET
----
- Project/GNU/Library/Makefile.am | 5 ++++-
- Project/GNU/Library/configure.ac | 10 ++++++++++
- Project/GNU/Library/libzen.pc.in | 2 +-
- Source/ZenLib/Conf.h | 6 +++++-
- 4 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/Project/GNU/Library/Makefile.am b/Project/GNU/Library/Makefile.am
-index 208a210..4266d22 100755
---- a/Project/GNU/Library/Makefile.am
-+++ b/Project/GNU/Library/Makefile.am
-@@ -28,4 +28,7 @@ libzen_la_SOURCES = \
-
- libzen_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
--INCLUDES = -I../../../Source
-+INCLUDES = -I../../../Source -I.
-+
-+archincludedir = $(libdir)/libzen/include/
-+archinclude_HEADERS = libzenconfig.h
-diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
-index d8dc56b..15c1cfd 100755
---- a/Project/GNU/Library/configure.ac
-+++ b/Project/GNU/Library/configure.ac
-@@ -190,6 +190,16 @@ if test "$GXX" = yes ; then
- fi
- fi
-
-+dnl Check if size_t is long
-+AC_LANG([C++])
-+AC_COMPILE_IFELSE([
-+ #include <cstdlib>
-+ void foo(signed int) {}
-+ void foo(unsigned int) {}
-+ int main () {foo(size_t(0));}], [AC_DEFINE([SIZET_IS_ULONG], [1], [size_t is unsigned long])], [])
-+
-+AC_CONFIG_HEADERS([libzenconfig.h])
-+
- dnl -------------------------------------------------------------------------
- dnl External libs
- dnl
-diff --git a/Project/GNU/Library/libzen.pc.in b/Project/GNU/Library/libzen.pc.in
-index 12278f6..84fec22 100755
---- a/Project/GNU/Library/libzen.pc.in
-+++ b/Project/GNU/Library/libzen.pc.in
-@@ -10,5 +10,5 @@ Name: libzen
- Version: @PACKAGE_VERSION@
- Description: ZenLib
- Libs: -L at libdir@ -lzen -lpthread
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${libdir}/libzen/include
- Requires: tinyxml
-diff --git a/Source/ZenLib/Conf.h b/Source/ZenLib/Conf.h
-index a3d6b07..04de8ef 100755
---- a/Source/ZenLib/Conf.h
-+++ b/Source/ZenLib/Conf.h
-@@ -23,6 +23,9 @@
- //---------------------------------------------------------------------------
- #ifndef ZenConfH
- #define ZenConfH
-+
-+#include <libzenconfig.h>
-+
- //---------------------------------------------------------------------------
-
- //***************************************************************************
-@@ -188,7 +191,8 @@
- #endif
- //---------------------------------------------------------------------------
- //If we need size_t specific integer conversion
--#if defined(__LP64__) || defined(MACOSX)
-+#include <tr1/cstdint> //SIZE_MAX
-+#if ((SIZE_MAX == UINT_MAX) && (UINT_MAX == ULONG_MAX) && defined(SIZET_IS_ULONG))
- #define NEED_SIZET
- #endif
-
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cf34023..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Unbundle-TinyXml-use-system-TinyXml.patch
-0002-Expand-Doxygen-generated-documentation.patch
-0003-Amend-conditions-for-NEED_SIZET.patch
--
libzen packaging
More information about the pkg-multimedia-commits
mailing list