control: tags 746160 + patch pending
control: tags 745599 + patch pending
Dear maintainer,
I've prepared an NMU for libkolabxml (versioned as 0.8.4-5.1) and
uploaded it to DELAYED/10.
Regards.
diff -Nru libkolabxml-0.8.4/debian/changelog libkolabxml-0.8.4/debian/changelog
--- libkolabxml-0.8.4/debian/changelog 2013-07-11 20:56:39.000000000 +0200
+++ libkolabxml-0.8.4/debian/changelog 2014-04-27 16:17:16.000000000 +0200
@@ -1,3 +1,13 @@
+libkolabxml (0.8.4-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix linking of tests when they are built.
+ Closes: #745599
+ * Explicitely use Python 2, even when Python 3 is installed.
+ Closes: #746160
+
+ -- Evgeni Golov <evgeni.go...@credativ.de> Sun, 27 Apr 2014 15:54:06 +0200
+
libkolabxml (0.8.4-5) unstable; urgency=low
* Fix parallel build issue
diff -Nru libkolabxml-0.8.4/debian/patches/fix-test-link-error.patch libkolabxml-0.8.4/debian/patches/fix-test-link-error.patch
--- libkolabxml-0.8.4/debian/patches/fix-test-link-error.patch 1970-01-01 01:00:00.000000000 +0100
+++ libkolabxml-0.8.4/debian/patches/fix-test-link-error.patch 2014-04-27 15:53:56.000000000 +0200
@@ -0,0 +1,13 @@
+Index: libkolabxml-0.8.4/tests/CMakeLists.txt
+===================================================================
+--- libkolabxml-0.8.4.orig/tests/CMakeLists.txt 2013-04-11 11:35:34.000000000 +0200
++++ libkolabxml-0.8.4/tests/CMakeLists.txt 2014-04-27 15:53:53.449105536 +0200
+@@ -18,7 +18,7 @@
+
+ QT4_AUTOMOC(conversiontest.cpp)
+ add_executable(conversiontest conversiontest.cpp ${CMAKE_CURRENT_BINARY_DIR}/${CONVERSIONTEST_MOC})
+- target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C})
++ target_link_libraries(conversiontest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} kolabxml ${XERCES_C} ${Boost_LIBRARIES})
+ add_test(conversiontest ${CMAKE_CURRENT_BINARY_DIR}/conversiontest)
+
+ QT4_AUTOMOC(parsingtest.cpp)
diff -Nru libkolabxml-0.8.4/debian/patches/series libkolabxml-0.8.4/debian/patches/series
--- libkolabxml-0.8.4/debian/patches/series 2013-07-11 20:56:39.000000000 +0200
+++ libkolabxml-0.8.4/debian/patches/series 2014-04-27 16:11:48.000000000 +0200
@@ -3,3 +3,5 @@
xcardconversions-spelling-error.patch
fix-race-condition.patch
fix-parallel-build.patch
+fix-test-link-error.patch
+use-python2-only.patch
diff -Nru libkolabxml-0.8.4/debian/patches/use-python2-only.patch libkolabxml-0.8.4/debian/patches/use-python2-only.patch
--- libkolabxml-0.8.4/debian/patches/use-python2-only.patch 1970-01-01 01:00:00.000000000 +0100
+++ libkolabxml-0.8.4/debian/patches/use-python2-only.patch 2014-04-27 16:14:57.000000000 +0200
@@ -0,0 +1,12 @@
+Index: libkolabxml-0.8.4/src/python/CMakeLists.txt
+===================================================================
+--- libkolabxml-0.8.4.orig/src/python/CMakeLists.txt 2013-04-11 11:35:34.000000000 +0200
++++ libkolabxml-0.8.4/src/python/CMakeLists.txt 2014-04-27 16:14:55.440665955 +0200
+@@ -3,6 +3,7 @@
+
+ # Compile Python Bindings
+
++set(PythonLibs_FIND_VERSION 2.7)
+ find_package(PythonLibs REQUIRED)
+
+ if (NOT PYTHONLIBS_FOUND)
