Jonathan Kolberg has proposed merging lp:~bulldog98/kdepim-runtime/4.6.0 into lp:~kubuntu-packagers/kdepim-runtime/ubuntu-4.6.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~bulldog98/kdepim-runtime/4.6.0/+merge/64306 This is the update for kdepim-runtime 4.6 -- https://code.launchpad.net/~bulldog98/kdepim-runtime/4.6.0/+merge/64306 Your team Kubuntu Members is subscribed to branch lp:~kubuntu-packagers/kdepim-runtime/ubuntu-4.6.
=== modified file 'debian/changelog' --- debian/changelog 2011-01-14 23:11:42 +0000 +++ debian/changelog 2011-06-11 16:15:55 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE kdepim-runtime (4:4.5.94.1-0ubuntu1~ppa1) natty; urgency=low * New upstream beta release @@ -27,6 +28,82 @@ -- Jonathan Kolberg <[email protected]> Fri, 26 Nov 2010 14:02:30 +0100 kdepim-runtime (4:4.4.7-0ubuntu2) UNRELEASED; urgency=low +======= +kdepim-runtime (4:4.6.0-0ubuntu1) oneiric; urgency=low + + * New upstream release + + -- Jonathan Kolberg <[email protected]> Sat, 11 Jun 2011 14:00:20 +0200 + +kdepim-runtime (4:4.4.11.1-2ubuntu1) oneiric; urgency=low + + [ Jonathan Thomas ] + * Merge with Debian Unstable, remaining changes: + - Keep versioned boost build-depends + - Do not install the akonaditray .desktop file + + -- Jonathan Thomas <[email protected]> Mon, 30 May 2011 18:52:18 -0400 + +kdepim-runtime (4:4.4.11.1-2) unstable; urgency=low + + * Release to unstable. + + -- Modestas Vainius <[email protected]> Thu, 26 May 2011 22:55:30 +0300 + +kdepim-runtime (4:4.4.11.1-1) experimental; urgency=low + + * New upstream release. + + [ José Manuel SantamarÃa Lema ] + * Update installed files. + * Bump build dependencies: + - kdelibs5-dev to 4:4.6 + - kdepimlibs5-dev to 4:4.6 + - libakonadi-dev to 1.5.0 + - kde-sc-dev-latest to 4:4.6.2 + * Bump S-V to 3.9.1: add Breaks next to Replaces where needed. + * Refresh patch. + * Add debian/not-installed. + * Add myself to Uploaders. + + [ Modestas Vainius ] + * Add abort-on-upstream-changes to debian/source/local-options. + * Switch debian/rules engine to dhmk qt-kde-team/2/*. + + -- Debian Qt/KDE Maintainers <[email protected]> Wed, 27 Apr 2011 12:23:43 +0300 + +kdepim-runtime (4:4.4.10-0ubuntu2) natty; urgency=low + + * Don't install the akonaditray desktop file anymore. + + -- Felix Geyer <[email protected]> Mon, 28 Feb 2011 22:26:56 +0100 + +kdepim-runtime (4:4.4.10-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Jonathan Riddell <[email protected]> Mon, 31 Jan 2011 15:49:11 +0000 + +kdepim-runtime (4:4.4.9-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Scott Kitterman <[email protected]> Wed, 22 Dec 2010 18:15:30 -0500 + +kdepim-runtime (4:4.4.8-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Rohan Garg <[email protected]> Mon, 06 Dec 2010 17:50:59 +0530 + +kdepim-runtime (4:4.4.7-1) unstable; urgency=low + + * New upstream release. + + -- Modestas Vainius <[email protected]> Fri, 22 Oct 2010 21:41:43 +0300 + +kdepim-runtime (4:4.4.7-0ubuntu2) natty; urgency=low +>>>>>>> MERGE-SOURCE * Bump so version to 4.6.0 in debian/kdepim-runtime.install for rebuild against KDE 4.6 kdepimlibs and new akonadi @@ -40,6 +117,15 @@ -- Alessandro Ghersi <[email protected]> Sat, 23 Oct 2010 20:23:11 +0200 +kdepim-runtime (4:4.4.6-1) unstable; urgency=low + + * New upstream bugfix release. + * Point debian/control Vcs fields to the new Git repository. + * Fix a race between akonado_nepomuk_*_feeder_automoc and + autogeneration of ontology headers (nie.h). (Closes: #596908) + + -- Modestas Vainius <[email protected]> Sat, 18 Sep 2010 20:18:58 +0300 + kdepim-runtime (4:4.4.6-0ubuntu2) natty; urgency=low * Merge with Debian unstable remaining changes: @@ -69,6 +155,13 @@ -- Rohan Garg <[email protected]> Fri, 10 Sep 2010 17:31:34 +0530 +kdepim-runtime (4:4.4.5-1) unstable; urgency=low + + * New upstream release. + * Bump kde-sc-dev-latest build dependency to 4:4.4.5. + + -- Modestas Vainius <[email protected]> Sun, 04 Jul 2010 19:00:52 +0300 + kdepim-runtime (4:4.4.5-0ubuntu1) maverick; urgency=low * New upstream release @@ -82,6 +175,24 @@ -- Modestas Vainius <[email protected]> Sun, 04 Jul 2010 19:00:52 +0300 +kdepim-runtime (4:4.4.4-1) unstable; urgency=low + + * New upstream release. + + [ Modestas Vainius ] + * Bump pkg-kde-tools build dependency to (>= 0.9) for HTML_INSTALL_DIR + switch and 3.0 (quilt) source format support. + * Switch to 3.0 (quilt) source package format and original tar.bz2 + tarballs. + * Drop quilt from Build-Depends, no longer needed for 3.0 (quilt). + * Remove debian/README.source. Patch support is part of source format + now. + * Drop quilt-build-dep-but-no-series-file from lintian source overrides, + it is no longer relevant. + * Bump kde-sc-dev-latest build dependency to 4:4.4.4. + + -- Debian Qt/KDE Maintainers <[email protected]> Tue, 01 Jun 2010 01:15:17 +0300 + kdepim-runtime (4:4.4.4-0ubuntu1) maverick; urgency=low * New upstream release @@ -384,3 +495,4 @@ * Initial release -- Jonathan Thomas <[email protected]> Sat, 27 Jun 2009 13:37:43 -0400 + === modified file 'debian/control' --- debian/control 2010-12-04 17:49:02 +0000 +++ debian/control 2011-06-11 16:15:55 +0000 @@ -3,13 +3,22 @@ Priority: extra Maintainer: Kubuntu Developers <[email protected]> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]> +<<<<<<< TREE Uploaders: Sune Vuorela <[email protected]>, Fathi Boudra <[email protected]>, Modestas Vainius <[email protected]> Build-Depends: kde-sc-dev-latest (>= 4:4.5.85), cdbs, debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.9), kdelibs5-dev (>= 4:4.5.85-0ubuntu1), kdepimlibs5-dev (>= 4:4.5.85), libakonadi-dev (>= 1.4.1), libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost1.42-dev (>= 1.42.0-2), +======= +Uploaders: Sune Vuorela <[email protected]>, Fathi Boudra <[email protected]>, Modestas Vainius <[email protected]>, + José Manuel SantamarÃa Lema <[email protected]> +Build-Depends: kde-sc-dev-latest (>= 4:4.6.2), + debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.12), + kdelibs5-dev (>= 4:4.6), kdepimlibs5-dev (>= 4:4.6), libakonadi-dev (>= 1.5.0), + libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost1.46-dev, +>>>>>>> MERGE-SOURCE libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.2) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-members/kdepim-runtime/ubuntu Vcs-Bzr: https://code.launchpad.net/~kubuntu-members/kdepim-runtime/ubuntu @@ -17,7 +26,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kdepimlibs-kio-plugins, akonadi-server (>= 1.3) Replaces: akonadi-kde, libmaildir4 -Breaks: kdepimlibs5 (<< 4:4.4) +Breaks: akonadi-kde, libmaildir4, kdepimlibs5 (<< 4:4.4) Description: Runtime components for akonadi-kde This package contains akonadi agents written using kdelibs. Any package that uses akonadi should probably pull this in as a dependency. @@ -30,6 +39,7 @@ Priority: extra Architecture: any Replaces: kdepim-dbg +Breaks: kdepim-dbg Depends: ${shlibs:Depends}, ${misc:Depends} Description: debugging files for akonadi kde runtime components This package contains debugging symbols. === modified file 'debian/kdepim-runtime.install' --- debian/kdepim-runtime.install 2011-01-14 23:11:42 +0000 +++ debian/kdepim-runtime.install 2011-06-11 16:15:55 +0000 @@ -115,8 +115,12 @@ usr/share/akonadi/agents/pop3resource.desktop usr/share/akonadi/agents/vcarddirresource.desktop usr/share/akonadi/agents/vcardresource.desktop +<<<<<<< TREE usr/share/applications/kde4/accountwizard.desktop usr/share/applications/kde4/akonaditray.desktop +======= +usr/share/applications/kde4/accountwizard.desktop +>>>>>>> MERGE-SOURCE usr/share/autostart/kaddressbookmigrator.desktop usr/share/icons/hicolor/64x64/apps/kolab.png usr/share/icons/hicolor/64x64/apps/ox.png @@ -152,7 +156,12 @@ 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 +<<<<<<< TREE +usr/share/kde4/config/accountwizard.knsrc +======= +usr/share/kde4/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc +usr/share/kde4/config/accountwizard.knsrc +>>>>>>> MERGE-SOURCE usr/share/kde4/config/kmail-migratorrc usr/share/kde4/config/kres-migratorrc usr/share/kde4/services/akonadi.protocol @@ -162,9 +171,17 @@ usr/share/kde4/services/kresources/kabc/akonadi.desktop usr/share/kde4/services/kresources/kcal/akonadi.desktop usr/share/mime/packages/kdepim-mime.xml +<<<<<<< TREE usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.ui usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.es usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.desktop usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.ui usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.desktop usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.es +======= +usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.ui +usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.es +usr/share/kde4/apps/akonadi/accountwizard/ical/icalwizard.desktop +usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.ui +usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.desktop +usr/share/kde4/apps/akonadi/accountwizard/contacts/contactswizard.es>>>>>>> MERGE-SOURCE === modified file 'debian/not-installed' --- debian/not-installed 2010-11-27 20:44:26 +0000 +++ debian/not-installed 2011-06-11 16:15:55 +0000 @@ -1,7 +1,23 @@ +#These files would belong to -dev package, not installing. + +./usr/lib/libmaildir.so +./usr/lib/libakonadi-filestore.so +./usr/lib/libkmindexreader.so ./usr/lib/libkdepim-copy.so +./usr/lib/libkmindexreader.so ./usr/lib/libakonadi-xml.so +<<<<<<< TREE ./usr/lib/libakonadi-filestore.so ./usr/lib/libmaildir.so ./usr/lib/libkmindexreader.so +======= +./usr/share/applications/kde4/akonaditray.desktop +./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml^[[>0;115;0c +>>>>>>> MERGE-SOURCE ./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml -./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml +<<<<<<< TREE +./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml +======= +./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml +./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml +>>>>>>> MERGE-SOURCE === added directory 'debian/patches' === renamed directory 'debian/patches' => 'debian/patches.moved' === renamed file 'debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff' => 'debian/patches.moved/fix_ontology_vs_feeder_automoc_race_condition.diff.THIS' === added file 'debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff' --- debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff 2011-06-11 16:15:55 +0000 @@ -0,0 +1,32 @@ +From: Modestas Vainius <[email protected]> +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 + +Index: kdepim-runtime-4.5.95/agents/nepomuk_calendar_feeder/CMakeLists.txt +=================================================================== +--- kdepim-runtime-4.5.95.orig/agents/nepomuk_calendar_feeder/CMakeLists.txt 2011-04-11 16:57:46.000000000 +0200 ++++ kdepim-runtime-4.5.95/agents/nepomuk_calendar_feeder/CMakeLists.txt 2011-04-23 20:22:48.580098000 +0200 +@@ -24,6 +24,11 @@ + ${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 ++# target is built. This is needed to avoid a race condition when building in ++# parallel. ++add_dependencies( akonadi_nepomuk_calendar_feeder_automoc niefast ) + + if (Q_WS_MAC) + set_target_properties(akonadi_nepomuk_calendar_feeder PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template) === added file 'debian/patches/series' --- debian/patches/series 1970-01-01 00:00:00 +0000 +++ debian/patches/series 2011-06-11 16:15:55 +0000 @@ -0,0 +1,1 @@ +fix_ontology_vs_feeder_automoc_race_condition.diff === removed file 'debian/patches/series' --- debian/patches/series 2010-10-17 01:36:04 +0000 +++ debian/patches/series 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -fix_ontology_vs_feeder_automoc_race_condition.diff === modified file 'debian/rules' --- debian/rules 2009-11-19 15:38:40 +0000 +++ debian/rules 2011-06-11 16:15:55 +0000 @@ -1,3 +1,8 @@ #!/usr/bin/make -f -include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk + +.PHONY: override_dh_auto_test + +override_dh_strip: + $(overridden_command) --dbg-package=kdepim-runtime-dbg
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
