[SCM] traverso packaging branch, master, updated. debian/0.49.0.rc1-1.1-10-gb6b3bca
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Jun 5 17:58:59 UTC 2010
The following commit has been merged in the master branch:
commit b6b3bcafdb9df0c260cd4f993d582339cce8088f
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Jun 5 19:58:54 2010 +0200
Add patch to suppress CMake warnings (Closes: #534033).
diff --git a/debian/patches/02-cmake_warnings.patch b/debian/patches/02-cmake_warnings.patch
new file mode 100644
index 0000000..76c9fa4
--- /dev/null
+++ b/debian/patches/02-cmake_warnings.patch
@@ -0,0 +1,51 @@
+Origin: Debian, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=534033#10
+Description: Fix "FTBFS: CMake errors"
+ CMake 2.6.4 now strictly enforces the fact
+ that build directories might be unique. Modifications to
+ src/CMakeLists.txt, src/commands/CMakeLists.txt,
+ src/commands/plugins/CMakeLists.txt to remove references to
+ ${TRAVERSO_BUILD_DIR} come from a patch by Ingmar Vanhassel
+ <ingmar at exherbo.org> for Gentoo.
+Bug-Debian: http://bugs.debian.org/534033
+Author: Daniel Moerner <dmoerner at gmail.com>
+only in patch2:
+unchanged:
+--- traverso-0.49.0~rc1.orig/src/CMakeLists.txt
++++ traverso-0.49.0~rc1/src/CMakeLists.txt
+@@ -1,11 +1,11 @@
+-ADD_SUBDIRECTORY(engine ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(audiofileio ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(commands ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(core ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(3rdparty ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(plugins ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(sheetcanvas ${TRAVERSO_BUILD_DIR})
+-ADD_SUBDIRECTORY(traverso ${TRAVERSO_BUILD_DIR})
++ADD_SUBDIRECTORY(engine)
++ADD_SUBDIRECTORY(audiofileio)
++ADD_SUBDIRECTORY(commands)
++ADD_SUBDIRECTORY(core)
++ADD_SUBDIRECTORY(3rdparty)
++ADD_SUBDIRECTORY(plugins)
++ADD_SUBDIRECTORY(sheetcanvas)
++ADD_SUBDIRECTORY(traverso)
+
+ IF(USE_PCH)
+ ADD_PRECOMPILED_HEADER(precompiled_headers precompile.h)
+only in patch2:
+unchanged:
+--- traverso-0.49.0~rc1.orig/src/commands/CMakeLists.txt
++++ traverso-0.49.0~rc1/src/commands/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-ADD_SUBDIRECTORY(plugins ${TRAVERSO_BUILD_DIR})
++ADD_SUBDIRECTORY(plugins)
+
+ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/commands
+only in patch2:
+unchanged:
+--- traverso-0.49.0~rc1.orig/src/commands/plugins/CMakeLists.txt
++++ traverso-0.49.0~rc1/src/commands/plugins/CMakeLists.txt
+@@ -1 +1 @@
+-ADD_SUBDIRECTORY(TraversoCommands ${TRAVERSO_BUILD_DIR})
++ADD_SUBDIRECTORY(TraversoCommands)
diff --git a/debian/patches/series b/debian/patches/series
index 4dc8ff1..5982198 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-gcc44_ftbfs.patch
+02-cmake_warnings.patch
--
traverso packaging
More information about the pkg-multimedia-commits
mailing list