[SCM] ffms2/master: update packaging for new upstream

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

The following commit has been merged in the master branch:
commit 25ccad2d9419ad4edd72f82e041b8658b6224b97
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri Feb 18 09:02:19 2011 +0100

    update packaging for new upstream

diff --git a/debian/changelog b/debian/changelog
index 28aa463..9a7f3c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ffms2 (2.15-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    + repacked upstream 7zip to tar.gz
+    + made ffms2-2.15/configure executable
+  * debian/patches:
+    + drop UINT64_C-buildfix.patch is upstream
+    + fix and refresh symbol-visibility.patch
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Fri, 18 Feb 2011 09:00:46 +0100
+
 ffms2 (2.13-2) experimental; urgency=low
 
   [ Reinhard Tartler ]
diff --git a/debian/patches/UINT64_C-buildfix.patch b/debian/patches/UINT64_C-buildfix.patch
deleted file mode 100644
index f3eda32..0000000
--- a/debian/patches/UINT64_C-buildfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Rickard Närström <rickard.narstrom at gmail.com>
-Subject: Fix FTBFS with newer ffmpeg snapshots, based on relevant parts from upstream svn r311
-
-Index: ffmpegsource-2.13/configure.in
-===================================================================
---- ffmpegsource-2.13.orig/configure.in	2010-05-08 22:09:18.305476579 +0200
-+++ ffmpegsource-2.13/configure.in	2010-05-08 22:10:25.175475398 +0200
-@@ -44,6 +44,7 @@
- 
- PKG_PROG_PKG_CONFIG([0.22])
- PKG_CHECK_MODULES(FFMPEG, [libavformat >= 52.39.0 libavcodec >= 52.38.0 libswscale >= 0.7.0 libpostproc >= 51.2.0 libavutil >= 50.4.0 ])
-+CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"
- AC_SUBST([FFMPEG_CFLAGS])
- AC_SUBST([FFMPEG_LIBS])
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3892788..63c767a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 symbol-visibility.patch
-UINT64_C-buildfix.patch
diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
index c7331c1..ad2a897 100644
--- a/debian/patches/symbol-visibility.patch
+++ b/debian/patches/symbol-visibility.patch
@@ -1,30 +1,31 @@
 Author: Rickard Närström <rickard.narstrom at gmail.com>
 Subject: Hide symbols by default
 
-Index: ffmpegsource-2.13/include/ffms.h
+Index: ffms2/include/ffms.h
 ===================================================================
---- ffmpegsource-2.13.orig/include/ffms.h	2010-05-05 07:49:39.877046550 +0200
-+++ ffmpegsource-2.13/include/ffms.h	2010-05-05 07:49:57.717044015 +0200
+--- ffms2.orig/include/ffms.h
++++ ffms2/include/ffms.h
 @@ -45,6 +45,9 @@
  #	else
- #		define FFMS_API(ret) EXTERN_C ret FFMS_CC
+ #		define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
  #	endif
 +#elif __GNUC__ >= 4
 +#	define FFMS_CC
-+#	define FFMS_API(ret) EXTERN_C __attribute__((visibility("default"))) ret FFMS_CC
++#	define FFMS_API(ret) FFMS_EXTERN_C __attribute__((visibility("default"))) ret FFMS_CC
  #else
  #	define FFMS_CC
- #	define FFMS_API(ret) EXTERN_C ret FFMS_CC
-Index: ffmpegsource-2.13/src/core/Makefile.am
+ #	define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
+Index: ffms2/Makefile.am
 ===================================================================
---- ffmpegsource-2.13.orig/src/core/Makefile.am	2010-05-05 07:49:39.837046413 +0200
-+++ ffmpegsource-2.13/src/core/Makefile.am	2010-05-05 07:54:06.887047789 +0200
-@@ -1,5 +1,8 @@
- ACLOCAL_AMFLAGS=-I m4
+--- ffms2.orig/Makefile.am
++++ ffms2/Makefile.am
+@@ -1,6 +1,9 @@
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = foreign
  
 +AM_CFLAGS=-fvisibility=hidden
 +AM_CXXFLAGS=-fvisibility=hidden
 +
- INCLUDES = -I. -I$(top_srcdir)/include -I$(top_srcdir)/src/config @FFMPEG_CFLAGS@ @ZLIB_CPPFLAGS@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = ffms2.pc
  
- lib_LTLIBRARIES = libffms2.la

-- 
ffms2 packaging