rev 12168 - in branches/kde4-backports/packages/kdepim/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Fri Sep 12 14:06:27 UTC 2008
Author: ana
Date: 2008-09-12 14:06:26 +0000 (Fri, 12 Sep 2008)
New Revision: 12168
Added:
branches/kde4-backports/packages/kdepim/debian/kitchensync.install.disabled
Modified:
branches/kde4-backports/packages/kdepim/debian/changelog
branches/kde4-backports/packages/kdepim/debian/control
branches/kde4-backports/packages/kdepim/debian/kalarm.install
branches/kde4-backports/packages/kdepim/debian/kdepim-wizards.install
branches/kde4-backports/packages/kdepim/debian/libkholidays4.install
branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
branches/kde4-backports/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
branches/kde4-backports/packages/kdepim/debian/rules
Log:
kdepim 4.1.1 backport
Modified: branches/kde4-backports/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/changelog 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/changelog 2008-09-12 14:06:26 UTC (rev 12168)
@@ -1,3 +1,44 @@
+kdepim (4:4.1.1-2~lenny+1) lenny; urgency=low
+
+ * Backport for Lenny.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Fri, 12 Sep 2008 15:54:46 +0200
+
+kdepim (4:4.1.1-2) experimental; urgency=low
+
+ +++ Changes by Sune Vuorela
+
+ * Ship empty kitchensync package for now. (Closes: 498402)
+
+ +++ Changes by Armin Berres:
+
+ * Change shlibs to enforce a strict dependency on the libraries which
+ are shipped with kdepim (Closes: #498371).
+
+ -- Armin Berres <trigger+debian at space-based.de> Thu, 11 Sep 2008 00:32:32 +0200
+
+kdepim (4:4.1.1-1) experimental; urgency=low
+
+ * New upstream release
+ * File in libkholidays renamed
+ * groupwarewizard is problematic. we probably need to go thru NEW, so hold
+ on a bit.
+
+ -- Sune Vuorela <debian at pusling.com> Mon, 01 Sep 2008 22:10:51 +0200
+
+kdepim (4:4.1.0-2) experimental; urgency=low
+
+ +++ Changes by Sune Vuorela:
+
+ * KJots is section utils.
+
+ +++ Changes by Fathi Boudra:
+
+ * Bump Standards-Version to 3.8.0 (no changes needed).
+ * Replace libopensync1exp3-dev build dependency by libopensync1exp4-dev.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 12 Aug 2008 17:35:56 +0200
+
kdepim (4:4.1.0-1~lenny+1) lenny; urgency=low
* Backport for Lenny.
Modified: branches/kde4-backports/packages/kdepim/debian/control
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/control 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/control 2008-09-12 14:06:26 UTC (rev 12168)
@@ -13,13 +13,13 @@
libstreams-dev, libstreamanalyzer-dev, libsearchclient-dev,
libstrigihtmlgui-dev, libstrigiqtdbusclient-dev, zlib1g-dev,
libakonadi-dev (>= 1.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://pim.kde.org/
Package: kdepim
Architecture: all
Depends: akonadi-kde (>= ${source:Version}), akregator (>= ${source:Version}), kaddressbook (>= ${source:Version}), kalarm (>= ${source:Version}),
- kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kleopatra (>= ${source:Version}),
+ kdepim-kresources (>= ${source:Version}), kdepim-wizards (>= ${source:Version}), kitchensync (>= ${source:Version}), kleopatra (>= ${source:Version}),
kmail (>= ${source:Version}), knode (>= ${source:Version}), knotes (>= ${source:Version}), kode (>= ${source:Version}),
konsolekalendar (>= ${source:Version}), kontact (>= ${source:Version}), korganizer (>= ${source:Version}),
ktimetracker (>= ${source:Version}), ktnef (>= ${source:Version}), kdepim-strigi-plugins (>= ${source:Version}), kjots (>= ${source:Version})
@@ -147,19 +147,19 @@
This package is part of KDE, and a component of the KDE PIM module.
See the 'kde' and 'kdepim' packages for more information.
-#Package: kitchensync
-#Section: kde
-#Architecture: any
-#Depends: ${shlibs:Depends}
-#Suggests: konqueror
-#Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1)
-#Homepage: http://www.opensync.org/wiki/kitchensync
-#Description: Synchronization framework
-# This package contains a synchronization framework, still under heavy
-# development. Kitchensync uses opensync.
-# .
-# This package is part of KDE, and a component of the KDE PIM module.
-# See the 'kde' and 'kdepim' packages for more information.
+Package: kitchensync
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: konqueror
+Conflicts: kdebluetooth-irmcsync (<< 0.99+1.0beta2-4.1)
+Homepage: http://www.opensync.org/wiki/kitchensync
+Description: Synchronization framework
+ This package contains a synchronization framework, still under heavy
+ development. Kitchensync uses opensync.
+ .
+ This package is part of KDE, and a component of the KDE PIM module.
+ See the 'kde' and 'kdepim' packages for more information.
Package: kleopatra
Section: net
Modified: branches/kde4-backports/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/kalarm.install 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/kalarm.install 2008-09-12 14:06:26 UTC (rev 12168)
@@ -22,6 +22,7 @@
usr/share/kde4/apps/kalarm/kalarmui.rc
usr/share/kde4/apps/kconf_update/kalarm-1.2.1-general.pl
usr/share/kde4/apps/kconf_update/kalarm-1.9.5-defaults.pl
+usr/share/kde4/apps/kconf_update/kalarm-2.0.2-general.pl
usr/share/kde4/apps/kconf_update/kalarm-version.pl
usr/share/kde4/apps/kconf_update/kalarm.upd
usr/share/kde4/config.kcfg/kalarmconfig.kcfg
Modified: branches/kde4-backports/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/kdepim-wizards.install 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/kdepim-wizards.install 2008-09-12 14:06:26 UTC (rev 12168)
@@ -1,5 +1,4 @@
usr/bin/egroupwarewizard
-usr/bin/groupwarewizard
usr/bin/kolabwizard
usr/bin/scalixwizard
usr/bin/sloxwizard
Copied: branches/kde4-backports/packages/kdepim/debian/kitchensync.install.disabled (from rev 12167, branches/kde4/packages/kdepim/debian/kitchensync.install.disabled)
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/kitchensync.install.disabled (rev 0)
+++ branches/kde4-backports/packages/kdepim/debian/kitchensync.install.disabled 2008-09-12 14:06:26 UTC (rev 12168)
@@ -0,0 +1,20 @@
+usr/bin/kitchensync
+usr/lib/kde4/kitchensyncpart.so
+usr/lib/libkitchensyncprivate.so.4
+usr/lib/libkitchensyncprivate.so.4.1.0
+usr/lib/libqopensync.so.4
+usr/lib/libqopensync.so.4.1.0
+usr/share/applications/kde4/kitchensync.desktop
+usr/share/icons/hicolor/16x16/actions/sync-start.png
+usr/share/icons/hicolor/16x16/apps/kitchensync.png
+usr/share/icons/hicolor/22x22/actions/sync-start.png
+usr/share/icons/hicolor/22x22/apps/kitchensync.png
+usr/share/icons/hicolor/32x32/actions/sync-start.png
+usr/share/icons/hicolor/32x32/apps/kitchensync.png
+usr/share/icons/hicolor/48x48/actions/sync-start.png
+usr/share/icons/hicolor/48x48/apps/kitchensync.png
+usr/share/kde4/apps/kitchensync/about/kitchensync.css
+usr/share/kde4/apps/kitchensync/about/main.html
+usr/share/kde4/apps/kitchensync/about/top-right-kitchensync.png
+usr/share/kde4/apps/kitchensync/kitchensync_part.rc
+usr/share/kde4/apps/kitchensync/kitchensyncui.rc
Modified: branches/kde4-backports/packages/kdepim/debian/libkholidays4.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/libkholidays4.install 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/libkholidays4.install 2008-09-12 14:06:26 UTC (rev 12168)
@@ -29,7 +29,7 @@
usr/share/kde4/apps/libkholidays/holiday_il
usr/share/kde4/apps/libkholidays/holiday_is
usr/share/kde4/apps/libkholidays/holiday_it
-usr/share/kde4/apps/libkholidays/holiday_ja
+usr/share/kde4/apps/libkholidays/holiday_jp
usr/share/kde4/apps/libkholidays/holiday_lt
usr/share/kde4/apps/libkholidays/holiday_mx
usr/share/kde4/apps/libkholidays/holiday_nl
Modified: branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff 2008-09-12 14:06:26 UTC (rev 12168)
@@ -1,8 +1,6 @@
-Index: kdepim-4.0.84/akregator/src/akregator_part.cpp
-===================================================================
---- kdepim-4.0.84.orig/akregator/src/akregator_part.cpp 2008-06-18 14:42:07.000000000 +0200
-+++ kdepim-4.0.84/akregator/src/akregator_part.cpp 2008-06-29 21:46:11.000000000 +0200
-@@ -342,6 +342,20 @@
+--- a/akregator/src/akregator_part.cpp
++++ b/akregator/src/akregator_part.cpp
+@@ -344,6 +344,20 @@
look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
mainFolder.appendChild(look);
Modified: branches/kde4-backports/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff 2008-09-12 14:06:26 UTC (rev 12168)
@@ -1,65 +1,63 @@
---- a/libkdepim/CMakeLists.txt
-+++ b/libkdepim/CMakeLists.txt
-@@ -91,7 +91,7 @@
+--- a/akonadi/kabc/CMakeLists.txt
++++ b/akonadi/kabc/CMakeLists.txt
+@@ -20,6 +20,6 @@
+ qt4_wrap_ui(kabcakonadi_LIB_SRC kabcitemeditor.ui)
+ kde4_add_library( akonadi-kabc SHARED ${kabcakonadi_LIB_SRC} )
- kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
+-target_link_libraries( akonadi-kabc ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} )
++target_link_libraries( akonadi-kabc ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kabc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kabc DESTINATION ${LIB_INSTALL_DIR})
+--- a/akonadi/kcal/CMakeLists.txt
++++ b/akonadi/kcal/CMakeLists.txt
+@@ -18,6 +18,6 @@
--target_link_libraries(kdepim ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS} kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS})
-+target_link_libraries(kdepim ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KRESOURCES_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS} kimproxy ${KDE4_KPIMUTILS_LIBS} ${KDE4_KLDAP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KPARTS_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY})
+ kde4_add_library( akonadi-kcal SHARED ${kcalakonadi_LIB_SRC} )
- if(MINGW)
- target_link_libraries(kdepim oleaut32)
---- a/akregator/src/CMakeLists.txt
-+++ b/akregator/src/CMakeLists.txt
-@@ -31,7 +31,7 @@
+-target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} )
++target_link_libraries( akonadi-kcal ${KDE4_AKONADI_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} )
+ set_target_properties( akonadi-kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS akonadi-kcal DESTINATION ${LIB_INSTALL_DIR})
+--- a/kresources/akonadi/kabc/CMakeLists.txt
++++ b/kresources/akonadi/kabc/CMakeLists.txt
+@@ -8,7 +8,7 @@
- kde4_add_library(akregatorprivate SHARED ${akregatorprivate_LIB_SRCS})
+ kde4_add_plugin(kabc_akonadi ${kabc_akonadi_SRCS})
--target_link_libraries(akregatorprivate kdepim ${KDE4_KHTML_LIBS} ${KDE4_SYNDICATION_LIBS} akregatorinterfaces )
-+target_link_libraries(akregatorprivate kdepim ${KDE4_KHTML_LIBS} ${KDE4_SYNDICATION_LIBS} ${KDE4_SOLID_LIBRARY} akregatorinterfaces )
+-target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS})
++target_link_libraries(kabc_akonadi ${KDE4_KABC_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KRESOURCES_LIBRARY})
- set_target_properties(akregatorprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS akregatorprivate DESTINATION ${LIB_INSTALL_DIR})
---- a/ktimetracker/CMakeLists.txt
-+++ b/ktimetracker/CMakeLists.txt
-@@ -74,7 +74,7 @@
- kde4_add_plugin(karmpart ${karmpart_PART_SRCS})
+ install(TARGETS kabc_akonadi DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/akonadi/kcal/CMakeLists.txt
++++ b/kresources/akonadi/kcal/CMakeLists.txt
+@@ -9,7 +9,7 @@
--target_link_libraries(karmpart ${KDE4_KCAL_LIBS} ${KDE4_KIO_LIBS} kdepim kcal_resourceremote)
-+target_link_libraries(karmpart ${KDE4_KCAL_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB} kdepim kcal_resourceremote)
- if(X11_Xscreensaver_LIB)
- target_link_libraries(karmpart ${X11_Xscreensaver_LIB} )
- endif(X11_Xscreensaver_LIB)
---- a/korganizer/CMakeLists.txt
-+++ b/korganizer/CMakeLists.txt
-@@ -226,7 +226,8 @@
+ kde4_add_plugin(kcal_akonadi ${kcal_akonadi_SRCS})
- add_dependencies(korganizerprivate kmail)
+-target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} akonadi-kcal)
++target_link_libraries(kcal_akonadi ${KDE4_KCAL_LIBS} ${KDE4_AKONADI_LIBS} ${KDE4_KRESOURCES_LIBRARY} ${KDE4_KABC_LIBRARY} akonadi-kcal)
--target_link_libraries(korganizerprivate ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_KCAL_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_KMIME_LIBRARY}
-+target_link_libraries(korganizerprivate ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KUTILS_LIBRARY} ${KDE4_KCAL_LIBRARY} ${KDE4_KPIMIDENTITIES_LIBRARY} ${KDE4_KMIME_LIBRARY} ${ZLIB_LIBRARY}
-+
- kdepim korganizer_eventviewer korganizer_calendar kocorehelper
- korg_stdprinting kholidays korganizer_interfaces )
---- a/kontact/plugins/summary/CMakeLists.txt
-+++ b/kontact/plugins/summary/CMakeLists.txt
-@@ -12,7 +12,7 @@
- add_dependencies(kontact_summaryplugin kmail_xml)
- endif(KMAIL_SUPPORTED)
+ install(TARGETS kcal_akonadi DESTINATION ${PLUGIN_INSTALL_DIR} )
+--- a/kresources/groupwise/soap/CMakeLists.txt
++++ b/kresources/groupwise/soap/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ )
--kdepim4_link_unique_libraries(kontact_summaryplugin ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kontactinterfaces kdepim)
-+kdepim4_link_unique_libraries(kontact_summaryplugin ${KDE4_KUTILS_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} kontactinterfaces kdepim ${KDE4_KDEUI_LIBS} )
+ kde4_add_library(gwsoap SHARED ${gwsoap_SRCS})
+-target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS})
++target_link_libraries(gwsoap ${KDE4_KCAL_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ set_target_properties(gwsoap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS gwsoap DESTINATION ${LIB_INSTALL_DIR})
- ########### next target ###############
+--- a/strigi-analyzer/vcf/CMakeLists.txt
++++ b/strigi-analyzer/vcf/CMakeLists.txt
+@@ -6,6 +6,6 @@
-@@ -20,7 +20,7 @@
+ kde4_add_library(vcf MODULE ${vcfendanalyzer_SRCS})
- kde4_add_plugin(kcm_kontactsummary ${kcm_kontactsummary_PART_SRCS})
-
--kdepim4_link_unique_libraries(kcm_kontactsummary ${KDE4_KUTILS_LIBS})
-+kdepim4_link_unique_libraries(kcm_kontactsummary ${KDE4_KUTILS_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KIO_LIBS})
-
- ########### install files ###############
-
+-target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS})
++target_link_libraries(vcf ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KABC_LIBS} ${QT_QTCORE_LIBRARY})
+ set_target_properties(vcf PROPERTIES PREFIX strigiea_)
+ install(TARGETS vcf LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
Modified: branches/kde4-backports/packages/kdepim/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/rules 2008-09-12 13:47:15 UTC (rev 12167)
+++ branches/kde4-backports/packages/kdepim/debian/rules 2008-09-12 14:06:26 UTC (rev 12168)
@@ -2,10 +2,12 @@
include debian/cdbs/kde.mk
-DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libkleo4 := -V'libkleo4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libkpgp4 := -V'libkpgp4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libksieve4 := -V'libksieve4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libmaildir4 := -V'libmaildir4 (>= 4:4.1.0)'
-DEB_DH_MAKESHLIBS_ARGS_libmimelib4 := -V'libmimelib4 (>= 4:4.1.0)'
+DEBIANVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
+
+DEB_DH_MAKESHLIBS_ARGS_libkdepim4 := -V'libkdepim4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libkholidays4 := -V'libkholidays4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libkleo4 := -V'libkleo4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libkpgp4 := -V'libkpgp4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libksieve4 := -V'libksieve4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libmaildir4 := -V'libmaildir4 (= $(DEBIANVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib4 := -V'libmimelib4 (= $(DEBIANVERSION))'
More information about the pkg-kde-commits
mailing list