[SCM] KDE PIM Runtime module packaging branch, experimental, updated. debian/4.4.11.1-2-15-g666d644

Modestas Vainius modax at alioth.debian.org
Fri Jun 10 07:51:54 UTC 2011 

The following commit has been merged in the experimental branch:
commit 7b855462272eb046fcc175fe046b33a43fba5abe
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jun 10 10:34:29 2011 +0300

    fix install files and remove the ontology race patch
    
    This fixes the install files and extends the changelog to build with the
    upstream 4.6 branch.
    
    The fix_ontology_vs_feeder_automoc_race_condition patch is no longer
    needed, because it has gone upstream.
    
    Signed-off-by: Jan Losinski <losinski at wh2.tu-dresden.de>
---
 debian/changelog                                   |    2 +-
 debian/kdepim-runtime.install                      |   42 ++++++++++++-------
 debian/not-installed                               |   28 ++++++++++++
 ..._ontology_vs_feeder_automoc_race_condition.diff |   44 --------------------
 debian/patches/series                              |    1 -
 5 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf9c771..9bce31e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ kdepim-runtime (4:4.6~beta5+git26+gd9f2519) UNRELEASED; urgency=low
   [ Jan Losinski ]
   * merge 4.5 branch with 4.4 head
 
- -- Jan Losinski <losinski at wh2.tu-dresden.de> Fri, 13 May 2011 17:05:09 +0200
+ -- Jan Losinski <losinski at wh2.tu-dresden.de>  Fri, 13 May 2011 17:05:09 +0200
 
 kdepim-runtime (4:4.4.93-0r1) UNRELEASED; urgency=low
 
diff --git a/debian/kdepim-runtime.install b/debian/kdepim-runtime.install
index ed9fda8..7e93725 100644
--- a/debian/kdepim-runtime.install
+++ b/debian/kdepim-runtime.install
@@ -1,39 +1,39 @@
 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_davgroupware_resource
-usr/bin/akonadi_ical_resource
 usr/bin/akonadi_imap_resource
 usr/bin/akonadi_invitations_agent
 usr/bin/akonadi_kabc_resource
 usr/bin/akonadi_kcal_resource
 usr/bin/akonadi_kdeaccounts_resource
-usr/bin/akonadi_knut_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_vcarddir_resource
+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_akonotes_resource.so
+usr/lib/kde4/akonadi_contacts_resource.so
+usr/lib/kde4/akonadi_ical_resource.so
+usr/lib/kde4/akonadi_knut_resource.so
+usr/lib/kde4/akonadi_maildir_resource.so
+usr/lib/kde4/akonadi_mbox_resource.so
+usr/lib/kde4/akonadi_notes_resource.so
 usr/lib/kde4/akonadi_serializer_addressee.so
 usr/lib/kde4/akonadi_serializer_bookmark.so
 usr/lib/kde4/akonadi_serializer_contactgroup.so
@@ -41,24 +41,25 @@ 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_vcard_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/libakonadi-filestore.so
 usr/lib/libakonadi-filestore.so.4
-usr/lib/libakonadi-filestore.so.4.6.0
+usr/lib/libakonadi-filestore.so.4.6.0         
 usr/lib/libakonadi-xml.so.4
 usr/lib/libakonadi-xml.so.4.6.0
 usr/lib/libkdepim-copy.so.4
 usr/lib/libkdepim-copy.so.4.6.0
+usr/lib/libkmindexreader.so
 usr/lib/libkmindexreader.so.4
 usr/lib/libkmindexreader.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/share/akonadi/agents/akonotesresource.desktop
 usr/share/akonadi/agents/birthdaysresource.desktop
 usr/share/akonadi/agents/calendarsearchagent.desktop
@@ -97,17 +98,23 @@ usr/share/icons/hicolor/32x32/apps/ox.png
 usr/share/icons/hicolor/48x48/apps/ox.png
 usr/share/icons/hicolor/64x64/apps/kolab.png
 usr/share/icons/hicolor/64x64/apps/ox.png
+usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.es
+usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.ui
+usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.desktop
+usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.es
+usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.desktop
-usr/share/kde4/apps/akonadi/accountwizard/imap/imapwizard.js
+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.js
+usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.es
 usr/share/kde4/apps/akonadi/accountwizard/kolab/kolabwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.desktop
-usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.js
+usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.es
 usr/share/kde4/apps/akonadi/accountwizard/mailbox/mailboxwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.desktop
-usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.js
+usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.es
 usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.ui
 usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.desktop
 usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.js
@@ -115,13 +122,16 @@ 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_knut_resource/knut-template.xml
+usr/share/kde4/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
 usr/share/kde4/config/accountwizard.knsrc
 usr/share/kde4/config/kmail-migratorrc
 usr/share/kde4/config/kres-migratorrc
diff --git a/debian/not-installed b/debian/not-installed
index 20b2ad1..e79a9c8 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,4 +1,5 @@
 ./usr/lib/libakonadi-filestore.so
+./usr/lib/libakonadi-filestore.so
 ./usr/lib/libakonadi-xml.so
 ./usr/lib/libkdepim-copy.so
 ./usr/lib/libkmindexreader.so
@@ -6,3 +7,30 @@
 ./usr/lib/libmbox.so
 ./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
 ./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
+./usr/lib/kde4/imports/org/kde/BreadcrumbNavigationView.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/SlideoutPanel.qml
+./usr/lib/kde4/imports/org/kde/SlideoutPanelContainer.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/collectionview.qml
+./usr/lib/kde4/imports/org/kde/akonadi/qmldir
+./usr/lib/kde4/imports/org/kde/akonadi/sliderbackground.png
+./usr/lib/kde4/imports/org/kde/akonadi/transparentplus.png
+./usr/lib/kde4/imports/org/kde/dividing-line-horizontal.png
+./usr/lib/kde4/imports/org/kde/dividing-line.png
+./usr/lib/kde4/imports/org/kde/flap-collapsed-bottom.png
+./usr/lib/kde4/imports/org/kde/flap-collapsed-mid.png
+./usr/lib/kde4/imports/org/kde/flap-collapsed-top.png
+./usr/lib/kde4/imports/org/kde/flap-expanded-bottom.png
+./usr/lib/kde4/imports/org/kde/flap-expanded-mid.png
+./usr/lib/kde4/imports/org/kde/flap-expanded-top.png
+./usr/lib/kde4/imports/org/kde/libkdeqmlplugin.so
+./usr/lib/kde4/imports/org/kde/list-line-top.png
+./usr/lib/kde4/imports/org/kde/qmldir
+./usr/lib/kde4/imports/org/kde/scrollable-bottom.png
+./usr/lib/kde4/imports/org/kde/scrollable-top.png
diff --git a/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff b/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff
deleted file mode 100644
index 06abfa5..0000000
--- a/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Fix a race condition between akonadi_nepomuk_*_feeder_automoc and ontology headers
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596908
-Forwarded: no
-Last-Update: 2010-09-18
-
-nepomuk*feeder headers source ontology class headers (nie.h etc.) that are
-autogenerated at build time. This patch makes sure that
-nepomuk_*_feeder_automoc targets are not built before niefast target (which
-trigger generation of ontology class headers) or they both are never built at
-the same time when building in parallel. The latter was a cause of weird
-FTBFSes on ia64 (e.g. [1]) when moc-qt4 sourced incomplete nie.h and produced
-bogus nepomukcontactfeeder.moc as a result.
-
-[1] https://buildd.debian.org/fetch.cgi?pkg=kdepim-runtime;ver=4%3A4.4.5-1;arch=ia64;stamp=1280117387
-
---- a/agents/nepomuk_calendar_feeder/CMakeLists.txt
-+++ b/agents/nepomuk_calendar_feeder/CMakeLists.txt
-@@ -18,6 +18,11 @@
-   ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-   ${KDEPIMLIBS_KCAL_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
-+# target is built. This is needed to avoid a race condition when building in
-+# parallel.
-+add_dependencies( akonadi_nepomuk_calendar_feeder_automoc niefast )
- 
- ## Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596908
- ## We've not seen the reported issue, but it's better to have patches upstream,
---- a/agents/nepomuk_contact_feeder/CMakeLists.txt
-+++ b/agents/nepomuk_contact_feeder/CMakeLists.txt
-@@ -13,6 +13,11 @@
-   ${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")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 609b370..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_ontology_vs_feeder_automoc_race_condition.diff

-- 
KDE PIM Runtime module packaging

More information about the pkg-kde-commits mailing list