kdepim-runtime

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

  1. ubuntu-4.6
  2. Merge into kdepim-runtime
Proposed by Jonathan Kolberg
Status: Merged
Merge reported by: Jonathan Riddell
Merged at revision: not available
Proposed branch: lp:~bulldog98/kdepim-runtime/ubuntu-4.6
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/kdepim-runtime
Diff against target: 232 lines (+94/-24)
4 files modified
debian/changelog (+7/-0)
debian/kdepim-runtime.install (+82/-7)
debian/not-installed (+3/-1)
debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff (+2/-16)
To merge this branch: bzr merge lp:~bulldog98/kdepim-runtime/ubuntu-4.6
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+42024@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Jonathan Kolberg (bulldog98) wrote :

Here the change Jonathan wanted to have

lp:~bulldog98/kdepim-runtime/ubuntu-4.6 updated
62. By Jonathan Riddell

* New upstream release
* updated the patch fix_ontology_vs_feeder_automoc_race_condition.diff

Revision history for this message
Jonathan Riddell (jr) wrote :

merged into new ubuntu-4.6 branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1kdepim-runtime (4:4.5.80-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release
4 * updated the patch fix_ontology_vs_feeder_automoc_race_condition.diff
5
6 -- Jonathan Kolberg <bulldog98@kubuntu-de.org> Fri, 26 Nov 2010 14:02:30 +0100
7
1kdepim-runtime (4:4.4.7-0ubuntu2) UNRELEASED; urgency=low8kdepim-runtime (4:4.4.7-0ubuntu2) UNRELEASED; urgency=low
29
3 * Bump so version to 4.6.0 in debian/kdepim-runtime.install for rebuild10 * Bump so version to 4.6.0 in debian/kdepim-runtime.install for rebuild
411
=== 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 @@
1usr/bin/accountwizard
1usr/bin/akonadi2xml2usr/bin/akonadi2xml
3usr/bin/akonadi_akonotes_resource
2usr/bin/akonadi_birthdays_resource4usr/bin/akonadi_birthdays_resource
5usr/bin/akonadi_calendarsearch_agent
3usr/bin/akonadi_contacts_resource6usr/bin/akonadi_contacts_resource
4usr/bin/akonadi_ical_resource7usr/bin/akonadi_davgroupware_resource
5usr/bin/akonadi_imap_resource8usr/bin/akonadi_imap_resource
9usr/bin/akonadi_invitations_agent
6usr/bin/akonadi_kabc_resource10usr/bin/akonadi_kabc_resource
7usr/bin/akonadi_kcal_resource11usr/bin/akonadi_kcal_resource
8usr/bin/akonadi_knut_resource12usr/bin/akonadi_kdeaccounts_resource
9usr/bin/akonadi_kolabproxy_resource13usr/bin/akonadi_kolabproxy_resource
10usr/bin/akonadi_localbookmarks_resource14usr/bin/akonadi_localbookmarks_resource
11usr/bin/akonadi_maildir_resource15usr/bin/akonadi_maildir_resource
12usr/bin/akonadi_maildispatcher_agent16usr/bin/akonadi_maildispatcher_agent
13usr/bin/akonadi_mailtransport_dummy_resource17usr/bin/akonadi_mailtransport_dummy_resource
14usr/bin/akonadi_mbox_resource
15usr/bin/akonadi_microblog_resource18usr/bin/akonadi_microblog_resource
19usr/bin/akonadi_mixedmaildir_resource
16usr/bin/akonadi_nepomuk_calendar_feeder20usr/bin/akonadi_nepomuk_calendar_feeder
17usr/bin/akonadi_nepomuk_contact_feeder21usr/bin/akonadi_nepomuk_contact_feeder
18usr/bin/akonadi_nepomuktag_resource22usr/bin/akonadi_nepomuktag_resource
19usr/bin/akonadi_nntp_resource23usr/bin/akonadi_nntp_resource
20usr/bin/akonadi_notes_resource24usr/bin/akonadi_openxchange_resource
21usr/bin/akonadi_pop3_resource25usr/bin/akonadi_pop3_resource
22usr/bin/akonadi_vcard_resource26usr/bin/akonadi_strigi_feeder
23usr/bin/akonadi_vcarddir_resource27usr/bin/akonadi_vcarddir_resource
24usr/bin/akonaditray28usr/bin/akonaditray
25usr/bin/kaddressbookmigrator29usr/bin/kaddressbookmigrator
30usr/bin/kjotsmigrator
26usr/bin/kmail-migrator31usr/bin/kmail-migrator
27usr/bin/kres-migrator32usr/bin/kres-migrator
33usr/lib/kde4/accountwizard_plugin.so
28usr/lib/kde4/akonadi_serializer_addressee.so34usr/lib/kde4/akonadi_serializer_addressee.so
29usr/lib/kde4/akonadi_serializer_bookmark.so35usr/lib/kde4/akonadi_serializer_bookmark.so
30usr/lib/kde4/akonadi_serializer_contactgroup.so36usr/lib/kde4/akonadi_serializer_contactgroup.so
31usr/lib/kde4/akonadi_serializer_kcal.so37usr/lib/kde4/akonadi_serializer_kcal.so
38usr/lib/kde4/akonadi_serializer_kcalcore.so
32usr/lib/kde4/akonadi_serializer_mail.so39usr/lib/kde4/akonadi_serializer_mail.so
33usr/lib/kde4/akonadi_serializer_microblog.so40usr/lib/kde4/akonadi_serializer_microblog.so
41usr/lib/kde4/akonadi_mbox_resource.so
42usr/lib/kde4/akonadi_vcard_resource.so
43usr/lib/kde4/akonadi_ical_resource.so
44usr/lib/kde4/akonadi_notes_resource.so
45usr/lib/kde4/akonadi_knut_resource.so
34usr/lib/kde4/kabc_akonadi.so46usr/lib/kde4/kabc_akonadi.so
35usr/lib/kde4/kcal_akonadi.so47usr/lib/kde4/kcal_akonadi.so
36usr/lib/kde4/kcm_akonadi.so48usr/lib/kde4/kcm_akonadi.so
37usr/lib/kde4/kcm_akonadi_resources.so49usr/lib/kde4/kcm_akonadi_resources.so
38usr/lib/kde4/kcm_akonadi_server.so50usr/lib/kde4/kcm_akonadi_server.so
39usr/lib/kde4/kio_akonadi.so51usr/lib/kde4/kio_akonadi.so
52usr/lib/kde4/imports/org/kde/qmldir
53usr/lib/kde4/imports/org/kde/BreadcrumbNavigationView.qml
54usr/lib/kde4/imports/org/kde/SlideoutPanel.qml
55usr/lib/kde4/imports/org/kde/SlideoutPanelContainer.qml
56usr/lib/kde4/imports/org/kde/Dialog.qml
57usr/lib/kde4/imports/org/kde/Flap.qml
58usr/lib/kde4/imports/org/kde/Flap2.qml
59usr/lib/kde4/imports/org/kde/dividing-line.png
60usr/lib/kde4/imports/org/kde/dividing-line-horizontal.png
61usr/lib/kde4/imports/org/kde/list-line-top.png
62usr/lib/kde4/imports/org/kde/scrollable-bottom.png
63usr/lib/kde4/imports/org/kde/scrollable-top.png
64usr/lib/kde4/imports/org/kde/flap-collapsed-top.png
65usr/lib/kde4/imports/org/kde/flap-collapsed-mid.png
66usr/lib/kde4/imports/org/kde/flap-collapsed-bottom.png
67usr/lib/kde4/imports/org/kde/flap-expanded-top.png
68usr/lib/kde4/imports/org/kde/flap-expanded-mid.png
69usr/lib/kde4/imports/org/kde/flap-expanded-bottom.png
70usr/lib/kde4/imports/org/kde/libkdeqmlplugin.so
71usr/lib/kde4/imports/org/kde/akonadi/qmldir
72usr/lib/kde4/imports/org/kde/akonadi/collectionview.qml
73usr/lib/kde4/imports/org/kde/akonadi/AkonadiBreadcrumbNavigationView.qml
74usr/lib/kde4/imports/org/kde/akonadi/CollectionDelegate.qml
75usr/lib/kde4/imports/org/kde/akonadi/border_dot.png
76usr/lib/kde4/imports/org/kde/akonadi/check.png
77usr/lib/kde4/imports/org/kde/akonadi/sliderbackground.png
78usr/lib/kde4/imports/org/kde/akonadi/transparentplus.png
40usr/lib/libakonadi-xml.so.479usr/lib/libakonadi-xml.so.4
41usr/lib/libakonadi-xml.so.4.6.080usr/lib/libakonadi-xml.so.4.6.0
81usr/lib/libakonadi-filestore.so.4
82usr/lib/libakonadi-filestore.so.4.6.0
42usr/lib/libkdepim-copy.so.483usr/lib/libkdepim-copy.so.4
43usr/lib/libkdepim-copy.so.4.6.084usr/lib/libkdepim-copy.so.4.6.0
44usr/lib/libmaildir.so.485usr/lib/libmaildir.so.4
45usr/lib/libmaildir.so.4.6.086usr/lib/libmaildir.so.4.6.0
46usr/lib/libmbox.so.487usr/lib/libkmindexreader.so.4
47usr/lib/libmbox.so.4.6.088usr/lib/libkmindexreader.so.4.6.0
89usr/share/mime/packages/accountwizard-mime.xml
90usr/share/akonadi/agents/akonotesresource.desktop
48usr/share/akonadi/agents/birthdaysresource.desktop91usr/share/akonadi/agents/birthdaysresource.desktop
92usr/share/akonadi/agents/calendarsearchagent.desktop
49usr/share/akonadi/agents/contactsresource.desktop93usr/share/akonadi/agents/contactsresource.desktop
94usr/share/akonadi/agents/davgroupwareresource.desktop
50usr/share/akonadi/agents/icalresource.desktop95usr/share/akonadi/agents/icalresource.desktop
51usr/share/akonadi/agents/imapresource.desktop96usr/share/akonadi/agents/imapresource.desktop
97usr/share/akonadi/agents/invitationsagent.desktop
52usr/share/akonadi/agents/kabcresource.desktop98usr/share/akonadi/agents/kabcresource.desktop
53usr/share/akonadi/agents/kcalresource.desktop99usr/share/akonadi/agents/kcalresource.desktop
100usr/share/akonadi/agents/kdeaccountsresource.desktop
54usr/share/akonadi/agents/knutresource.desktop101usr/share/akonadi/agents/knutresource.desktop
55usr/share/akonadi/agents/kolabproxyresource.desktop102usr/share/akonadi/agents/kolabproxyresource.desktop
56usr/share/akonadi/agents/localbookmarksresource.desktop103usr/share/akonadi/agents/localbookmarksresource.desktop
@@ -58,28 +105,56 @@
58usr/share/akonadi/agents/maildispatcheragent.desktop105usr/share/akonadi/agents/maildispatcheragent.desktop
59usr/share/akonadi/agents/mboxresource.desktop106usr/share/akonadi/agents/mboxresource.desktop
60usr/share/akonadi/agents/microblog.desktop107usr/share/akonadi/agents/microblog.desktop
108usr/share/akonadi/agents/mixedmaildirresource.desktop
61usr/share/akonadi/agents/mtdummyresource.desktop109usr/share/akonadi/agents/mtdummyresource.desktop
62usr/share/akonadi/agents/nepomukcalendarfeeder.desktop110usr/share/akonadi/agents/nepomukcalendarfeeder.desktop
63usr/share/akonadi/agents/nepomukcontactfeeder.desktop111usr/share/akonadi/agents/nepomukcontactfeeder.desktop
64usr/share/akonadi/agents/nepomuktagresource.desktop112usr/share/akonadi/agents/nepomuktagresource.desktop
65usr/share/akonadi/agents/nntpresource.desktop113usr/share/akonadi/agents/nntpresource.desktop
66usr/share/akonadi/agents/notesresource.desktop114usr/share/akonadi/agents/notesresource.desktop
115usr/share/akonadi/agents/openxchangeresource.desktop
67usr/share/akonadi/agents/pop3resource.desktop116usr/share/akonadi/agents/pop3resource.desktop
117usr/share/akonadi/agents/strigifeeder.desktop
68usr/share/akonadi/agents/vcarddirresource.desktop118usr/share/akonadi/agents/vcarddirresource.desktop
69usr/share/akonadi/agents/vcardresource.desktop119usr/share/akonadi/agents/vcardresource.desktop
120usr/share/applications/kde4/accountwizard.desktop
70usr/share/applications/kde4/akonaditray.desktop121usr/share/applications/kde4/akonaditray.desktop
71usr/share/autostart/kaddressbookmigrator.desktop122usr/share/autostart/kaddressbookmigrator.desktop
72usr/share/icons/hicolor/64x64/apps/kolab.png123usr/share/icons/hicolor/64x64/apps/kolab.png
124usr/share/icons/hicolor/64x64/apps/ox.png
125usr/share/icons/hicolor/32x32/apps/ox.png
126usr/share/icons/hicolor/128x128/apps/ox.png
127usr/share/icons/hicolor/16x16/apps/ox.png
128usr/share/icons/hicolor/48x48/apps/ox.png
129usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.desktop
130usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.es
131usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.ui
132usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.desktop
133usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.es
134usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.ui
135usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.desktop
136usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.es
137usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.ui
138usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.desktop
139usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.es
140usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.ui
141usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
142usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.js
143usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.ui
73usr/share/kde4/apps/akonadi/akonadi-xml.xsd144usr/share/kde4/apps/akonadi/akonadi-xml.xsd
74usr/share/kde4/apps/akonadi/firstrun/defaultaddressbook145usr/share/kde4/apps/akonadi/firstrun/defaultaddressbook
75usr/share/kde4/apps/akonadi/firstrun/defaultcalendar146usr/share/kde4/apps/akonadi/firstrun/defaultcalendar
147usr/share/kde4/apps/akonadi/firstrun/defaultnotebook
76usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop148usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
77usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop149usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
78usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop150usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
79usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop151usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
152usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
80usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop153usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
81usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop154usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
155usr/share/kde4/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
82usr/share/kde4/apps/akonadi_knut_resource/knut-template.xml156usr/share/kde4/apps/akonadi_knut_resource/knut-template.xml
157usr/share/kde4/config/accountwizard.knsrc
83usr/share/kde4/config/kmail-migratorrc158usr/share/kde4/config/kmail-migratorrc
84usr/share/kde4/config/kres-migratorrc159usr/share/kde4/config/kres-migratorrc
85usr/share/kde4/services/akonadi.protocol160usr/share/kde4/services/akonadi.protocol
86161
=== 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 @@
1./usr/lib/libkdepim-copy.so1./usr/lib/libkdepim-copy.so
2./usr/lib/libakonadi-xml.so2./usr/lib/libakonadi-xml.so
3./usr/lib/libakonadi-filestore.so
3./usr/lib/libmaildir.so4./usr/lib/libmaildir.so
4./usr/lib/libmbox.so5./usr/lib/libkmindexreader.so
5./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml6./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
7./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
68
=== 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 @@
17--- a/agents/nepomuk_calendar_feeder/CMakeLists.txt17--- a/agents/nepomuk_calendar_feeder/CMakeLists.txt
18+++ b/agents/nepomuk_calendar_feeder/CMakeLists.txt18+++ b/agents/nepomuk_calendar_feeder/CMakeLists.txt
19@@ -18,6 +18,11 @@ target_link_libraries(akonadi_nepomuk_ca19@@ -18,6 +18,11 @@ target_link_libraries(akonadi_nepomuk_ca
20 ${KDEPIMLIBS_AKONADI_KCAL_LIBS}20 ${NEPOMUK_QUERY_LIBRARIES}
21 ${KDEPIMLIBS_KCAL_LIBS}21 ${KDEPIMLIBS_KCALCORE_LIBS}
22 )22 )
23+# akonadi_nepomuk_calendar_feeder_automoc depend on the presence of the23+# akonadi_nepomuk_calendar_feeder_automoc depend on the presence of the
24+# ontology class headers. We can be sure that they are present when niefast24+# ontology class headers. We can be sure that they are present when niefast
@@ -28,17 +28,3 @@
28 28
29 install(TARGETS akonadi_nepomuk_calendar_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})29 install(TARGETS akonadi_nepomuk_calendar_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
30 install(FILES nepomukcalendarfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")30 install(FILES nepomukcalendarfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")
31--- a/agents/nepomuk_contact_feeder/CMakeLists.txt
32+++ b/agents/nepomuk_contact_feeder/CMakeLists.txt
33@@ -13,6 +13,11 @@ target_link_libraries(akonadi_nepomuk_co
34 ${KDEPIMLIBS_KABC_LIBS}
35 ${NEPOMUKFEEDER_SHARED_LIBS}
36 )
37+# akonadi_nepomuk_contact_feeder_automoc depends on the presence of the
38+# ontology class headers. We can be sure that they are present when niefast
39+# target is built. This is needed to avoid a race condition when building in
40+# parallel.
41+add_dependencies( akonadi_nepomuk_contact_feeder_automoc niefast )
42
43 install(TARGETS akonadi_nepomuk_contact_feeder ${INSTALL_TARGETS_DEFAULT_ARGS})
44 install(FILES nepomukcontactfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents")

Subscribers

People subscribed via source and target branches