Packaging related minor fixes. Please see the ChangeLog.

9 files changed, 28 insertions, 17 deletions

diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index c2bd16bf..c0018fd0 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -80,7 +80,7 @@ SET(MusE_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/${MusE_INSTALL_NAME}/plugins)
 
 ## Top documentation dir
 IF(NOT DEFINED MusE_DOC_DIR)
-      SET(MusE_DOC_DIR ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}-${MusE_VERSION_FULL}/)
+      SET(MusE_DOC_DIR ${SHARE_INSTALL_PREFIX}/doc/${MusE_INSTALL_NAME}/)
 ENDIF(NOT DEFINED MusE_DOC_DIR)
 
 ## Data directory
@@ -348,7 +348,7 @@ IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
-set(CMAKE_CXX_FLAGS         "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS         "-Wall -Wextra -Winvalid-pch -fno-exceptions ${CMAKE_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce ${CMAKE_CXX_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_DEBUG   "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}")
 
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 0847ab73..5decbd67 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -2,6 +2,15 @@
         - Initial addition of midi track info to pianoroll. WORK IN PROGRESS. (Tim)
           TODO: Just to get off the hard drive. A few things still need to be linked up!
                 And we really need icons to replace those 'T' 'C' 'S' 'X' buttons.
+        - Fix minor issues that surfaced when I built an RPM for the alpha release (Orcan):
+              o Added missing AudioVideo category to the .desktop file.
+              o Fixed the executable name in the .desktop file.
+              o Converted README.softsynth, synti/vam/README, README.de, SECURITY to UTF8.
+              o Made the default MusE_DOC_DIR consistent with other default definitions.
+              o Removed explicit rpath to ${QT_LIBRARY_DIR}. cmake should add it automatically
+                if there's need.
+              o Removed unnecessary linkage to libQtSvg.
+              o utils are installed with executable permissons.
 25.12.2010:
         - Added fancy background selection widget with live preview to Appearance Settings. (Orcan)
         - Applied Geoff King's second capitalization patch.
diff --git a/muse2/README.de b/muse2/README.de
index e04d835d..00b55960 100644
--- a/muse2/README.de
+++ b/muse2/README.de
@@ -6,14 +6,14 @@ Guten Tag!
 dies ist MusE, der Open Source MIDI/Audio Sequencer.
 
 MusE steht unter der GNU General Public Licence (GPL).
-Für Einzelheiten siehe COPYING.
+Für Einzelheiten siehe COPYING.
 
 ,-----------------------------------------------------------------.
 | HINWEIS                                                         |
 |-----------------------------------------------------------------|
-| Viel Teile des Codes von MusE sind EXPERIMENTELL und können     |
-| zu Programmabstürzen und wer weiß was sonst noch allem          |
-| führen.                                                         |
+| Viel Teile des Codes von MusE sind EXPERIMENTELL und können     |
+| zu Programmabstürzen und wer weiß was sonst noch allem          |
+| führen.                                                         |
 | SIE BENUTZEN DIESE SOFTWARE AUF EIGENES RISIKO!                 |
 `-----------------------------------------------------------------'
 
@@ -36,18 +36,18 @@ Für Einzelheiten siehe COPYING.
         download:
 	  http://jackit.sourceforge.net/download/
 
-      - fluidsynth-1.0.3 (die synti früher bekannt als "iiwusynth") von
+      - fluidsynth-1.0.3 (die synti früher bekannt als "iiwusynth") von
         http://savannah.nongnu.org/download/fluid
 
       - Linux Kernel mit rtc (RealTimeClock) Treiber (device /dev/rtc)
-        ("low latency patches" für minimales timing-jitter wären fein)
+        ("low latency patches" für minimales timing-jitter wären fein)
 
       - ALSA von http://www.alsa-project.org/
         Version 0.9.x oder neuer
 
       - gcc >= 4.x.x
 
-      - natürlich: eine Soundkarte und/oder irgendwelche Midi Geräte
+      - natürlich: eine Soundkarte und/oder irgendwelche Midi Geräte
 
   =============================
       Kompilierung
diff --git a/muse2/README.softsynth b/muse2/README.softsynth
index e3201ff2..662ef423 100644
--- a/muse2/README.softsynth
+++ b/muse2/README.softsynth
@@ -73,7 +73,7 @@ These are the software synthesizers currently available:
         "organ" implements a gui connected bidirectional
         to the synth via stdin/stdout
 
-      - fluid, is the adapted version of Peter Hanappe´s
+      - fluid, is the adapted version of Peter Hanappe´s
         sample based fluid synthesizer (formerly known as iiwu)
             - loadable sound fonts
             - multi timbral
diff --git a/muse2/SECURITY b/muse2/SECURITY
index d09e03d9..e0fa68a5 100644
--- a/muse2/SECURITY
+++ b/muse2/SECURITY
@@ -234,7 +234,7 @@ how it's done.
 ________________________________________________________________________________
 
 
-This document was written by Jörn Nettingsmeier
+This document was written by Jörn Nettingsmeier
 <nettings@folkwang-hochschule.de>
 Corrections and improvements welcome.
 
diff --git a/muse2/muse/CMakeLists.txt b/muse2/muse/CMakeLists.txt
index aa1d9d18..fe35ca65 100644
--- a/muse2/muse/CMakeLists.txt
+++ b/muse2/muse/CMakeLists.txt
@@ -233,7 +233,6 @@ target_link_libraries(core
       widgets 
       
       ${QT_LIBRARIES}
-      QtSvg
       ${SNDFILE_LIBRARIES}
       ${SAMPLERATE_LIBRARIES}
       ${UUID_LIBRARIES}
diff --git a/muse2/packaging/muse.desktop b/muse2/packaging/muse.desktop
index c5f0c84b..e8444960 100644
--- a/muse2/packaging/muse.desktop
+++ b/muse2/packaging/muse.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Muse
+Name=MusE
 GenericName=Audio/MIDI Sequencer
 Comment=Midi Music Editor
 Icon=muse_icon
 Type=Application
-Exec=muse
+Exec=muse2
 Terminal=false
-Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio;
+Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio;AudioVideo;
diff --git a/muse2/synti/vam/README b/muse2/synti/vam/README
index 1b1ee269..738ad657 100644
--- a/muse2/synti/vam/README
+++ b/muse2/synti/vam/README
@@ -1,6 +1,6 @@
 VAM: Virtual Analog for MusE
 
-    by Josef Lindman Hörnlund
+    by Josef Lindman Hörnlund
 
 
 *** WARNING! VAM has at the time some significant problems
diff --git a/muse2/utils/CMakeLists.txt b/muse2/utils/CMakeLists.txt
index d3082b7d..20ae35cd 100644
--- a/muse2/utils/CMakeLists.txt
+++ b/muse2/utils/CMakeLists.txt
@@ -18,8 +18,11 @@
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #=============================================================================
 
-install( FILES
+file(GLOB utils_files
       muse-find-unused-wavs
       muse-song-convert.py
+      )
+
+install (PROGRAMS ${utils_files}
       DESTINATION ${MusE_SHARE_DIR}/utils/
       )