adapt patches to new release, add status to changelog

diff --git a/debian/changelog b/debian/changelog
index 9ebad7c601e50ddc8dcb9aae53b62623c54260b2..8a5f93528fa2b1b180a78b276e830ebb601ff4ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ncbi-blast+ (2.2.30-1) UNRELEASED; urgency=medium
   * New upstream release
   * d/control: switch to Standards 3.9.6 
     [TODO] fix missing Makefile.flat
+    [ISSUE] problem at compilation:
+      /usr/bin/ld: blastp_app.o: undefined symbol «kBlastMinorVersion»
     [DONE] updates patches to new release
 
  -- Olivier Sallou <osallou@debian.org>  Fri, 21 Nov 2014 18:21:26 +0100

diff --git a/debian/patches/fix_compilation b/debian/patches/fix_compilation
new file mode 100644 (file)
index 0000000..9212908
--- /dev/null
+++ b/debian/patches/fix_compilation
@@ -0,0 +1,11 @@
+--- a/c++/src/util/regexp/pcretest.c
++++ b/c++/src/util/regexp/pcretest.c
+@@ -250,7 +250,7 @@
+     /* Read the next line by normal means, prompting if the file is stdin. */
+ 
+       {
+-      if (f == stdin) printf(prompt);
++      if (f == stdin) printf("%s",prompt);
+       if (fgets((char *)here, rlen,  f) == NULL)
+         return (here == start)? NULL : start;
+       }

diff --git a/debian/patches/fix_lib_deps b/debian/patches/fix_lib_deps
index 4e1a626ec21f00eb91171bb5b4826e8db239fd4e..4ebe12579ba818bc4a5f7dedb22d312b81c080bc 100644 (file)
--- a/debian/patches/fix_lib_deps
+++ b/debian/patches/fix_lib_deps
@@ -336,7 +336,7 @@ Last-Update: 2011-08-28
  # Dependencies for shared library
  DLL_LIB = ncbi_xreader$(DLL)
  
-+DLL_DLIB = ncbi_xreader_id2 ncbi_xreader_id1 ncbi_xreader_cache ncbi_xreader \
++DLL_DLIB = id2 id1 ncbi_xreader \
 +           xobjmgr seq xutil xncbi
 +
  WATCHERS = vasilche

diff --git a/debian/patches/series b/debian/patches/series
index b74b155f2e4ee27dfe7d00e064f992842db22977..8d79322c4bd72175f175fa49663deb877a2afe8c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ no_multiarch_rpath
 use_pie_for_apps
 skip_services_unit_test
 fix_configure
+fix_compilation

diff --git a/debian/rules b/debian/rules
index d5cb058f0d89fb71e5557b604d7fff97704fc7e1..d85e168954cc5bdea222c0a0e81c76abce765655 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,8 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
        cd c++/BUILD/build  && \
-           make -f Makefile.flat all_projects="$(proj)"
+            make all_r
+#          make -f Makefile.flat all_projects="$(proj)"
 
 override_dh_auto_test:
        -dh_auto_test