From a2b378b3f3a160a0d3c059e9ef43a9d194c482b8 Mon Sep 17 00:00:00 2001
From: Eran <eran@debian-jessie.debian-jessie>
Date: Mon, 14 Sep 2015 03:23:03 -0400
Subject: [PATCH] Linux: generate a more standard deb packages using cmake
 (Part III)

---
 CMakeLists.txt                 | 5 +++--
 DESC                           | 2 ++
 InnoSetup/codelite64_mingw.iss | 4 ++--
 InnoSetup/codelite_mingw.iss   | 4 ++--
 LiteEditor/CMakeLists.txt      | 5 ++---
 LiteEditor/LiteEditor.project  | 1 +
 LiteEditor/autoversion.cpp     | 2 +-
 7 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 DESC

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 325bab5772..6c9dc1cb5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,11 +371,12 @@ if ( MAKE_DEB )
     set(CPACK_PACKAGE_NAME                "CodeLite")
     set(CPACK_PACKAGE_VERSION             "8.2.5")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER   "Eran Ifrah <eran.ifrah@gmail.com>") #required
-    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An open source, cross platform C/C++/PHP and Node.js IDE")
+    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "C/C++/PHP and Node.js IDE (Integrated Development Environment")
     set(CPACK_DEBIAN_PACKAGE_SECTION      "devel")
     set(CPACK_DEBIAN_PACKAGE_PRIORITY     "optional")
     set(CPACK_DEBIAN_PACKAGE_RECOMMENDS   "build-essential, git, subversion, gdb, xterm, gcc, g++")
-    set(CPACK_DEBIAN_PACKAGE_DEPENDS      "libgtk2.0-dev, libssh-dev, libedit-dev, libhunspell-dev, libclang-3.5-dev, clang-format-3.5, liblldb-3.5-dev")
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS      "libc6, libgtk2.0-dev, libssh-dev, libedit-dev, libhunspell-dev, libclang-3.5-dev, clang-format-3.5, liblldb-3.5-dev")
+    set(CPACK_PACKAGE_DESCRIPTION_FILE    "${CL_SRC_ROOT}/DESC")
     set(CPACK_STRIP_FILES TRUE)
     INCLUDE(CPack)
 endif( MAKE_DEB )
diff --git a/DESC b/DESC
new file mode 100644
index 0000000000..f23c6f7279
--- /dev/null
+++ b/DESC
@@ -0,0 +1,2 @@
+CodeLite is an open source, free, cross platform IDE specialized in C, C++, PHP and JavaScript 
+(mainly for backend developers using Node.js) programming languages
\ No newline at end of file
diff --git a/InnoSetup/codelite64_mingw.iss b/InnoSetup/codelite64_mingw.iss
index fb52650029..c167ffbe2c 100644
--- a/InnoSetup/codelite64_mingw.iss
+++ b/InnoSetup/codelite64_mingw.iss
@@ -5,7 +5,7 @@
 AppName=CodeLite
 AppVerName=CodeLite
 AppPublisher=Eran Ifrah
-AppVersion=8.2.4
+AppVersion=8.2.5
 AppPublisherURL=http://codelite.org
 AppSupportURL=http://codelite.org
 AppUpdatesURL=http://codelite.org
@@ -13,7 +13,7 @@ DefaultDirName={pf64}\CodeLite
 DefaultGroupName=CodeLite
 LicenseFile=license.txt
 OutputDir=output
-OutputBaseFilename=codelite-amd64-8.2.4
+OutputBaseFilename=codelite-amd64-8.2.5
 ChangesEnvironment=yes
 FlatComponentsList=yes
 SetupIconFile=box_software.ico
diff --git a/InnoSetup/codelite_mingw.iss b/InnoSetup/codelite_mingw.iss
index 49cbe4439f..9572913212 100644
--- a/InnoSetup/codelite_mingw.iss
+++ b/InnoSetup/codelite_mingw.iss
@@ -5,7 +5,7 @@
 AppName=CodeLite
 AppVerName=CodeLite
 AppPublisher=Eran Ifrah
-AppVersion=8.2.4
+AppVersion=8.2.5
 AppPublisherURL=http://codelite.org
 AppSupportURL=http://codelite.org
 AppUpdatesURL=http://codelite.org
@@ -13,7 +13,7 @@ DefaultDirName={pf}\CodeLite
 DefaultGroupName=CodeLite
 LicenseFile=license.txt
 OutputDir=output
-OutputBaseFilename=codelite-x86-8.2.4
+OutputBaseFilename=codelite-x86-8.2.5
 ChangesEnvironment=yes
 FlatComponentsList=yes
 SetupIconFile=box_software.ico
diff --git a/LiteEditor/CMakeLists.txt b/LiteEditor/CMakeLists.txt
index 28d6001547..1e853c1fc9 100644
--- a/LiteEditor/CMakeLists.txt
+++ b/LiteEditor/CMakeLists.txt
@@ -99,8 +99,6 @@ if(NOT APPLE)
         install(FILES ${CL_SRC_ROOT}/Runtime/codelite_fix_files DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
         install(FILES ${CL_SRC_ROOT}/Runtime/codelite_kill_children DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
         install(FILES ${CL_SRC_ROOT}/Runtime/codelite_xterm DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
-        install(FILES ${CL_SRC_ROOT}/Runtime/clg++ DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
-        install(FILES ${CL_SRC_ROOT}/Runtime/clgcc DESTINATION ${CL_PREFIX}/bin PERMISSIONS ${EXE_PERM})
     endif (UNIX)
 
     ## codelite icons
@@ -162,6 +160,7 @@ if(NOT APPLE)
     if (UNIX AND CL_COPY_WX_LIBS) # If we're packaging with wx2.9
         # We need to deduce the location of the wx libs to be installed
         execute_process(COMMAND ${WX_TOOL} --libs OUTPUT_VARIABLE WX_LIBSOUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)
+        
         if (${WX_LIBSOUTPUT} MATCHES "^-L.+") # In recent, multi-architecture, distro versions it'll start with -L/foo/bar
             string(REGEX REPLACE "^-L([^ ;]+).*" "\\1" WX_LIBS_DIR ${WX_LIBSOUTPUT})
         else()
@@ -183,7 +182,7 @@ if(NOT APPLE)
             endif()
         endforeach()
 
-        file(GLOB wxfilepaths ${WX_LIBS_ALL})	
+        file(GLOB wxfilepaths ${WX_LIBS_ALL})
         install(FILES ${wxfilepaths} DESTINATION ${CL_PREFIX}/${CL_INSTALL_LIBDIR}/codelite)
     endif()
 
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 2d9cdafc2c..2fc0978fc5 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -640,6 +640,7 @@
       <File Name="../codelite_echo/CMakeLists.txt"/>
     </VirtualDirectory>
     <File Name="../TODO.TXT"/>
+    <File Name="../DESC"/>
   </VirtualDirectory>
   <VirtualDirectory Name="Docking Windows">
     <File Name="output_pane.cpp"/>
diff --git a/LiteEditor/autoversion.cpp b/LiteEditor/autoversion.cpp
index b51f072343..0f65b49960 100644
--- a/LiteEditor/autoversion.cpp
+++ b/LiteEditor/autoversion.cpp
@@ -27,5 +27,5 @@
 #define CL_GIT_REVISION
 
 #include <wx/string.h>
-const wxChar* clGitRevision = wxT("8.2.4");
+const wxChar* clGitRevision = wxT("8.2.5");
 #endif