rev 13027 - in branches/kde4.2/packages/kdelibs/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Tue Dec 23 09:48:31 UTC 2008 

Author: modax-guest
Date: 2008-12-23 09:48:31 +0000 (Tue, 23 Dec 2008)
New Revision: 13027

Added:
   branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff
Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
   branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
   branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
   branches/kde4.2/packages/kdelibs/debian/patches/series
Log:
Try to use common cmake config dir

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-23 09:35:03 UTC (rev 13026)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-23 09:48:31 UTC (rev 13027)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.85+svn899730-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.86+svn900520-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -19,7 +19,11 @@
     - 19_findqt4_optional_x11_pthread.diff - refresh.
     - 20_use_dejavu_as_default_font.diff - refresh.
     - 22_hack_in_etc_kde4_in_kstandarddirs.diff - refresh.
-  * Update cmake (build-)dependency to 2.6.2
+  * Update cmake (build-)dependency to 2.6.2:
+    - depend on 2.6.2-3~ due to cmake common config lib support;
+    - 23_2.6.2_use_common_cmake_config_dir.diff - enable support for common
+      cmake config dir with cmake 2.6.2 (debian patched version);
+    - enable cmake var KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR.
   * Build with -DCMAKE_USE_RELATIVE_PATHS=ON.
   * Bump standards-version to 3.8.0:
     - add README.source.
@@ -72,7 +76,7 @@
   * Add dependency on xdg-utils to kdelibs5. KDE applications use xdg-open to
     invoke a browser when not running in a KDE environment these days.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Dec 2008 18:13:12 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 23 Dec 2008 11:24:12 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2008-12-23 09:35:03 UTC (rev 13026)
+++ branches/kde4.2/packages/kdelibs/debian/control	2008-12-23 09:48:31 UTC (rev 13027)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.3),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.2-3~), pkg-kde-tools (>= 0.3),
  shared-mime-info (>= 0.20), libphonon-dev (>= 4:4.2.80),
  libcups2-dev, libdbus-1-dev, libqt4-dev (>= 4.4.3), libqt4-opengl-dev (>= 4.4.3),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -46,7 +46,7 @@
 Package: kdelibs5-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.2), automoc (>= 1.0~svn850570),
+Depends: ${shlibs:Depends}, kdelibs5 (= ${binary:Version}), cmake (>= 2.6.2-3~), automoc (>= 1.0~svn850570),
  ${sameVersionDep:libqt4-dev}, ${sameVersionDep:libsoprano-dev}, ${sameVersionDep:libphonon-dev}
 #Suggests: kdelibs5-doc (= ${source:Version})
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)

Modified: branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-23 09:35:03 UTC (rev 13026)
+++ branches/kde4.2/packages/kdelibs/debian/kdelibs5-dev.install	2008-12-23 09:48:31 UTC (rev 13027)
@@ -1562,7 +1562,6 @@
 usr/share/kde4/apps/cmake/modules/FindOpenEXR.cmake
 usr/share/kde4/apps/cmake/modules/FindOpenSSL.cmake
 usr/share/kde4/apps/cmake/modules/FindPCRE.cmake
-usr/share/kde4/apps/cmake/modules/FindPNG.cmake
 usr/share/kde4/apps/cmake/modules/FindPhonon.cmake
 usr/share/kde4/apps/cmake/modules/FindPopplerQt4.cmake
 usr/share/kde4/apps/cmake/modules/FindPostgreSQL.cmake
@@ -1584,7 +1583,6 @@
 usr/share/kde4/apps/cmake/modules/FindSoprano.cmake
 usr/share/kde4/apps/cmake/modules/FindSqlite.cmake
 usr/share/kde4/apps/cmake/modules/FindStrigi.cmake
-usr/share/kde4/apps/cmake/modules/FindTIFF.cmake
 usr/share/kde4/apps/cmake/modules/FindTaglib.cmake
 usr/share/kde4/apps/cmake/modules/FindUSB.cmake
 usr/share/kde4/apps/cmake/modules/FindX11.cmake

Modified: branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2008-12-23 09:35:03 UTC (rev 13026)
+++ branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2008-12-23 09:48:31 UTC (rev 13027)
@@ -2571,6 +2571,7 @@
  _ZNK6Plasma6Corona20containmentForScreenEii at Base 4:4.1.80+svn889833
  _ZNK6Plasma6Corona21availableScreenRegionEi at Base 4:4.1.80+svn889833
  _ZNK6Plasma6Corona6configEv at Base 4:4.1.80+svn889833
+ _ZNK6Plasma6Corona9freeEdgesEi at Base 4:4.1.86+svn900462
  _ZNK6Plasma6Dialog10metaObjectEv at Base 4:4.1.80+svn889833
  _ZNK6Plasma6Dialog13resizeCornersEv at Base 4:4.1.80+svn889833
  _ZNK6Plasma6Slider10metaObjectEv at Base 4:4.1.80+svn889833

Added: branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff	2008-12-23 09:48:31 UTC (rev 13027)
@@ -0,0 +1,19 @@
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -594,13 +594,13 @@
+ option(KDE4_BUILD_TESTS  "Build the tests")
+ option(KDE4_ENABLE_HTMLHANDBOOK  "Create targets htmlhandbook for creating the html versions of the docbook docs")
+ 
+-if(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.2)
++if(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.1)
+    option(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR 
+           "Prefer to install the <package>Config.cmake files to lib/cmake/<package> instead to lib/<package>/cmake" 
+           TRUE)
+-else(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.2)
++else(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.1)
+    set(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR  FALSE)
+-endif(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.2)
++endif(${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH} VERSION_GREATER 2.6.1)
+ 
+ 
+ # This is obsolete now. I just keep it here so in case somebody stumbles upon it somewhere

Modified: branches/kde4.2/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-23 09:35:03 UTC (rev 13026)
+++ branches/kde4.2/packages/kdelibs/debian/patches/series	2008-12-23 09:48:31 UTC (rev 13027)
@@ -10,3 +10,4 @@
 20_use_dejavu_as_default_font.diff
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
+24_2.6.2_use_common_cmake_config_dir.diff

More information about the pkg-kde-commits mailing list