rev 10694 - in branches/kde4/packages/kdepim/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-25 16:33:26 +0000 (Sun, 25 May 2008)
New Revision: 10694

Modified:
   branches/kde4/packages/kdepim/debian/changelog
   branches/kde4/packages/kdepim/debian/control
   branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Log:
Initial changes for pim 4.0.80.

Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog	2008-05-25 11:18:01 UTC (rev 10693)
+++ branches/kde4/packages/kdepim/debian/changelog	2008-05-25 16:33:26 UTC (rev 10694)
@@ -1,3 +1,23 @@
+kdepim (4:4.0.80-1~pre1) UNRELEASED; urgency=low
+
+  * New upstream development milestone (KDE 4.1 Beta1).
+
+  +++ Changes by Modestas Vainius:
+
+  * Update and refresh 97th patch.
+  * Build-depend on kdepimlibs5-dev (>= 4.0.80). It is needed. Bump other KDE
+    specific build-depends a bit too. Bump akonadi-dev to >= 0.81.0
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 May 2008 18:54:05 +0300
+
+kde4pim (4:4.0.74-2) experimental; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Add proper dependencies for kdepim metapackage.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 25 May 2008 17:53:31 +0300
+
 kde4pim (4:4.0.74-1) experimental; urgency=low
 
   * First KDE 4.1 snapshot packaged.

Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control	2008-05-25 11:18:01 UTC (rev 10693)
+++ branches/kde4/packages/kdepim/debian/control	2008-05-25 16:33:26 UTC (rev 10694)
@@ -4,19 +4,24 @@
 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>
 Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.4.5), quilt,
- kdepimlibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72), libplasma-dev (>= 4:4.0.72),
+ kdepimlibs5-dev (>= 4:4.0.80), libphonon-dev (>= 4:4.0.80), libplasma-dev (>= 4:4.0.74),
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),
  libpisock-dev, libopensync1exp3-dev, libassuan-dev,
  libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,
  libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
- libakonadi-dev
+ libakonadi-dev (>= 0.81.0)
 Standards-Version: 3.7.3
 Homepage: http://pim.kde.org/
 
 Package: kdepim
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: akonadi-kde (>= ${source:Version}), akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}),
+ kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}),
+ kmail (>= ${source:Version}), kmobiletools (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), kode (>= ${source:Version}),
+ konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}), korn (>= ${source:Version}),
+ kpilot (>= ${source:Version}), ktimetracker (>= ${source:Version}), ktnef (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version})
+Suggests: kdepim-doc
 Description: Personal Information Management apps from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,

Modified: branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-05-25 11:18:01 UTC (rev 10693)
+++ branches/kde4/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff	2008-05-25 16:33:26 UTC (rev 10694)
@@ -11,7 +11,7 @@
  install(TARGETS schema  DESTINATION ${LIB_INSTALL_DIR})
 --- a/libkdepim/CMakeLists.txt
 +++ b/libkdepim/CMakeLists.txt
-@@ -94,7 +94,7 @@
+@@ -92,7 +92,7 @@
  
  kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
  
@@ -44,7 +44,7 @@
  install(TARGETS imap DESTINATION ${LIB_INSTALL_DIR})
 --- a/libkleo/CMakeLists.txt
 +++ b/libkleo/CMakeLists.txt
-@@ -105,7 +105,7 @@
+@@ -107,7 +107,7 @@
  if(WIN32)
  target_link_libraries(kleo ${kleo_LIB_LIBS}  ${GPGME_VANILLA_LIBRARIES} )
  else(WIN32)
@@ -76,26 +76,26 @@
     ${KDE4_KIO_LIBS}  
 --- a/kontact/plugins/kmail/CMakeLists.txt
 +++ b/kontact/plugins/kmail/CMakeLists.txt
-@@ -36,7 +36,7 @@
+@@ -27,7 +27,7 @@
+ 
  kde4_add_plugin(kcm_kmailsummary ${kcm_kmailsummary_PART_SRCS})
  
+-kdepim4_link_unique_libraries(kcm_kmailsummary ${KDE4_KDEUI_LIBS})
++kdepim4_link_unique_libraries(kcm_kmailsummary ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
  
--kdepim4_link_unique_libraries(kcm_kmailsummary  ${KDE4_KDEUI_LIBS})
-+kdepim4_link_unique_libraries(kcm_kmailsummary  ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
+ ########### install files ###############
  
- install(TARGETS kcm_kmailsummary  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
 --- a/kontact/plugins/newsticker/CMakeLists.txt
 +++ b/kontact/plugins/newsticker/CMakeLists.txt
-@@ -25,7 +25,7 @@
+@@ -13,7 +13,7 @@
  
+ kde4_add_plugin(kcm_kontactknt ${kcm_kontactknt_PART_SRCS})
  
+-kdepim4_link_unique_libraries(kcm_kontactknt ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
++kdepim4_link_unique_libraries(kcm_kontactknt ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY})
  
--kdepim4_link_unique_libraries(kcm_kontactknt  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
-+kdepim4_link_unique_libraries(kcm_kontactknt  ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY})
+ ########### install files ###############
  
- install(TARGETS kcm_kontactknt  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
 --- a/kpilot/conduits/base/CMakeLists.txt
 +++ b/kpilot/conduits/base/CMakeLists.txt
 @@ -32,6 +32,6 @@