[SCM] libaacs/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ca1e68bf4521892019c9fd7b733ef6591212f720
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Dec 4 14:05:44 2011 +0100

    Refresh

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 9b11f5a..5e34378 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -6,9 +6,9 @@ Forwarded: libaacs-devel at videolan.org
  src/Makefile.am |    4 ++--
  2 files changed, 17 insertions(+), 2 deletions(-)
 
---- libaacs-0~20110623.git964342f.orig/configure.ac
-+++ libaacs-0~20110623.git964342f/configure.ac
-@@ -101,6 +101,21 @@ else
+--- libaacs.orig/configure.ac
++++ libaacs/configure.ac
+@@ -123,6 +123,21 @@ else
  fi
  AC_FUNC_STRERROR_R
  
@@ -30,9 +30,9 @@ Forwarded: libaacs-devel at videolan.org
  # function testing for supported compiler options
  check_cc_options()
  {
---- libaacs-0~20110623.git964342f.orig/src/Makefile.am
-+++ libaacs-0~20110623.git964342f/src/Makefile.am
-@@ -14,7 +14,7 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
+--- libaacs.orig/src/Makefile.am
++++ libaacs/src/Makefile.am
+@@ -9,7 +9,7 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
  SET_INCLUDES = -I$(top_srcdir) -Ifile
  
  AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \
@@ -41,10 +41,10 @@ Forwarded: libaacs-devel at videolan.org
  AM_YFLAGS = -d -p libaacs_yy
  CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
  
-@@ -53,7 +53,7 @@ endif
+@@ -50,7 +50,7 @@ endif
  
  libaacs_ladir= $(includedir)/libaacs
- libaacs_la_HEADERS= libaacs/aacs.h file/filesystem.h
+ 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

-- 
libaacs packaging