Merge lp:~bulldog98/kdepim-runtime/ubuntu-4.6 into lp:~kubuntu-packagers/kubuntu-packaging/kdepim-runtime

[Jonathan Kolberg]

I did the changes for compiling KDE 4.6 beta 1 with the debian folder.

[Jonathan Kolberg (bulldog98)]

Here the change Jonathan wanted to have

[lp:~bulldog98/kdepim-runtime/ubuntu-4.6]

62. By Jonathan Riddell on 2010-11-27

* New upstream release
* updated the patch fix_ontology_vs_feeder_automoc_race_condition.diff

[Jonathan Riddell (jr)]

merged into new ubuntu-4.6 branch

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-25 00:57:45 +0000
+++ debian/changelog	2010-11-27 21:56:29 +0000
@@ -1,3 +1,10 @@
+kdepim-runtime (4:4.5.80-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * updated the patch fix_ontology_vs_feeder_automoc_race_condition.diff
+  
+ -- Jonathan Kolberg <[e-mail]>  Fri, 26 Nov 2010 14:02:30 +0100
+
 kdepim-runtime (4:4.4.7-0ubuntu2) UNRELEASED; urgency=low
 
   * Bump so version to 4.6.0 in debian/kdepim-runtime.install for rebuild

=== modified file 'debian/kdepim-runtime.install'
--- debian/kdepim-runtime.install	2010-11-25 00:52:15 +0000
+++ debian/kdepim-runtime.install	2010-11-27 21:56:29 +0000
@@ -1,56 +1,103 @@
+usr/bin/accountwizard
 usr/bin/akonadi2xml
+usr/bin/akonadi_akonotes_resource
 usr/bin/akonadi_birthdays_resource
+usr/bin/akonadi_calendarsearch_agent
 usr/bin/akonadi_contacts_resource
-usr/bin/akonadi_ical_resource
+usr/bin/akonadi_davgroupware_resource
 usr/bin/akonadi_imap_resource
+usr/bin/akonadi_invitations_agent
 usr/bin/akonadi_kabc_resource
 usr/bin/akonadi_kcal_resource
-usr/bin/akonadi_knut_resource
+usr/bin/akonadi_kdeaccounts_resource
 usr/bin/akonadi_kolabproxy_resource
 usr/bin/akonadi_localbookmarks_resource
 usr/bin/akonadi_maildir_resource
 usr/bin/akonadi_maildispatcher_agent
 usr/bin/akonadi_mailtransport_dummy_resource
-usr/bin/akonadi_mbox_resource
 usr/bin/akonadi_microblog_resource
+usr/bin/akonadi_mixedmaildir_resource
 usr/bin/akonadi_nepomuk_calendar_feeder
 usr/bin/akonadi_nepomuk_contact_feeder
 usr/bin/akonadi_nepomuktag_resource
 usr/bin/akonadi_nntp_resource
-usr/bin/akonadi_notes_resource
+usr/bin/akonadi_openxchange_resource
 usr/bin/akonadi_pop3_resource
-usr/bin/akonadi_vcard_resource
+usr/bin/akonadi_strigi_feeder
 usr/bin/akonadi_vcarddir_resource
 usr/bin/akonaditray
 usr/bin/kaddressbookmigrator
+usr/bin/kjotsmigrator
 usr/bin/kmail-migrator
 usr/bin/kres-migrator
+usr/lib/kde4/accountwizard_plugin.so
 usr/lib/kde4/akonadi_serializer_addressee.so
 usr/lib/kde4/akonadi_serializer_bookmark.so
 usr/lib/kde4/akonadi_serializer_contactgroup.so
 usr/lib/kde4/akonadi_serializer_kcal.so
+usr/lib/kde4/akonadi_serializer_kcalcore.so
 usr/lib/kde4/akonadi_serializer_mail.so
 usr/lib/kde4/akonadi_serializer_microblog.so
+usr/lib/kde4/akonadi_mbox_resource.so
+usr/lib/kde4/akonadi_vcard_resource.so
+usr/lib/kde4/akonadi_ical_resource.so
+usr/lib/kde4/akonadi_notes_resource.so
+usr/lib/kde4/akonadi_knut_resource.so
 usr/lib/kde4/kabc_akonadi.so
 usr/lib/kde4/kcal_akonadi.so
 usr/lib/kde4/kcm_akonadi.so
 usr/lib/kde4/kcm_akonadi_resources.so
 usr/lib/kde4/kcm_akonadi_server.so
 usr/lib/kde4/kio_akonadi.so
+usr/lib/kde4/imports/org/kde/qmldir
+usr/lib/kde4/imports/org/kde/BreadcrumbNavigationView.qml
+usr/lib/kde4/imports/org/kde/SlideoutPanel.qml
+usr/lib/kde4/imports/org/kde/SlideoutPanelContainer.qml
+usr/lib/kde4/imports/org/kde/Dialog.qml
+usr/lib/kde4/imports/org/kde/Flap.qml
+usr/lib/kde4/imports/org/kde/Flap2.qml
+usr/lib/kde4/imports/org/kde/dividing-line.png
+usr/lib/kde4/imports/org/kde/dividing-line-horizontal.png
+usr/lib/kde4/imports/org/kde/list-line-top.png
+usr/lib/kde4/imports/org/kde/scrollable-bottom.png
+usr/lib/kde4/imports/org/kde/scrollable-top.png
+usr/lib/kde4/imports/org/kde/flap-collapsed-top.png
+usr/lib/kde4/imports/org/kde/flap-collapsed-mid.png
+usr/lib/kde4/imports/org/kde/flap-collapsed-bottom.png
+usr/lib/kde4/imports/org/kde/flap-expanded-top.png
+usr/lib/kde4/imports/org/kde/flap-expanded-mid.png
+usr/lib/kde4/imports/org/kde/flap-expanded-bottom.png
+usr/lib/kde4/imports/org/kde/libkdeqmlplugin.so
+usr/lib/kde4/imports/org/kde/akonadi/qmldir
+usr/lib/kde4/imports/org/kde/akonadi/collectionview.qml
+usr/lib/kde4/imports/org/kde/akonadi/AkonadiBreadcrumbNavigationView.qml
+usr/lib/kde4/imports/org/kde/akonadi/CollectionDelegate.qml
+usr/lib/kde4/imports/org/kde/akonadi/border_dot.png
+usr/lib/kde4/imports/org/kde/akonadi/check.png
+usr/lib/kde4/imports/org/kde/akonadi/sliderbackground.png
+usr/lib/kde4/imports/org/kde/akonadi/transparentplus.png
 usr/lib/libakonadi-xml.so.4
 usr/lib/libakonadi-xml.so.4.6.0
+usr/lib/libakonadi-filestore.so.4
+usr/lib/libakonadi-filestore.so.4.6.0
 usr/lib/libkdepim-copy.so.4
 usr/lib/libkdepim-copy.so.4.6.0
 usr/lib/libmaildir.so.4
 usr/lib/libmaildir.so.4.6.0
-usr/lib/libmbox.so.4
-usr/lib/libmbox.so.4.6.0
+usr/lib/libkmindexreader.so.4
+usr/lib/libkmindexreader.so.4.6.0
+usr/share/mime/packages/accountwizard-mime.xml
+usr/share/akonadi/agents/akonotesresource.desktop
 usr/share/akonadi/agents/birthdaysresource.desktop
+usr/share/akonadi/agents/calendarsearchagent.desktop
 usr/share/akonadi/agents/contactsresource.desktop
+usr/share/akonadi/agents/davgroupwareresource.desktop
 usr/share/akonadi/agents/icalresource.desktop
 usr/share/akonadi/agents/imapresource.desktop
+usr/share/akonadi/agents/invitationsagent.desktop
 usr/share/akonadi/agents/kabcresource.desktop
 usr/share/akonadi/agents/kcalresource.desktop
+usr/share/akonadi/agents/kdeaccountsresource.desktop
 usr/share/akonadi/agents/knutresource.desktop
 usr/share/akonadi/agents/kolabproxyresource.desktop
 usr/share/akonadi/agents/localbookmarksresource.desktop
@@ -58,28 +105,56 @@
 usr/share/akonadi/agents/maildispatcheragent.desktop
 usr/share/akonadi/agents/mboxresource.desktop
 usr/share/akonadi/agents/microblog.desktop
+usr/share/akonadi/agents/mixedmaildirresource.desktop
 usr/share/akonadi/agents/mtdummyresource.desktop
 usr/share/akonadi/agents/nepomukcalendarfeeder.desktop
 usr/share/akonadi/agents/nepomukcontactfeeder.desktop
 usr/share/akonadi/agents/nepomuktagresource.desktop
 usr/share/akonadi/agents/nntpresource.desktop
 usr/share/akonadi/agents/notesresource.desktop
+usr/share/akonadi/agents/openxchangeresource.desktop
 usr/share/akonadi/agents/pop3resource.desktop
+usr/share/akonadi/agents/strigifeeder.desktop
 usr/share/akonadi/agents/vcarddirresource.desktop
 usr/share/akonadi/agents/vcardresource.desktop
+usr/share/applications/kde4/accountwizard.desktop
 usr/share/applications/kde4/akonaditray.desktop
 usr/share/autostart/kaddressbookmigrator.desktop
 usr/share/icons/hicolor/64x64/apps/kolab.png
+usr/share/icons/hicolor/64x64/apps/ox.png
+usr/share/icons/hicolor/32x32/apps/ox.png
+usr/share/icons/hicolor/128x128/apps/ox.png
+usr/share/icons/hicolor/16x16/apps/ox.png
+usr/share/icons/hicolor/48x48/apps/ox.png
+usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.js
+usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.ui
 usr/share/kde4/apps/akonadi/akonadi-xml.xsd
 usr/share/kde4/apps/akonadi/firstrun/defaultaddressbook
 usr/share/kde4/apps/akonadi/firstrun/defaultcalendar
+usr/share/kde4/apps/akonadi/firstrun/defaultnotebook
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
+usr/share/kde4/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
 usr/share/kde4/apps/akonadi_knut_resource/knut-template.xml
+usr/share/kde4/config/accountwizard.knsrc
 usr/share/kde4/config/kmail-migratorrc
 usr/share/kde4/config/kres-migratorrc
 usr/share/kde4/services/akonadi.protocol

=== modified file 'debian/not-installed'
--- debian/not-installed	2010-07-12 17:42:05 +0000
+++ debian/not-installed	2010-11-27 21:56:29 +0000
@@ -1,5 +1,7 @@
 ./usr/lib/libkdepim-copy.so
 ./usr/lib/libakonadi-xml.so
+./usr/lib/libakonadi-filestore.so
 ./usr/lib/libmaildir.so
-./usr/lib/libmbox.so
+./usr/lib/libkmindexreader.so
 ./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml

=== modified file 'debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff'
--- debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff	2010-10-17 01:36:04 +0000
+++ debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff	2010-11-27 21:56:29 +0000
@@ -17,8 +17,8 @@
 --- a/agents/nepomuk_calendar_feeder/CMakeLists.txt
 +++ b/agents/nepomuk_calendar_feeder/CMakeLists.txt
 @@ -18,6 +18,11 @@ target_link_libraries(akonadi_nepomuk_ca
-   ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-   ${KDEPIMLIBS_KCAL_LIBS}
+   ${NEPOMUK_QUERY_LIBRARIES}
+   ${KDEPIMLIBS_KCALCORE_LIBS}
  )
 +# akonadi_nepomuk_calendar_feeder_automoc depend on the presence of the
 +# ontology class headers. We can be sure that they are present when niefast
@@ -28,17 +28,3 @@
  
  install(TARGETS akonadi_nepomuk_calendar_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
  install(FILES nepomukcalendarfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
---- a/agents/nepomuk_contact_feeder/CMakeLists.txt
-+++ b/agents/nepomuk_contact_feeder/CMakeLists.txt
-@@ -13,6 +13,11 @@ target_link_libraries(akonadi_nepomuk_co
-   ${KDEPIMLIBS_KABC_LIBS}
-   ${NEPOMUKFEEDER_SHARED_LIBS}
- )
-+# akonadi_nepomuk_contact_feeder_automoc depends on the presence of the
-+# ontology class headers. We can be sure that they are present when niefast
-+# target is built. This is needed to avoid a race condition when building in
-+# parallel.
-+add_dependencies( akonadi_nepomuk_contact_feeder_automoc niefast )
- 
- install(TARGETS akonadi_nepomuk_contact_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES nepomukcontactfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")