Jonathan Kolberg has proposed merging lp:~bulldog98/kdepim-runtime/ubuntu-4.6 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/ubuntu-4.6/+merge/60387 Update for the new beta -- https://code.launchpad.net/~bulldog98/kdepim-runtime/ubuntu-4.6/+merge/60387 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-05-09 14:35:52 +0000 @@ -1,3 +1,9 @@ +kdepim-runtime (4:4.5.95-0ubuntu0~ppa1) natty; urgency=low + + * New upstream beta release + + -- Jonathan Kolberg <[email protected]> Sat, 23 Apr 2011 20:11:08 +0200 + kdepim-runtime (4:4.5.94.1-0ubuntu1~ppa1) natty; urgency=low * New upstream beta release === modified file 'debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff' --- debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff 2010-11-27 20:44:26 +0000 +++ debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff 2011-05-09 14:35:52 +0000 @@ -14,9 +14,11 @@ [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 @@ target_link_libraries(akonadi_nepomuk_ca +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} ) @@ -26,5 +28,5 @@ +# parallel. +add_dependencies( akonadi_nepomuk_calendar_feeder_automoc niefast ) - install(TARGETS akonadi_nepomuk_calendar_feeder ${INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES nepomukcalendarfeeder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents") + if (Q_WS_MAC) + set_target_properties(akonadi_nepomuk_calendar_feeder PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
