rev 13032 - in branches/kde4.2/packages: kdebase-workspace/debian kdelibs/debian kdelibs/debian/patches kdepimlibs/debian

Modestas Vainius modax-guest at alioth.debian.org
Tue Dec 23 20:58:15 UTC 2008 

Author: modax-guest
Date: 2008-12-23 20:58:15 +0000 (Tue, 23 Dec 2008)
New Revision: 13032

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
   branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff
   branches/kde4.2/packages/kdepimlibs/debian/changelog
   branches/kde4.2/packages/kdepimlibs/debian/control
   branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5-dev.install
   branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5.install
Log:
Support for common cmake options directory

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2008-12-23 20:58:15 UTC (rev 13032)
@@ -9,7 +9,7 @@
   +++ Changes by Modestas Vainius:
 
   * Drop libplasma* packages, moved to kde4libs.
-  * Build depend on libplasma-dev and kdelibs5-dev 4:4.1.82+svn894637.
+  * Build depend on libplasma-dev and kdelibs5-dev 4:4.1.86.
   * Readd build depend on kdepimlibs5-dev, also libboost-dev.
   * Bump shlibs of libkwineffects1, libkdecorations4 and
     kdebase-workspace-libs4+5 to upstream version.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2008-12-23 20:58:15 UTC (rev 13032)
@@ -4,8 +4,8 @@
 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>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
- kdelibs5-dev (>= 4:4.1.85+svn899730), libplasma-dev (>= 4:4.1.85+svn899730),
- kdepimlibs5-dev (>= 4:4.1.82+svn894631), libboost-dev,
+ kdelibs5-dev (>= 4:4.1.86+svn900830), libplasma-dev (>= 4:4.1.86+svn900830),
+ kdepimlibs5-dev (>= 4:4.1.86), libboost-dev,
  python-support (>= 0.6), python-dev,
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libcaptury-dev, libck-connector-dev, libdbus-1-dev, libnm-util-dev, network-manager-dev (>= 0.7.0~),

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2008-12-23 20:58:15 UTC (rev 13032)
@@ -1,4 +1,4 @@
-kde4libs (4:4.1.86+svn900520-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.1.86+svn900840-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -76,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>  Tue, 23 Dec 2008 11:24:12 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 23 Dec 2008 22:24:08 +0200
 
 kde4libs (4:4.1.3-2) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdelibs/debian/libplasma3.symbols.in	2008-12-23 20:58:15 UTC (rev 13032)
@@ -1020,6 +1020,7 @@
  _ZN6Plasma10IconWidgetD2Ev at Base 4:4.1.80+svn889833
  _ZN6Plasma10PaintUtils10shadowBlurER6QImageiRK6QColor at Base 4:4.1.80+svn889833
  _ZN6Plasma10PaintUtils10shadowTextE7QString6QColorS2_6QPointi at Base 4:4.1.80+svn889833
+ _ZN6Plasma10PaintUtils10shadowTextE7QStringRK5QFont6QColorS5_6QPointi at Base 4:4.1.86+svn900830
  _ZN6Plasma10PaintUtils10transitionERK7QPixmapS3_d at Base 4:4.1.80+svn889833
  _ZN6Plasma10PaintUtils16roundedRectangleERK6QRectFd at Base 4:4.1.80+svn889833
  _ZN6Plasma10PushButton10styleSheetEv at Base 4:4.1.80+svn889833

Modified: 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	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdelibs/debian/patches/24_2.6.2_use_common_cmake_config_dir.diff	2008-12-23 20:58:15 UTC (rev 13032)
@@ -4,16 +4,16 @@
  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)
+-if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
++if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} 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)
+-else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
++else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} 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)
+-endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.6.2)
++endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} 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/kdepimlibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/changelog	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdepimlibs/debian/changelog	2008-12-23 20:58:15 UTC (rev 13032)
@@ -1,10 +1,10 @@
-kdepimlibs (4:4.1.85+svn898618-0r1) UNRELEASED; urgency=low
+kdepimlibs (4:4.1.86+svn900842-0r1) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
   +++ Changes by Modestas Vainius:
 
