[SCM] musescore/master: Removing +dfsg1, checking if needed.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fe2d6173ca22ea37e7a4ae60e9144dcb77369594
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jun 16 16:52:02 2015 -0400

    Removing +dfsg1, checking if needed.

diff --git a/debian/changelog b/debian/changelog
index dcdc7e6..727104a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-musescore (2.0.1+dfsg1-1) unstable; urgency=low
+musescore (2.0.1-1) unstable; urgency=low
 
+  [ Toby Smithe ]
   * New upstream release (2.0.1)
   * Closes: #768524, #724588; LP: #886729, #829153, #699868, #1444318.
   * Drop obsolete patches and refresh remainder.
@@ -8,6 +9,9 @@ musescore (2.0.1+dfsg1-1) unstable; urgency=low
   * Update VCS info.
   * Update debian/copyright, rewrite as machine-readable.
 
+  [ Tiago Bortoletto Vaz ]
+  * Removing +dfsg1 from version
+
  -- Toby Smithe <tsmithe at ubuntu.com>  Mon, 23 Mar 2015 14:29:21 +0100
 
 musescore (1.3+dfsg1-0.1) unstable; urgency=low
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
index dbcbce0..1644075 100644
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@@ -136,6 +136,17 @@ else (APPLE)
             musescorefonts-Free.qrc)
 endif (APPLE)
 
+if (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
+      INCLUDE (Platform/GNU)
+      set ( USE_ALSA 0 )
+      set ( USE_PORTMIDI 0 )
+endif (${CMAKE_SYSTEM} MATCHES "GNU-0.3")
+
+if (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
+      INCLUDE (Platform/kFreeBSD)
+      set ( USE_ALSA 0 )
+      set ( USE_PORTMIDI 0 )
+endif (${CMAKE_SYSTEM} MATCHES "kFreeBSD")
 
 set (AUDIO "")
 if (MINGW)
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 90bee16..7a38a2a 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -18,7 +18,7 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-subdirs(templates wallpaper locale styles sound manual
+subdirs(templates wallpaper locale styles sound #manual
    workspaces instruments)
 
 install (DIRECTORY

-- 
musescore packaging