[SCM] libdvdcss/master: Remove patches applied upstream, API documentation is not built without doxygen.

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

The following commit has been merged in the master branch:
commit 0f0abb7dcf023581ba025c3713e9236f12bd2f67
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Feb 27 13:19:07 2013 +0100

    Remove patches applied upstream, API documentation is not built without doxygen.

diff --git a/debian/changelog b/debian/changelog
index 17d7080..e5c1586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libdvdcss (1.2.12-2) UNRELEASED; urgency=low
+libdvdcss (1.2.13-1) unstable; urgency=low
 
+  [ Andres Mejia ]
   * Reduce build dependencies. Remove need for dh-autoreconf.
   * Drop debhelper build dependency down to (>= 8.1.3~).
   * Add myself to Uploaders field.
@@ -9,7 +10,12 @@ libdvdcss (1.2.12-2) UNRELEASED; urgency=low
   * Support parallel builds.
   * Set -fvisibility=hidden through CFLAGS defined in debian/rules.
 
- -- Andres Mejia <amejia at debian.org>  Sun, 18 Mar 2012 10:05:19 -0400
+  [ Fabian Greffrath ]
+  * Imported Upstream version 1.2.13
+  * Remove patches applied upstream.
+  * API documentation is not built without doxygen.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Wed, 27 Feb 2013 13:14:33 +0100
 
 libdvdcss (1.2.12-1) unstable; urgency=low
 
diff --git a/debian/patches/r255_symbol-visibility.patch b/debian/patches/r255_symbol-visibility.patch
deleted file mode 100644
index e424b85..0000000
--- a/debian/patches/r255_symbol-visibility.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Last-Update: 2012-09-22
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-From: Fabian Greffrath <fabian at greffrath.com>
-Origin: http://svn.videolan.org/comp.php?repname=libdvdcss&compare[]=%2F at 254&compare[]=%2F at 255
-Description: backported (r255) patch to set appropriate symbol visibility attributes (ELF)
- libdvdcss.so contains many internal symbols that are not marked as such
- and thus confuse utilities like dpkg-gensymbols
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -185,6 +185,24 @@
- CFLAGS="${CFLAGS_save}"
- 
- dnl
-+dnl  Check if the compiler supports ELF visibility
-+dnl
-+CFLAGS_save="$CFLAGS"
-+
-+AC_CACHE_CHECK([if \$CC supports ELF visibility],
-+    [ac_cv_c_visibility],
-+    [CFLAGS="-fvisibility=hidden ${CFLAGS_save}"
-+     AC_TRY_COMPILE([],
-+                    [__attribute__((visibility("default"))) extern int visible],
-+                    ac_cv_c_visibility=yes, ac_cv_c_visibility=no)])
-+if test "${ac_cv_c_visibility}" != "no"; then
-+    CFLAGS_save="-fvisibility=hidden ${CFLAGS_save}";
-+    AC_DEFINE(HAVE_VISIBILITY, 1, Support ELF visibility.)
-+fi
-+
-+CFLAGS="${CFLAGS_save}"
-+
-+dnl
- dnl  Use 64 bits offsets
- dnl
- CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST ${CFLAGS}"
---- a/src/dvdcss/dvdcss.h
-+++ b/src/dvdcss/dvdcss.h
-@@ -60,6 +60,8 @@
- #define LIBDVDCSS_EXPORT __declspec(dllexport) extern
- #elif defined(LIBDVDCSS_IMPORTS)
- #define LIBDVDCSS_EXPORT __declspec(dllimport) extern
-+#elif defined(HAVE_VISIBILITY)
-+#define LIBDVDCSS_EXPORT __attribute__((visibility("default"))) extern
- #else
- #define LIBDVDCSS_EXPORT extern
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b28621d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-r255_symbol-visibility.patch
diff --git a/debian/rules b/debian/rules
index 55968de..77aeca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,5 @@
 %:
 	dh $@ --parallel
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--disable-doc
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
libdvdcss packaging