[SCM] openmovieeditor/master: Rename and convert 05_gcc-4.4.dpatch to the quilt format.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Nov 15 22:59:57 UTC 2010


The following commit has been merged in the master branch:
commit 05065b88efc779de0e712d2fe778dc1435543c16
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 15 23:58:02 2010 +0100

    Rename and convert 05_gcc-4.4.dpatch to the quilt format.

diff --git a/debian/patches/05-gcc_4.4.patch b/debian/patches/05-gcc_4.4.patch
new file mode 100644
index 0000000..18f9666
--- /dev/null
+++ b/debian/patches/05-gcc_4.4.patch
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_gcc-4.4.dpatch by  <bdefreese at debian2.bddebian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add includes to build with gcc-4.4
+
+ at DPATCH@
+---
+ src/AddCommand.cxx       |    2 ++
+ src/DiskCache.H          |    2 ++
+ src/JackPlaybackCore.cxx |    1 +
+ src/MediaBrowser.cxx     |    1 +
+ src/WaveForm.H           |    2 ++
+ src/fl_font_browser.cpp  |    1 +
+ 6 files changed, 9 insertions(+)
+
+--- openmovieeditor.orig/src/AddCommand.cxx
++++ openmovieeditor/src/AddCommand.cxx
+@@ -23,6 +23,8 @@
+ #include "Timeline.H"
+ #include "VideoTrack.H"
+ 
++#include <cstdio>
++
+ namespace nle
+ {
+ 
+--- openmovieeditor.orig/src/DiskCache.H
++++ openmovieeditor/src/DiskCache.H
+@@ -20,6 +20,8 @@
+ #ifndef _DISK_CACHE_H_
+ #define _DISK_CACHE_H_
+ 
++#include <stdint.h>
++
+ #include "global_includes.H"
+ namespace nle
+ {
+--- openmovieeditor.orig/src/JackPlaybackCore.cxx
++++ openmovieeditor/src/JackPlaybackCore.cxx
+@@ -42,6 +42,7 @@
+ #include <iostream>
+ #include "fps_helper.H"
+ 
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ 
+--- openmovieeditor.orig/src/MediaBrowser.cxx
++++ openmovieeditor/src/MediaBrowser.cxx
+@@ -19,6 +19,7 @@
+ 
+ #include <iostream>
+ #include <cstring>
++#include <cstdio>
+ #include <cstdlib>
+ 
+ #include <FL/Fl.H>
+--- openmovieeditor.orig/src/WaveForm.H
++++ openmovieeditor/src/WaveForm.H
+@@ -22,6 +22,8 @@
+ 
+ #include <string>
+ 
++#include <stdint.h>
++
+ namespace nle
+ {
+ 
+--- openmovieeditor.orig/src/fl_font_browser.cpp
++++ openmovieeditor/src/fl_font_browser.cpp
+@@ -28,6 +28,7 @@
+ 
+ 
+ #include "fl_font_browser.h"
++#include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+ using namespace std;
diff --git a/debian/patches/05_gcc-4.4.dpatch b/debian/patches/05_gcc-4.4.dpatch
deleted file mode 100755
index 6c8bda9..0000000
--- a/debian/patches/05_gcc-4.4.dpatch
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_gcc-4.4.dpatch by  <bdefreese at debian2.bddebian.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add includes to build with gcc-4.4
-
- at DPATCH@
-diff -urNad openmovieeditor-0.0.20080102~/src/AddCommand.cxx openmovieeditor-0.0.20080102/src/AddCommand.cxx
---- openmovieeditor-0.0.20080102~/src/AddCommand.cxx	2009-12-21 17:14:43.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/AddCommand.cxx	2009-12-21 17:14:46.000000000 +0100
-@@ -23,6 +23,8 @@
- #include "Timeline.H"
- #include "VideoTrack.H"
- 
-+#include <cstdio>
-+
- namespace nle
- {
- 
-diff -urNad openmovieeditor-0.0.20080102~/src/DiskCache.H openmovieeditor-0.0.20080102/src/DiskCache.H
---- openmovieeditor-0.0.20080102~/src/DiskCache.H	2009-12-21 17:14:43.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/DiskCache.H	2009-12-21 17:14:46.000000000 +0100
-@@ -20,6 +20,8 @@
- #ifndef _DISK_CACHE_H_
- #define _DISK_CACHE_H_
- 
-+#include <stdint.h>
-+
- #include "global_includes.H"
- namespace nle
- {
-diff -urNad openmovieeditor-0.0.20080102~/src/JackPlaybackCore.cxx openmovieeditor-0.0.20080102/src/JackPlaybackCore.cxx
---- openmovieeditor-0.0.20080102~/src/JackPlaybackCore.cxx	2009-12-21 17:14:45.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/JackPlaybackCore.cxx	2009-12-21 17:14:46.000000000 +0100
-@@ -39,6 +39,7 @@
- #include "ErrorDialog/IErrorHandler.H"
- #include <iostream>
- 
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- 
-diff -urNad openmovieeditor-0.0.20080102~/src/MediaBrowser.cxx openmovieeditor-0.0.20080102/src/MediaBrowser.cxx
---- openmovieeditor-0.0.20080102~/src/MediaBrowser.cxx	2009-12-21 17:14:43.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/MediaBrowser.cxx	2009-12-21 17:14:46.000000000 +0100
-@@ -19,6 +19,7 @@
- 
- #include <iostream>
- #include <cstring>
-+#include <cstdio>
- #include <cstdlib>
- 
- #include <FL/Fl.H>
-diff -urNad openmovieeditor-0.0.20080102~/src/WaveForm.H openmovieeditor-0.0.20080102/src/WaveForm.H
---- openmovieeditor-0.0.20080102~/src/WaveForm.H	2009-12-21 17:14:43.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/WaveForm.H	2009-12-21 17:14:46.000000000 +0100
-@@ -20,6 +20,8 @@
- #include "global_includes.H"
- #include "IdleHandler.H"
- 
-+#include <stdint.h>
-+
- namespace nle
- {
- 
-diff -urNad openmovieeditor-0.0.20080102~/src/fl_font_browser.cpp openmovieeditor-0.0.20080102/src/fl_font_browser.cpp
---- openmovieeditor-0.0.20080102~/src/fl_font_browser.cpp	2009-12-21 17:14:45.000000000 +0100
-+++ openmovieeditor-0.0.20080102/src/fl_font_browser.cpp	2009-12-21 17:14:59.000000000 +0100
-@@ -28,6 +28,7 @@
- 
- 
- #include "fl_font_browser.h"
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- using namespace std;

-- 
openmovieeditor packaging



More information about the pkg-multimedia-commits mailing list