[SCM] Extract bibliographic references from various sources branch, debian, updated. debian/1.4.6-1

Filippo Rusconi (Debian Maintainer) rusconi-debian at laposte.net
Mon Aug 29 08:18:35 UTC 2011


The following commit has been merged in the debian branch:
commit c2aeb2d66c5891e4db2e9f04850b2f3de063539f
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date:   Sun Aug 28 19:12:05 2011 +0200

    Removed debian/patches directory as there are no more patches.

diff --git a/debian/changelog b/debian/changelog
index dd0881b..ef157f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cb2bib (1.4.6-1) unstable; urgency=low
+
+  * New upstream release.
+  
+  * Removed debian/patches directory as there are no more patches.
+
+ -- Filippo Rusconi <lopippo at debian.org>  Sun, 28 Aug 2011 19:01:28 +0200
+
 cb2bib (1.4.4-3) unstable; urgency=low
 
   * Fix bug (Closes: #617750) revealing that qwebview.h is no more shipped
diff --git a/debian/patches/fix-linker-command-line.patch b/debian/patches/fix-linker-command-line.patch
deleted file mode 100644
index e520bf2..0000000
--- a/debian/patches/fix-linker-command-line.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 6743d19..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-linker-command-line.patch

-- 
Extract bibliographic references from various sources



More information about the debian-science-commits mailing list