[med-svn] [ugene] 04/05: Refresh patches

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository ugene.

commit 4fb4c7a4c8d52040df5e643778f95c633696a12c
Author: Andreas Tille <tille at debian.org>
Date:   Mon Mar 14 19:19:27 2016 +0100

    Refresh patches
---
 debian/patches/use_debian_sqlite.patch | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/use_debian_sqlite.patch b/debian/patches/use_debian_sqlite.patch
index 36b613a..909264f 100644
--- a/debian/patches/use_debian_sqlite.patch
+++ b/debian/patches/use_debian_sqlite.patch
@@ -129,7 +129,7 @@ Last-Updated: 2013-11-30
 -          src/libs_3rdparty/sqlite3 \
            src/libs_3rdparty/gtest \
            src/libs_3rdparty/samtools \
-           src/libs_3rdparty/humimit \
+           src/libs_3rdparty/QSpec \
 --- a/src/ugenecl/ugenecl.pri
 +++ b/src/ugenecl/ugenecl.pri
 @@ -14,7 +14,7 @@ CONFIG +=qt dll thread debug_and_release
@@ -138,10 +138,10 @@ Last-Updated: 2013-11-30
  
 -LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
 +LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Remote -lU2Lang -lU2Private -lsqlite3 -lbreakpad -lhumimit
- 
- !debug_and_release|build_pass {
- 
-@@ -24,8 +24,8 @@ LIBS += -L../_release -lU2Core -lU2Algor
+ if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+     LIBS -= -lhumimit
+ }
+@@ -26,8 +26,8 @@ if(exclude_list_enabled()|!exists( ../li
          DESTDIR=../_debug
          MOC_DIR=_tmp/moc/debug
          OBJECTS_DIR=_tmp/obj/debug
@@ -149,21 +149,21 @@ Last-Updated: 2013-11-30
 -        LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lugenedbd -lbreakpadd -lhumimitd
 +        LIBS -= -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2Test -lU2Remote -lU2Lang -lU2Private -lbreakpad -lhumimit
 +        LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lbreakpadd -lhumimitd
-     }
- 
-     CONFIG(release, debug|release) {
+         if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+             LIBS -= -lhumimitd
+         }
 --- a/src/ugeneui/ugeneui.pri
 +++ b/src/ugeneui/ugeneui.pri
 @@ -16,7 +16,7 @@ DEFINES+= QT_DLL QT_FATAL_ASSERT
- INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src ../libs_3rdparty/humimit/src
+ INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src ../libs_3rdparty/QSpec/src
  macx : INCLUDEPATH += /System/Library/Frameworks/Security.framework/Headers
  
--LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
-+LIBS += -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lsqlite3 -lbreakpad -lhumimit
+-LIBS += -L../_release -L../libs_3rdparty/humimit/ -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lugenedb -lbreakpad -lhumimit
++LIBS += -L../_release -L../libs_3rdparty/humimit/ -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lsqlite3 -lbreakpad -lhumimit
  macx: LIBS += /System/Library/Frameworks/Security.framework/Security
- 
- !debug_and_release|build_pass {
-@@ -28,8 +28,8 @@ macx: LIBS += /System/Library/Frameworks
+ if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+     LIBS -= -lhumimit
+@@ -31,8 +31,8 @@ if(exclude_list_enabled()|!exists( ../li
          DESTDIR=../_debug
          MOC_DIR=_tmp/moc/debug
          OBJECTS_DIR=_tmp/obj/debug
@@ -171,6 +171,6 @@ Last-Updated: 2013-11-30
 -        LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Viewd -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lugenedbd -lbreakpadd -lhumimitd
 +        LIBS -= -L../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Gui -lU2View -lU2Test -lU2Remote -lU2Lang -lU2Private -lbreakpad -lhumimit
 +        LIBS += -L../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Guid -lU2Viewd -lU2Testd -lU2Remoted -lU2Langd -lU2Privated -lbreakpadd -lhumimitd
-     }
- 
-     CONFIG(release, debug|release) {
+         if(exclude_list_enabled()|!exists( ../libs_3rdparty/QSpec/QSpec.pro )) {
+             LIBS -= -lhumimitd
+         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git