[SCM] k9copy packaging branch, master, updated. a0cb4d309d159bb431ad423b37f0f7bdcae4a533

[Eshat Cakar]

The following commit has been merged in the master branch:
commit 34ac35c348992cc0a2c1e68abab2005e5d0d52f7
Author: Eshat Cakar <info at eshat.de>
Date:   Tue Jan 3 15:59:50 2012 +0100

    Remove rename_deprecated_var.patch
---
 debian/changelog                           |    7 +++++++
 debian/patches/rename_deprecated_var.patch |   12 ------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 162a4f9..1935325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+k9copy (2.3.8-1) unstable; urgency=low
+
+  * New upstream version.
+  * Remove rename_deprecated_var.patch, applied upstream.
+	
+ -- Eshat Cakar <info at eshat.de>  Tue, 03 Jan 2012 15:58:42 +0100
+
 k9copy (2.3.7-3) unstable; urgency=low
 
   * Fix FTBFS on kfreebsd, thanks to Christoph Egger (Closes: #637773)
diff --git a/debian/patches/rename_deprecated_var.patch b/debian/patches/rename_deprecated_var.patch
deleted file mode 100644
index cc1a612..0000000
--- a/debian/patches/rename_deprecated_var.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-CODEC_TYPE_VIDEO is no longer defined, use AVMEDIA_TYPE_VIDEO instead.
---- a/src/import/k9avidecode.cpp
-+++ b/src/import/k9avidecode.cpp
-@@ -145,7 +145,7 @@
- // Find the first video stream
-     m_videoStream=-1;
-     for (i=0; i<m_FormatCtx->nb_streams; i++)
--        if (m_FormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) {
-+        if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
-             m_videoStream=i;
-             break;
-         }

-- 
k9copy packaging