-  * Build depend on kdelibs5-dev >= 4:4.1.82+svn894637.
+  * Build depend on kdelibs5-dev >= 4:4.1.86+svn900830.
   * Build depend on libical-dev >= 0.33.
   * Build depend on Akonadi (>= 1.0.80). Our 1.0.0 is unusable.
   * Remove build depend on cmake. It will be pulled in by kdelibs5-dev.
@@ -18,7 +18,7 @@
 
   * Drop patch 02_no_dependency_file.diff as it is obsolete as of r891439.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Dec 2008 03:38:53 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 23 Dec 2008 22:41:36 +0200
 
 kdepimlibs (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdepimlibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/control	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdepimlibs/debian/control	2008-12-23 20:58:15 UTC (rev 13032)
@@ -5,7 +5,7 @@
 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,
- kdelibs5-dev (>= 4:4.1.82+svn894637), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
+ kdelibs5-dev (>= 4:4.1.86+svn900830), libboost-dev, libgpgme11-dev, libldap2-dev, libsasl2-dev,
  libakonadi-dev (>= 1.0.80), libical-dev (>= 0.33)
 Standards-Version: 3.8.0
 Homepage: http://pim.kde.org/

Modified: branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5-dev.install
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5-dev.install	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5-dev.install	2008-12-23 20:58:15 UTC (rev 13032)
@@ -1,5 +1,3 @@
-#usr/share/kde4/apps/cmake/modules/KDEPimLibsImports-debian.cmake
-#usr/share/kde4/apps/cmake/modules/KDEPimLibsImports.cmake
 usr/include/akonadi/agentbase.h
 usr/include/akonadi/agentfilterproxymodel.h
 usr/include/akonadi/agentinstance.h
@@ -337,10 +335,10 @@
 usr/include/syndication/specificitemvisitor.h
 usr/include/syndication/syndication.h
 usr/include/syndication/tools.h
-usr/lib/KdepimLibs-4.2.0/cmake/KdepimLibsConfig.cmake
-usr/lib/KdepimLibs-4.2.0/cmake/KdepimLibsConfigVersion.cmake
-usr/lib/KdepimLibs-4.2.0/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
-usr/lib/KdepimLibs-4.2.0/cmake/KDEPimLibsLibraryTargetsWithPrefix-debian.cmake
+usr/lib/cmake/KdepimLibs-4.2.0/KDEPimLibsLibraryTargetsWithPrefix-debian.cmake
+usr/lib/cmake/KdepimLibs-4.2.0/KDEPimLibsLibraryTargetsWithPrefix.cmake
+usr/lib/cmake/KdepimLibs-4.2.0/KdepimLibsConfig.cmake
+usr/lib/cmake/KdepimLibs-4.2.0/KdepimLibsConfigVersion.cmake
 usr/lib/gpgmepp/GpgmeppConfig.cmake
 usr/lib/gpgmepp/GpgmeppLibraryDepends.cmake
 usr/lib/libakonadi-kabc.so
@@ -373,4 +371,3 @@
 usr/share/kde4/apps/cmake/modules/FindLibical.cmake
 usr/share/kde4/apps/cmake/modules/FindQGpgme.cmake
 usr/share/kde4/apps/cmake/modules/KDEPimLibsDependencies.cmake
-usr/share/kde4/apps/cmake/modules/KDEPimLibsInformation.cmake

Modified: branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5.install
===================================================================
--- branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5.install	2008-12-23 20:37:13 UTC (rev 13031)
+++ branches/kde4.2/packages/kdepimlibs/debian/kdepimlibs5.install	2008-12-23 20:58:15 UTC (rev 13032)
@@ -1,5 +1,3 @@
-
-/usr/lib/libqgpgme.so.1
 usr/lib/kde4/kabc_directory.so
 usr/lib/kde4/kabc_file.so
 usr/lib/kde4/kabc_ldapkio.so
@@ -54,6 +52,7 @@
 usr/lib/libkxmlrpcclient.so.4.2.0
 usr/lib/libmailtransport.so.4
 usr/lib/libmailtransport.so.4.2.0
+usr/lib/libqgpgme.so.1
 usr/lib/libqgpgme.so.1.0.1
 usr/lib/libsyndication.so.4
 usr/lib/libsyndication.so.4.2.0

More information about the pkg-kde-commits mailing list