[SCM] libaacs/master: Remove patches. Changes from patches applied upstream.

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

The following commit has been merged in the master branch:
commit 6d6c7df8423c08bf44e803b10254211cacdcf9e5
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Wed Mar 21 14:23:41 2012 -0400

    Remove patches. Changes from patches applied upstream.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
deleted file mode 100644
index 30e0e5a..0000000
--- a/debian/patches/0001-buildsystem.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Alessio Treglia <alessio at debian.org>
-Description: Link against gpg-error to make it find the gpg_strerror_r function.
-Forwarded: libaacs-devel at videolan.org
----
- configure.ac    |   15 +++++++++++++++
- src/Makefile.am |    6 +++---
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
---- libaacs.orig/configure.ac
-+++ libaacs/configure.ac
-@@ -123,6 +123,21 @@ else
- fi
- AC_FUNC_STRERROR_R
- 
-+# gpg-error check
-+AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
-+if test x"$GPG_ERROR_CONFIG" = xno; then
-+  AC_MSG_ERROR([gpg-error not found on system])
-+else
-+  GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
-+  GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
-+  AC_SUBST(GPG_ERROR_CFLAGS)
-+  AC_SUBST(GPG_ERROR_LIBS)
-+fi
-+AC_FUNC_STRERROR_R
-+
-+
-+libgpg-error-decv
-+
- # function testing for supported compiler options
- check_cc_options()
- {
---- libaacs.orig/src/Makefile.am
-+++ libaacs/src/Makefile.am
-@@ -9,9 +9,9 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
- SET_INCLUDES = -I$(top_srcdir) -Ifile
- 
- AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \
--	$(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS)
-+	$(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
- AM_YFLAGS = -d -p libaacs_yy
--CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
-+## CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
- 
- lib_LTLIBRARIES = libaacs.la
- libaacs_la_SOURCES=libaacs/aacs.h \
-@@ -50,7 +50,7 @@ endif
- 
- libaacs_ladir= $(includedir)/libaacs
- libaacs_la_HEADERS= libaacs/aacs.h file/filesystem.h libaacs/aacs-version.h
--libaacs_la_LDFLAGS= $(LIBGCRYPT_LIBS) -version-info $(LIB_VERSION_INFO)
-+libaacs_la_LDFLAGS= $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) -version-info $(LIB_VERSION_INFO)
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libaacs.pc
- 
diff --git a/debian/patches/0002-unresolved_mount_point.patch b/debian/patches/0002-unresolved_mount_point.patch
deleted file mode 100644
index 5cab20a..0000000
--- a/debian/patches/0002-unresolved_mount_point.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Fix segfaults when mount point patch cannot be resolved.
- The fix works on Linux, since non-Linux archs still rely on the old
- code.
-Origin: http://git.videolan.org/?p=libaacs.git;a=commitdiff;h=556699544
-Reviewed-by: Alessio Treglia <alessio at debian.org>
----
- configure.ac      |    2 +-
- src/libaacs/mmc.c |   14 ++++++++++++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
---- libaacs.orig/configure.ac
-+++ libaacs/configure.ac
-@@ -91,7 +91,7 @@ AC_TYPE_SIGNAL
- # required headers
- AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
- AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h])
--AC_CHECK_HEADERS([sys/time.h time.h sys/select.h])
-+AC_CHECK_HEADERS([sys/time.h time.h sys/select.h limits.h])
- 
- # required structures
- AC_STRUCT_DIRENT_D_TYPE
---- libaacs.orig/src/libaacs/mmc.c
-+++ libaacs/src/libaacs/mmc.c
-@@ -37,6 +37,10 @@
- #include <mntent.h>
- #endif
- 
-+#ifdef HAVE_LIMITS_H
-+#include <limits.h>
-+#endif
-+
- #ifdef HAVE_LINUX_CDROM_H
- #include <sys/ioctl.h>
- #include <linux/cdrom.h>
-@@ -384,8 +388,18 @@ MMC *mmc_open(const char *path)
- #if defined(HAVE_MNTENT_H)
- 
- #ifdef HAVE_REALPATH
-+#ifndef PATH_MAX
-     char *file_path = realpath(path, NULL);
- #else
-+    char *file_path = malloc(PATH_MAX);
-+    if (!file_path || !realpath(path, file_path)) {
-+        DEBUG(DBG_MMC, "Failed resolving path %s (%p)\n", path, mmc);
-+        X_FREE(mmc);
-+        X_FREE(file_path);
-+        return NULL;
-+    }
-+#endif
-+#else
-     char *file_path = (char*)malloc(strlen(path) + 1);
-     strcpy(file_path, path);
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a69218a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-buildsystem.patch
-0002-unresolved_mount_point.patch

-- 
libaacs packaging