[SCM] kmidimon packaging branch, master, updated. debian/0.7.1-1-22-ga3216d5

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 30989cb1583a9289c2b9d5a952a008aa75a3bace
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon May 17 12:06:54 2010 +0200

    Fix pathnames in drumstick patches.

diff --git a/debian/patches/drumstick-alsa.patch b/debian/patches/drumstick-alsa.patch
index b6826ca..be74734 100644
--- a/debian/patches/drumstick-alsa.patch
+++ b/debian/patches/drumstick-alsa.patch
@@ -3,10 +3,8 @@ Description: Don't cache the MIDI port list.
  of #579153.
 Origin: http://drumstick.svn.sourceforge.net/viewvc/drumstick?view=rev&revision=165
 
-Index: library/include/alsaclient.h
-===================================================================
---- library/include/alsaclient.h	(revision 164)
-+++ library/include/alsaclient.h	(revision 165)
+--- drumstick/include/alsaclient.h	(revision 164)
++++ drumstick/include/alsaclient.h	(revision 165)
 @@ -313,6 +313,7 @@
      bool getEventsEnabled() const { return m_eventsEnabled; }
      /** Sets a sequencer event handler enabling the callback delivery mode */
@@ -15,10 +13,8 @@ Index: library/include/alsaclient.h
  
  signals:
      /** Signal emitted when an event is received */
-Index: library/src/alsaclient.cpp
-===================================================================
---- library/src/alsaclient.cpp	(revision 164)
-+++ library/src/alsaclient.cpp	(revision 165)
+--- drumstick/src/alsaclient.cpp	(revision 164)
++++ drumstick/src/alsaclient.cpp	(revision 165)
 @@ -47,8 +47,8 @@
  /**
  @mainpage drumstick Documentation
@@ -132,10 +128,8 @@ Index: library/src/alsaclient.cpp
   * Returns true or false depending on the input thread state.
   * @return true if the input thread is stopped.
   */
-Index: library/src/alsaport.cpp
-===================================================================
---- library/src/alsaport.cpp	(revision 164)
-+++ library/src/alsaport.cpp	(revision 165)
+--- drumstick/src/alsaport.cpp	(revision 164)
++++ drumstick/src/alsaport.cpp	(revision 165)
 @@ -689,9 +689,10 @@
      if ((m_MidiClient != NULL) && (m_MidiClient->getHandle() != NULL))
      {
@@ -210,16 +204,3 @@ Index: library/src/alsaport.cpp
      }
  }
  
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 164)
-+++ CMakeLists.txt	(revision 165)
-@@ -44,6 +44,8 @@
- SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- SET(CMAKE_SKIP_RULE_DEPENDENCY FALSE)
-+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
- 
- # Additional CMake modules for 3rd party library checks reside here
- SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_admin")
diff --git a/debian/patches/drumstick-armel.patch b/debian/patches/drumstick-armel.patch
index 4969fd7..ecfcfe4 100644
--- a/debian/patches/drumstick-armel.patch
+++ b/debian/patches/drumstick-armel.patch
@@ -2,8 +2,8 @@ Description: Fix compilation errors on arm and mips.
  The patch is included in drumstick-0.3.1 and can be dropped upon completion
  of #579153.
 Origin: http://drumstick.svn.sourceforge.net/viewvc/drumstick/trunk/library/src/qwrk.cpp?r1=166&r2=172&view=patch
---- trunk/library/src/qwrk.cpp	2010/04/17 22:31:51	166
-+++ trunk/library/src/qwrk.cpp	2010/05/13 15:32:47	172
+--- drumstick/src/qwrk.cpp	2010/04/17 22:31:51	166
++++ drumstick/src/qwrk.cpp	2010/05/13 15:32:47	172
 @@ -851,7 +851,7 @@
          readGap(4);
          int measure = read16bit();

-- 
kmidimon packaging