[SCM] Extract bibliographic references from various sources branch, debian, updated. debian/1.4.4-3
Filippo Rusconi (Debian Maintainer)
rusconi-debian at laposte.net
Sat Mar 12 14:05:23 UTC 2011
The following commit has been merged in the debian branch:
commit 746937d2af3d38311b20c3fb4b633e384a39d734
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date: Wed Mar 9 23:30:22 2011 +0100
Patch to fix the linker command line with -lX11 so that binutils-gold does not complain.
diff --git a/debian/patches/fix-linker-command-line.patch b/debian/patches/fix-linker-command-line.patch
new file mode 100644
index 0000000..b8221b6
--- /dev/null
+++ b/debian/patches/fix-linker-command-line.patch
@@ -0,0 +1,24 @@
+Add -lX11 to linker command line so that binutils-gold are happy.--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -58,10 +58,18 @@
+ add_executable(cb2bib WIN32 ${CB2BIB_CPP} ${CB2BIB_MOC} ${CB2BIB_UIH} ${CB2BIB_RCC} ${MODSINGAPP_CPP} ${MODSINGAPP_MOC})
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+ endif()
+-if(C2B_USE_LZO)
+- target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
++if(UNIX AND NOT APPLE)
++ if(C2B_USE_LZO)
++ target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES} -lX11)
++ else()
++ target_link_libraries(cb2bib c2b ${QT_LIBRARIES} -lX11)
++ endif()
+ else()
+- target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
++ if(C2B_USE_LZO)
++ target_link_libraries(cb2bib c2b ${LZO_LIBRARIES} ${QT_LIBRARIES})
++ else()
++ target_link_libraries(cb2bib c2b ${QT_LIBRARIES})
++ endif()
+ endif()
+ if(APPLE)
+ install(TARGETS cb2bib BUNDLE DESTINATION ${C2B_INSTALL_BIN_DIR})
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6743d19
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-linker-command-line.patch
--
Extract bibliographic references from various sources
More information about the debian-science-commits
mailing list