[SCM] k9copy packaging branch, master, updated. 6253c3c0254f04aea97351734ba1db8a6e6975ae

[Eshat Cakar]

The following commit has been merged in the master branch:
commit 6253c3c0254f04aea97351734ba1db8a6e6975ae
Author: Eshat Cakar <info at eshat.de>
Date:   Sun Aug 21 22:38:07 2011 +0200

    -3 release, cleanup new patch
---
 debian/changelog                                   |    8 ++++----
 ...ecated_func.patch => fix-deprecated-func.patch} |    6 ++++--
 debian/patches/series                              |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49da22f..162a4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 k9copy (2.3.7-3) unstable; urgency=low
 
-  * Fix FTBFS on kfreebsd, thanks Christoph Egger (Closes: #637773)
-  * Make package libav comform (Closes: #638248)
-  * Link directly agains libavcodec (Thanks to Reinhard Tartler)
+  * Fix FTBFS on kfreebsd, thanks to Christoph Egger (Closes: #637773)
+  * Prepare package for libav (Closes: #638248)
+  * Link directly agains libav*, thanks to Reinhard Tartler
 
- -- Eshat Cakar <info at eshat.de>  Fri, 19 Aug 2011 21:57:02 +0200
+ -- Eshat Cakar <info at eshat.de>  Sun, 21 Aug 2011 22:00:49 +0200
 
 k9copy (2.3.7-2) unstable; urgency=low
 
diff --git a/debian/patches/fix_deprecated_func.patch b/debian/patches/fix-deprecated-func.patch
similarity index 65%
rename from debian/patches/fix_deprecated_func.patch
rename to debian/patches/fix-deprecated-func.patch
index f0cdf1a..7bce907 100644
--- a/debian/patches/fix_deprecated_func.patch
+++ b/debian/patches/fix-deprecated-func.patch
@@ -1,11 +1,13 @@
 Function has been deprecated for a long time
 --- a/src/import/k9avidecode.cpp
 +++ b/src/import/k9avidecode.cpp
-@@ -243,7 +243,7 @@
+@@ -242,8 +242,8 @@
+         // Is this a packet from the video stream?
          if (packet.stream_index==m_videoStream) {
              // Decode video frame
-             avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+-            avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
 -                                 packet.data, packet.size);
++            avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished,
 +                                 &packet);
  
              // Did we get a video frame?
diff --git a/debian/patches/series b/debian/patches/series
index 0379092..8e93c3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-fix_deprecated_func.patch
+fix-deprecated-func.patch
 fix-ftbfs-kfreebsd.patch
 german-spelling-error.patch
 fix-desktop-files.patch

-- 
k9copy packaging