[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.4.7-1-23-g97a017d
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Sun Apr 24 01:26:50 UTC 2011
The following commit has been merged in the master branch:
commit 5191c3ace36f969bcc647449df6878f2f9011ed6
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Sun Apr 24 01:38:13 2011 +0200
Refresh patch.
---
debian/changelog | 1 +
..._ontology_vs_feeder_automoc_race_condition.diff | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 48fbeb5..7ddcf69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ kdepim-runtime (4:4.4.11.1-0r3) UNRELEASED; urgency=low
- 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.
diff --git a/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff b/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff
index 498b30f..06abfa5 100644
--- a/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff
+++ b/debian/patches/fix_ontology_vs_feeder_automoc_race_condition.diff
@@ -16,7 +16,7 @@ bogus nepomukcontactfeeder.moc as a result.
--- a/agents/nepomuk_calendar_feeder/CMakeLists.txt
+++ b/agents/nepomuk_calendar_feeder/CMakeLists.txt
-@@ -18,6 +18,11 @@ target_link_libraries(akonadi_nepomuk_ca
+@@ -18,6 +18,11 @@
${KDEPIMLIBS_AKONADI_KCAL_LIBS}
${KDEPIMLIBS_KCAL_LIBS}
)
@@ -26,11 +26,11 @@ bogus nepomukcontactfeeder.moc as a result.
+# 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")
+ ## 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 @@ target_link_libraries(akonadi_nepomuk_co
+@@ -13,6 +13,11 @@
${KDEPIMLIBS_KABC_LIBS}
${NEPOMUKFEEDER_SHARED_LIBS}
)
--
KDE PIM Runtime module packaging
More information about the pkg-kde-commits
mailing list