[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    r38881 - lyx-devel/trunk/development/cmake
From:       kornel () lyx ! org
Date:       2011-05-29 12:20:23
Message-ID: 20110529122023.6451C31029 () lyx ! lyx ! org
[Download RAW message or body]

Author: kornel
Date: Sun May 29 14:20:23 2011
New Revision: 38881
URL: http://www.lyx.org/trac/changeset/38881

Log:
Generate package dependences for debian

Modified:
   lyx-devel/trunk/development/cmake/LyxPackaging.cmake
   lyx-devel/trunk/development/cmake/TODO.txt

Modified: lyx-devel/trunk/development/cmake/LyxPackaging.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/LyxPackaging.cmake	Sun May 29 13:17:35 \
                2011	(r38880)
+++ lyx-devel/trunk/development/cmake/LyxPackaging.cmake	Sun May 29 14:20:23 \
2011	(r38881) @@ -32,19 +32,9 @@
 set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
 
-# This is experimental, valid on _my_ system (Kornel)
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>= 4.4.3-0)")
-if(ASPELL_FOUND)
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= \
                0.60.6-1),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-endif()
-if(ENCHANT_FOUND)
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "libenchant1c2a (>= \
                1.6.0-0),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-endif()
-if(LYX_EXTERNAL_BOOST)
-	if(Boost_FOUND)
-		set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0 (>= \
                1.40.0-4),libboost-signals1.40.0 (>= \
                1.40.0-4),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-	endif()
-endif()
+# use dpkg-shlibdeps to generate package dependency list.
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
 #
 # for the next ones, cpack insists on data with values in some file
 set(CPACK_PACKAGE_DESCRIPTION_FILE \
"${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_description.txt")

Modified: lyx-devel/trunk/development/cmake/TODO.txt
==============================================================================
--- lyx-devel/trunk/development/cmake/TODO.txt	Sun May 29 13:17:35 2011	(r38880)
+++ lyx-devel/trunk/development/cmake/TODO.txt	Sun May 29 14:20:23 2011	(r38881)
@@ -46,6 +46,7 @@
       - DONE: target for regenaration of lfuns manual would be nice (ie make \
                lfundoc)
       - DONE: target for doxygen generation (ie make doxydoc)
   * DONE: get patch version from configure.ac (regex)
+  * DONE: Automatically generate package dependencies for debian
 
 
 Cleanup


[prev in list] [next in list] [prev in thread] [next in thread]