[SCM] traverso packaging branch, master, updated. debian/0.49.1-3-6-gb1e98f2

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b1e98f2bbc320257d02f5f94728db43b27c74867
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Aug 16 15:21:58 2010 +0200

    Dropped patches adopted by upstream.

diff --git a/debian/patches/02-cmake_warnings.patch b/debian/patches/02-cmake_warnings.patch
deleted file mode 100644
index 76c9fa4..0000000
--- a/debian/patches/02-cmake_warnings.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/03-qt46_fix.patch b/debian/patches/03-qt46_fix.patch
deleted file mode 100644
index caa7a48..0000000
--- a/debian/patches/03-qt46_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Origin: upstream
-From: Remon Sijrier <remon at traverso-daw.org>
-Description: Fix Qt 4.6 issues.
----
- src/sheetcanvas/ViewItem.cpp |    3 +++
- 1 file changed, 3 insertions(+)
-
---- traverso.orig/src/sheetcanvas/ViewItem.cpp
-+++ traverso/src/sheetcanvas/ViewItem.cpp
-@@ -29,4 +29,7 @@ ViewItem::ViewItem(ViewItem* parentViewI
- 	set_context_item(parentContext);
- 	m_parentViewItem = parentViewItem;
- 	setCursor(themer()->get_cursor("Default"));
-+#if QT_VERSION >= 0x040600
-+	setFlags(QGraphicsItem::ItemUsesExtendedStyleOption);
-+#endif
- }
diff --git a/debian/patches/series b/debian/patches/series
index 0767841..4dc8ff1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 01-gcc44_ftbfs.patch
-02-cmake_warnings.patch
-03-qt46_fix.patch

-- 
traverso packaging