[SCM] cinelerra-cv/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 265246d402bd51160834d447c90b24ec8668b6e4
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 26 17:05:15 2011 +0200

    Refresh

diff --git a/debian/patches/01_desktop.patch b/debian/patches/01_desktop.patch
index 60bdc0e..e0e1be7 100644
--- a/debian/patches/01_desktop.patch
+++ b/debian/patches/01_desktop.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_desktop.dpatch by Christian Marillat <marillat at debian.org>
-##
-## All lines beginning with ## DP:' are a description of the patch.
-## DP:
+Description: Fix desktop file as per spec.
+Author: Christian Marillat <marillat at debian.org>
+Forwarded: no
+---
+ image/cinelerra.desktop |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
- at DPATCH@
-
---- cinelerra-2.1.0~svn20070827.orig/image/cinelerra.desktop	2007-08-27 17:02:59.000000000 +0200
-+++ cinelerra-2.1.0~svn20070827/image/cinelerra.desktop	2007-08-27 17:03:22.000000000 +0200
-@@ -5,7 +5,7 @@
+--- cinelerra-cv.orig/image/cinelerra.desktop
++++ cinelerra-cv/image/cinelerra.desktop
+@@ -5,7 +5,7 @@ Name[sl]=Cinelerra
  Name[fr]=Cinelerra
  Name[es]=Cinelerra
  Comment=Video Editor
diff --git a/debian/patches/02_FTBFS.diff b/debian/patches/02_FTBFS.diff
index 14a23e1..118bbe7 100644
--- a/debian/patches/02_FTBFS.diff
+++ b/debian/patches/02_FTBFS.diff
@@ -1,7 +1,13 @@
-Index: cinelerra-cv-2.1.5/cinelerra/ffmpeg.C
-===================================================================
---- cinelerra-cv-2.1.5.orig/cinelerra/ffmpeg.C	2011-03-09 14:48:16.000000000 +0100
-+++ cinelerra-cv-2.1.5/cinelerra/ffmpeg.C	2011-03-09 14:48:21.000000000 +0100
+---
+ cinelerra/Makefile.in |    2 +-
+ cinelerra/ffmpeg.C    |    2 ++
+ cinelerra/file.C      |    2 ++
+ cinelerra/fileac3.C   |    2 ++
+ cinelerra/fileyuv.C   |    2 ++
+ 5 files changed, 9 insertions(+), 1 deletion(-)
+
+--- cinelerra-cv.orig/cinelerra/ffmpeg.C
++++ cinelerra-cv/cinelerra/ffmpeg.C
 @@ -1,5 +1,7 @@
  #include <string.h>
  
@@ -10,10 +16,8 @@ Index: cinelerra-cv-2.1.5/cinelerra/ffmpeg.C
  #ifdef HAVE_SWSCALER
  extern "C" {
  #include <swscale.h>
-Index: cinelerra-cv-2.1.5/cinelerra/fileac3.C
-===================================================================
---- cinelerra-cv-2.1.5.orig/cinelerra/fileac3.C	2011-03-09 14:48:16.000000000 +0100
-+++ cinelerra-cv-2.1.5/cinelerra/fileac3.C	2011-03-09 14:48:21.000000000 +0100
+--- cinelerra-cv.orig/cinelerra/fileac3.C
++++ cinelerra-cv/cinelerra/fileac3.C
 @@ -19,6 +19,8 @@
   * 
   */
@@ -23,10 +27,8 @@ Index: cinelerra-cv-2.1.5/cinelerra/fileac3.C
  #include "asset.h"
  #include "clip.h"
  #include "fileac3.h"
-Index: cinelerra-cv-2.1.5/cinelerra/file.C
-===================================================================
---- cinelerra-cv-2.1.5.orig/cinelerra/file.C	2011-03-09 14:48:16.000000000 +0100
-+++ cinelerra-cv-2.1.5/cinelerra/file.C	2011-03-09 14:48:21.000000000 +0100
+--- cinelerra-cv.orig/cinelerra/file.C
++++ cinelerra-cv/cinelerra/file.C
 @@ -19,6 +19,8 @@
   * 
   */
@@ -36,10 +38,8 @@ Index: cinelerra-cv-2.1.5/cinelerra/file.C
  #include "asset.h"
  #include "bcsignals.h"
  #include "byteorder.h"
-Index: cinelerra-cv-2.1.5/cinelerra/fileyuv.C
-===================================================================
---- cinelerra-cv-2.1.5.orig/cinelerra/fileyuv.C	2011-03-09 14:48:16.000000000 +0100
-+++ cinelerra-cv-2.1.5/cinelerra/fileyuv.C	2011-03-09 14:48:21.000000000 +0100
+--- cinelerra-cv.orig/cinelerra/fileyuv.C
++++ cinelerra-cv/cinelerra/fileyuv.C
 @@ -19,6 +19,8 @@
   * 
   */
@@ -49,11 +49,9 @@ Index: cinelerra-cv-2.1.5/cinelerra/fileyuv.C
  #include "fileyuv.h"
  #include "asset.h"
  #include "bchash.h"
-Index: cinelerra-cv-2.1.5/cinelerra/Makefile.in
-===================================================================
---- cinelerra-cv-2.1.5.orig/cinelerra/Makefile.in	2011-03-09 14:48:16.000000000 +0100
-+++ cinelerra-cv-2.1.5/cinelerra/Makefile.in	2011-03-09 14:48:31.000000000 +0100
-@@ -392,7 +392,7 @@
+--- cinelerra-cv.orig/cinelerra/Makefile.in
++++ cinelerra-cv/cinelerra/Makefile.in
+@@ -392,7 +392,7 @@ LIBINTL = @LIBINTL@
  LIBOBJS = @LIBOBJS@
  LIBRAW1394_CFLAGS = @LIBRAW1394_CFLAGS@
  LIBRAW1394_LIBS = @LIBRAW1394_LIBS@

-- 
cinelerra-cv packaging