[Demudi-commits] r1337 - in openmovieeditor/trunk/debian: . patches

[Joost Damad]

Author: andete-guest
Date: 2007-05-12 15:55:47 +0000 (Sat, 12 May 2007)
New Revision: 1337

Added:
   openmovieeditor/trunk/debian/patches/
   openmovieeditor/trunk/debian/patches/00list
   openmovieeditor/trunk/debian/patches/01_gcc4.3.dpatch
Modified:
   openmovieeditor/trunk/debian/changelog
   openmovieeditor/trunk/debian/control
   openmovieeditor/trunk/debian/rules
Log:
fix a bug


Modified: openmovieeditor/trunk/debian/changelog
===================================================================
--- openmovieeditor/trunk/debian/changelog	2007-05-12 15:38:53 UTC (rev 1336)
+++ openmovieeditor/trunk/debian/changelog	2007-05-12 15:55:47 UTC (rev 1337)
@@ -1,3 +1,9 @@
+openmovieeditor (0.0.20061221-3) unstable; urgency=low
+
+  * Fix FTBS with gcc-4.3 (Closes: #417460) 
+
+ -- Joost Yervante Damad <andete at debian.org>  Sat, 12 May 2007 17:54:27 +0200
+
 openmovieeditor (0.0.20061221-2) unstable; urgency=low
 
   * Included copyright information about sl, portaudio and tinyxml

Modified: openmovieeditor/trunk/debian/control
===================================================================
--- openmovieeditor/trunk/debian/control	2007-05-12 15:38:53 UTC (rev 1336)
+++ openmovieeditor/trunk/debian/control	2007-05-12 15:55:47 UTC (rev 1337)
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
-Uploaders: Free Ekanayaka <freee at debian.org>
+Uploaders: Free Ekanayaka <freee at debian.org>, Joost Yervante Damad <andete at debian.org>
 Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, 
  libfltk1.1-dev, libquicktime-dev, libavcodec-dev, libavformat-dev, 
  libsndfile-dev, xlibmesa-gl-dev, libgavl-dev (>= 0.2.3-2),

Added: openmovieeditor/trunk/debian/patches/00list
===================================================================
--- openmovieeditor/trunk/debian/patches/00list	2007-05-12 15:38:53 UTC (rev 1336)
+++ openmovieeditor/trunk/debian/patches/00list	2007-05-12 15:55:47 UTC (rev 1337)
@@ -0,0 +1 @@
+01_gcc4.3

Added: openmovieeditor/trunk/debian/patches/01_gcc4.3.dpatch
===================================================================
--- openmovieeditor/trunk/debian/patches/01_gcc4.3.dpatch	2007-05-12 15:38:53 UTC (rev 1336)
+++ openmovieeditor/trunk/debian/patches/01_gcc4.3.dpatch	2007-05-12 15:55:47 UTC (rev 1337)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc4.3.dpatch by  <andete at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix gcc-4.3 FTBFS
+
+ at DPATCH@
+
+--- old/src/FolderBrowser.cxx	2006-10-25 23:38:18.000000000 +0200
++++ new/src/FolderBrowser.cxx	2007-05-12 17:37:24.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include <FL/filename.H>
+ #include "FolderBrowser.H"
+ 
++#include <cstdlib>
+ #include <iostream>
+ 
+ namespace nle
+--- old/src/Frei0rFactory.cxx	2006-11-21 18:21:18.000000000 +0100
++++ new/src/Frei0rFactory.cxx	2007-05-12 17:39:24.000000000 +0200
+@@ -21,6 +21,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
++#include <cstdlib>
++
+ #include <FL/filename.H>
+ 
+ #include "sl/sl.h"
+--- old/src/MediaBrowser.cxx	2006-11-22 19:43:11.000000000 +0100
++++ new/src/MediaBrowser.cxx	2007-05-12 17:38:59.000000000 +0200
+@@ -19,6 +19,7 @@
+ 
+ #include <iostream>
+ #include <cstring>
++#include <cstdlib>
+ 
+ #include <FL/Fl.H>
+ #include <FL/filename.H>


Property changes on: openmovieeditor/trunk/debian/patches/01_gcc4.3.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: openmovieeditor/trunk/debian/rules
===================================================================
--- openmovieeditor/trunk/debian/rules	2007-05-12 15:38:53 UTC (rev 1336)
+++ openmovieeditor/trunk/debian/rules	2007-05-12 15:55:47 UTC (rev 1337)
@@ -26,7 +26,7 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+config.status: patch configure
 	dh_testdir
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -34,7 +34,7 @@
 
 build: build-stamp
 
-build-stamp: patch-stamp  config.status
+build-stamp: config.status
 	dh_testdir
 
 	# Add here commands to compile the package.