# HG changeset patch
# User hwmirror
# Date 1447086872 0
# Node ID 14de659a4b796775d8b1b154d082c9b7b57b6bf3
# Parent  91370591662bead0e825fa4fd5116f05ffd22186# Parent  721210d689a569038188485eceb8cfc9fd84bff7
Merge with github pull requests

diff -r 91370591662b -r 14de659a4b79 cmake_modules/paths.cmake
--- a/cmake_modules/paths.cmake	Mon Nov 09 16:34:03 2015 +0000
+++ b/cmake_modules/paths.cmake	Mon Nov 09 16:34:32 2015 +0000
@@ -15,7 +15,7 @@
 #resource paths
 if(UNIX AND NOT APPLE)
     set(target_binary_install_dir "bin" CACHE PATH "install dest for binaries")
-    set(target_library_install_dir "lib" CACHE PATH "install dest for libs")
+    set(target_library_install_dir "lib${LIB_SUFFIX}" CACHE PATH "install dest for libs")
 
     string(SUBSTRING "${DATA_INSTALL_DIR}" 0 1 sharepath_start)
     if(${sharepath_start} MATCHES "/")
diff -r 91370591662b -r 14de659a4b79 share/hedgewars.appdata.xml
--- a/share/hedgewars.appdata.xml	Mon Nov 09 16:34:03 2015 +0000
+++ b/share/hedgewars.appdata.xml	Mon Nov 09 16:34:32 2015 +0000
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
  <id type="desktop">hedgewars.desktop</id>
- <licence>GFDL</licence>
+ <metadata_license>GFDL</metadata_license>
+ <name>Hedgewars</name>
+ <summary>Funny turn-based artillery game, featuring fighting Hedgehogs!</summary>
  <description>
   <p>
    Hedgewars is a turn based strategy, artillery, action and comedy game, featuring the antics of pink hedgehogs with attitude as they battle from the depths of hell to the depths of space.