rev 8760 - in branches/kde4/packages/kdepim/debian: . patches
Armin Berres
trigger-guest at alioth.debian.org
Fri Jan 4 11:23:23 UTC 2008
Author: trigger-guest
Date: 2008-01-04 11:23:23 +0000 (Fri, 04 Jan 2008)
New Revision: 8760
Added:
branches/kde4/packages/kdepim/debian/patches/
branches/kde4/packages/kdepim/debian/patches/04_disable_sqlplugin.diff
branches/kde4/packages/kdepim/debian/patches/series
Modified:
branches/kde4/packages/kdepim/debian/akonadi.install
branches/kde4/packages/kdepim/debian/changelog
branches/kde4/packages/kdepim/debian/control
branches/kde4/packages/kdepim/debian/kalarm.install
branches/kde4/packages/kdepim/debian/kdepim-dev.install
branches/kde4/packages/kdepim/debian/kitchensync.install
branches/kde4/packages/kdepim/debian/kmail.install
branches/kde4/packages/kdepim/debian/knotes.install
branches/kde4/packages/kdepim/debian/korganizer.install
branches/kde4/packages/kdepim/debian/ktimetracker.install
branches/kde4/packages/kdepim/debian/ktnef.install
branches/kde4/packages/kdepim/debian/libakonadi-dev.install
Log:
svn snapshot of kdepim. not finished at all, but at least compilable
Modified: branches/kde4/packages/kdepim/debian/akonadi.install
===================================================================
--- branches/kde4/packages/kdepim/debian/akonadi.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/akonadi.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -25,7 +25,6 @@
usr/lib/kde4/akonadi_serializer_sms.so
usr/lib/kde4/plasma_applet_plasmobiff.so
usr/lib/kde4/plasma_engine_akonadi.so
-usr/lib/kde4/plugins/sqldrivers/libqsqlmysqlembedded.so
usr/lib/libakonadiprivate.so
usr/lib/libakonadiprivate.so.4
usr/lib/libakonadiprivate.so.4.0.0
Modified: branches/kde4/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4/packages/kdepim/debian/changelog 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/changelog 2008-01-04 11:23:23 UTC (rev 8760)
@@ -1,3 +1,14 @@
+kdepim (4:3.98.0~svn755919-1) UNRELEASED; urgency=low
+
+ * Svn snapshot of revision 7555919.
+ * Update installed files.
+ * Raise build-dep to >= 4:3.98.0~svn755919-1.
+ * Build depend on libopensync1exp2 instead of libopensync1exp1. Otherwise we
+ are hit by #458569.
+ * Disable sqlplugin from akonadi. Fails to build with --as-needed.
+
+ -- Armin Berres <trigger+debian at space-based.de> Fri, 04 Jan 2008 12:22:40 +0100
+
kdepim (4:3.96.0-1) experimental; urgency=low
* New upstream release.
Modified: branches/kde4/packages/kdepim/debian/control
===================================================================
--- branches/kde4/packages/kdepim/debian/control 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/control 2008-01-04 11:23:23 UTC (rev 8760)
@@ -2,10 +2,10 @@
Section: kde
Priority: optional
Maintainer: Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdepimlibs5-dev (>=4:3.96.0),
+Build-Depends: cdbs, debhelper (>= 5), cmake, quilt, kdepimlibs5-dev (>=4:3.98.0~svn755919-1),
libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
xsltproc, libgnokii3-dev, libxss-dev, libmysqlclient15-dev, libqca2-dev,
- libpisock-dev, libstrigiqtdbusclient0, libplasma-dev, libopensync1exp1-dev
+ libpisock-dev, libstrigiqtdbusclient0, libplasma-dev, libopensync1exp2-dev
Standards-Version: 3.7.2
Homepage: http://pim.kde.org/
Modified: branches/kde4/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kalarm.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/kalarm.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -13,13 +13,12 @@
usr/share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
usr/share/dbus-1/interfaces/org.kde.kalarm.notify.xml
usr/share/icons/hicolor/16x16/apps/kalarm.png
+usr/share/icons/hicolor/22x22/apps/kalarm.png
usr/share/icons/hicolor/32x32/apps/kalarm.png
usr/share/icons/hicolor/48x48/apps/kalarm.png
+usr/share/icons/oxygen/16x16/actions/document-new-from-template.png
usr/share/icons/oxygen/16x16/actions/kalarm.png
-usr/share/icons/oxygen/16x16/actions/new_from_template.png
-usr/share/icons/oxygen/22x22/actions/kalarm_disabled.png
-usr/share/icons/oxygen/22x22/actions/kalarm.png
-usr/share/icons/oxygen/22x22/actions/new_from_template.png
+usr/share/icons/oxygen/22x22/actions/document-new-from-template.png
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
Modified: branches/kde4/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kdepim-dev.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/kdepim-dev.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -118,7 +118,7 @@
usr/lib/libkorganizer_calendar.so
usr/lib/libkorganizer_eventviewer.so
usr/lib/libkorganizer_interfaces.so
-usr/lib/libkorganizer.so
+usr/lib/libkorganizerprivate.so
usr/lib/libkorg_stdprinting.so
usr/lib/libkpilot.so
usr/lib/libkpinterfaces.so
Modified: branches/kde4/packages/kdepim/debian/kitchensync.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kitchensync.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/kitchensync.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -1,23 +1,18 @@
usr/bin/kitchensync
usr/lib/kde4/kitchensyncpart.so
usr/lib/libkitchensyncprivate.so.4
-usr/lib/libkitchensyncprivate.so.4.2.0
+usr/lib/libkitchensyncprivate.so.4.0.0
usr/lib/libqopensync.so.4
-usr/lib/libqopensync.so.4.2.0
+usr/lib/libqopensync.so.4.0.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/icons/oxygen/128x128/apps/mobile_phone.png
-usr/share/icons/oxygen/16x16/actions/hotsync.png
-usr/share/icons/oxygen/16x16/apps/mobile_phone.png
-usr/share/icons/oxygen/22x22/actions/hotsync.png
-usr/share/icons/oxygen/32x32/actions/hotsync.png
-usr/share/icons/oxygen/32x32/apps/mobile_phone.png
-usr/share/icons/oxygen/48x48/actions/hotsync.png
-usr/share/icons/oxygen/48x48/apps/mobile_phone.png
-usr/share/icons/oxygen/64x64/apps/mobile_phone.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
Modified: branches/kde4/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde4/packages/kdepim/debian/kmail.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/kmail.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -19,6 +19,7 @@
usr/share/applications/kde4/KMail.desktop
usr/share/applications/kde4/kmail_view.desktop
usr/share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
+usr/share/dbus-1/interfaces/org.kde.kmail.kmail.xml
usr/share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml
usr/share/icons/hicolor/128x128/apps/kmail.png
usr/share/icons/hicolor/16x16/apps/kmail.png
@@ -63,31 +64,24 @@
usr/share/kde4/apps/kmail/pics/key_ok.png
usr/share/kde4/apps/kmail/pics/key.png
usr/share/kde4/apps/kmail/pics/key_unknown.png
-usr/share/kde4/apps/kmail/pics/kmmsgattachment.png
-usr/share/kde4/apps/kmail/pics/kmmsgdel.png
-usr/share/kde4/apps/kmail/pics/kmmsgflag.png
-usr/share/kde4/apps/kmail/pics/kmmsgforwarded.png
usr/share/kde4/apps/kmail/pics/kmmsgfullyencrypted.png
-usr/share/kde4/apps/kmail/pics/kmmsgfullysigned.png
-usr/share/kde4/apps/kmail/pics/kmmsgham.png
-usr/share/kde4/apps/kmail/pics/kmmsgignored.png
-usr/share/kde4/apps/kmail/pics/kmmsgnew.png
usr/share/kde4/apps/kmail/pics/kmmsgpartiallyencrypted.png
-usr/share/kde4/apps/kmail/pics/kmmsgpartiallysigned.png
-usr/share/kde4/apps/kmail/pics/kmmsgqueued.png
-usr/share/kde4/apps/kmail/pics/kmmsgread_fwd.png
-usr/share/kde4/apps/kmail/pics/kmmsgread_fwd_replied.png
-usr/share/kde4/apps/kmail/pics/kmmsgread.png
-usr/share/kde4/apps/kmail/pics/kmmsgread_replied.png
-usr/share/kde4/apps/kmail/pics/kmmsgreplied.png
-usr/share/kde4/apps/kmail/pics/kmmsgsent.png
-usr/share/kde4/apps/kmail/pics/kmmsgspam.png
-usr/share/kde4/apps/kmail/pics/kmmsgtodo.png
usr/share/kde4/apps/kmail/pics/kmmsgundefinedencrypted.png
-usr/share/kde4/apps/kmail/pics/kmmsgundefinedsigned.png
-usr/share/kde4/apps/kmail/pics/kmmsgunseen.png
-usr/share/kde4/apps/kmail/pics/kmmsgwatched.png
usr/share/kde4/apps/kmail/pics/kmwizard.png
+usr/share/kde4/apps/kmail/pics/mail-deleted.png
+usr/share/kde4/apps/kmail/pics/mail-forwarded.png
+usr/share/kde4/apps/kmail/pics/mail-forwarded-replied.png
+usr/share/kde4/apps/kmail/pics/mail-mark-junk.png
+usr/share/kde4/apps/kmail/pics/mail-mark-task.png
+usr/share/kde4/apps/kmail/pics/mail-queued.png
+usr/share/kde4/apps/kmail/pics/mail-replied.png
+usr/share/kde4/apps/kmail/pics/mail-sent.png
+usr/share/kde4/apps/kmail/pics/mail-signed-partially.png
+usr/share/kde4/apps/kmail/pics/mail-signed.png
+usr/share/kde4/apps/kmail/pics/mail-signed-verified.png
+usr/share/kde4/apps/kmail/pics/mail-task.png
+usr/share/kde4/apps/kmail/pics/mail-thread-ignored.png
+usr/share/kde4/apps/kmail/pics/mail-thread-watch.png
usr/share/kde4/apps/kmail/pics/pgp-keys.png
usr/share/kde4/apps/kmail/pics/quotecollapse.png
usr/share/kde4/apps/kmail/pics/quoteexpand.png
Modified: branches/kde4/packages/kdepim/debian/knotes.install
===================================================================
--- branches/kde4/packages/kdepim/debian/knotes.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/knotes.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -17,15 +17,10 @@
usr/share/icons/hicolor/32x32/apps/knotes.png
usr/share/icons/hicolor/48x48/apps/knotes.png
usr/share/icons/hicolor/64x64/apps/knotes.png
-usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/enum_list.png
-usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/format_decreaseindent.png
-usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/format_increaseindent.png
usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png
usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png
usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png
usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
-usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/text_sub.png
-usr/share/kde4/apps/knotes/icons/oxygen/16x16/actions/text_super.png
usr/share/kde4/apps/knotes/knotesappui.rc
usr/share/kde4/apps/knotes/knotes_part.rc
usr/share/kde4/apps/knotes/knotesui.rc
Modified: branches/kde4/packages/kdepim/debian/korganizer.install
===================================================================
--- branches/kde4/packages/kdepim/debian/korganizer.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/korganizer.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -2,7 +2,6 @@
usr/bin/ical2vcal
usr/bin/korgac
usr/bin/korganizer
-usr/bin/thememain
usr/lib/kde4/kcal_blog.so
usr/lib/kde4/kcal_groupdav.so
usr/lib/kde4/kcal_kabc.so
@@ -44,8 +43,8 @@
usr/lib/libkorganizer_eventviewer.so.4.0.0
usr/lib/libkorganizer_interfaces.so.4
usr/lib/libkorganizer_interfaces.so.4.0.0
-usr/lib/libkorganizer.so.4
-usr/lib/libkorganizer.so.4.0.0
+usr/lib/libkorganizerprivate.so.4
+usr/lib/libkorganizerprivate.so.4.0.0
usr/lib/libkorg_stdprinting.so.4
usr/lib/libkorg_stdprinting.so.4.0.0
usr/share/applications/kde4/korganizer.desktop
@@ -60,7 +59,6 @@
usr/share/icons/hicolor/48x48/apps/korganizer.png
usr/share/icons/hicolor/64x64/apps/korganizer.png
usr/share/kde4/apps/kconf_update/korganizer.upd
-usr/share/kde4/apps/korgac/icons/oxygen/22x22/actions/korgac_disabled.png
usr/share/kde4/apps/korgac/icons/oxygen/22x22/actions/korgac.png
usr/share/kde4/apps/korganizer/icons/crystalsvg/16x16/actions/timeline.png
usr/share/kde4/apps/korganizer/icons/crystalsvg/22x22/actions/timeline.png
Modified: branches/kde4/packages/kdepim/debian/ktimetracker.install
===================================================================
--- branches/kde4/packages/kdepim/debian/ktimetracker.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/ktimetracker.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -6,13 +6,13 @@
usr/share/icons/hicolor/32x32/apps/ktimetracker.png
usr/share/icons/hicolor/48x48/apps/ktimetracker.png
usr/share/icons/hicolor/64x64/apps/ktimetracker.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/128x128/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/16x16/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/22x22/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/32x32/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/48x48/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/64x64/actions/new-subtask.png
-usr/share/kde4/apps/ktimetracker/icons/oxygen/scalable/actions/new-subtask.svgz
+usr/share/kde4/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
+usr/share/kde4/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
usr/share/kde4/apps/ktimetracker/pics/active-icon-0.xpm
usr/share/kde4/apps/ktimetracker/pics/active-icon-1.xpm
usr/share/kde4/apps/ktimetracker/pics/active-icon-2.xpm
Modified: branches/kde4/packages/kdepim/debian/ktnef.install
===================================================================
--- branches/kde4/packages/kdepim/debian/ktnef.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/ktnef.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -1,6 +1,4 @@
usr/bin/ktnef
usr/share/applications/kde4/ktnef.desktop
-usr/share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
-usr/share/icons/hicolor/22x22/actions/ktnef_extract_to.png
usr/share/icons/hicolor/48x48/apps/ktnef.png
usr/share/kde4/apps/ktnef/ktnefui.rc
Modified: branches/kde4/packages/kdepim/debian/libakonadi-dev.install
===================================================================
--- branches/kde4/packages/kdepim/debian/libakonadi-dev.install 2008-01-04 06:07:07 UTC (rev 8759)
+++ branches/kde4/packages/kdepim/debian/libakonadi-dev.install 2008-01-04 11:23:23 UTC (rev 8760)
@@ -1,5 +1,8 @@
usr/include/libakonadi/agentbase.h
+usr/include/libakonadi/agentfilterproxymodel.h
+usr/include/libakonadi/agentinstancemodel.h
usr/include/libakonadi/agentmanager.h
+usr/include/libakonadi/agenttypemodel.h
usr/include/libakonadi/akonadi_export.h
usr/include/libakonadi/collectionattributefactory.h
usr/include/libakonadi/collectionattribute.h
@@ -31,7 +34,6 @@
usr/include/libakonadi/itempayloadinternals_p.h
usr/include/libakonadi/itemserializerplugin.h
usr/include/libakonadi/itemstorejob.h
-usr/include/libakonadi/itemsync.h
usr/include/libakonadi/itemview.h
usr/include/libakonadi/job.h
usr/include/libakonadi/kabc/kabcitembrowser.h
@@ -43,6 +45,7 @@
usr/include/libakonadi/messagecollectionmodel.h
usr/include/libakonadi/monitor.h
usr/include/libakonadi/profilemanager.h
+usr/include/libakonadi/profilemodel.h
usr/include/libakonadi/resourcebase.h
usr/include/libakonadi/resource.h
usr/include/libakonadi/session.h
Added: branches/kde4/packages/kdepim/debian/patches/04_disable_sqlplugin.diff
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/04_disable_sqlplugin.diff (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/04_disable_sqlplugin.diff 2008-01-04 11:23:23 UTC (rev 8760)
@@ -0,0 +1,14 @@
+This plugins fails to link because of --as-needed.
+One (ugly) solution would be to link libpthread and libc in.
+Need to find a proper solution.
+--- a/akonadi/server/CMakeLists.txt
++++ b/akonadi/server/CMakeLists.txt
+@@ -18,7 +18,7 @@
+ add_subdirectory( control )
+ add_subdirectory( src )
+ if (MYSQL_EMBEDDED_FOUND AND OPENSSL_FOUND)
+- add_subdirectory( sqlplugin )
++# add_subdirectory( sqlplugin )
+ endif (MYSQL_EMBEDDED_FOUND AND OPENSSL_FOUND)
+ add_subdirectory( tests )
+
Added: branches/kde4/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4/packages/kdepim/debian/patches/series (rev 0)
+++ branches/kde4/packages/kdepim/debian/patches/series 2008-01-04 11:23:23 UTC (rev 8760)
@@ -0,0 +1 @@
+04_disable_sqlplugin.diff
More information about the pkg-kde-commits
mailing list