[med-svn] [ugene] 01/02: d/p/use_debian_sqlite.patch: Update for src/corelibs/U2Script

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository ugene.

commit 5182d465151dec8c8ab4dd89cd459d05a6a4c7ee
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Dec 10 13:47:33 2015 +0100

    d/p/use_debian_sqlite.patch: Update for src/corelibs/U2Script
---
 debian/patches/use_debian_sqlite.patch | 66 +++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/debian/patches/use_debian_sqlite.patch b/debian/patches/use_debian_sqlite.patch
index a3cfe18..ba680d1 100644
--- a/debian/patches/use_debian_sqlite.patch
+++ b/debian/patches/use_debian_sqlite.patch
@@ -4,8 +4,10 @@ Description: Tried to use Debian packages sqlite3
  but failed because package does not build that way
 Forwarded: no
 Last-Updated: 2013-11-30
---- a/ugene.pro
-+++ b/ugene.pro
+Index: ugene/ugene.pro
+===================================================================
+--- ugene.orig/ugene.pro
++++ ugene/ugene.pro
 @@ -11,7 +11,6 @@ use_bundled_zlib() {
  SUBDIRS += \
            src/libs_3rdparty/breakpad \
@@ -14,8 +16,10 @@ Last-Updated: 2013-11-30
            src/libs_3rdparty/gtest \
            src/libs_3rdparty/samtools \
            src/corelibs/U2Core \
---- a/src/corelibs/U2Core/U2Core.pri
-+++ b/src/corelibs/U2Core/U2Core.pri
+Index: ugene/src/corelibs/U2Core/U2Core.pri
+===================================================================
+--- ugene.orig/src/corelibs/U2Core/U2Core.pri
++++ ugene/src/corelibs/U2Core/U2Core.pri
 @@ -19,9 +19,7 @@ use_bundled_zlib() {
  unix: QMAKE_CXXFLAGS += -Wno-char-subscripts
  
@@ -36,8 +40,10 @@ Last-Updated: 2013-11-30
      }
  
      CONFIG(release, debug|release) {
---- a/src/corelibs/U2Formats/U2Formats.pri
-+++ b/src/corelibs/U2Formats/U2Formats.pri
+Index: ugene/src/corelibs/U2Formats/U2Formats.pri
+===================================================================
+--- ugene.orig/src/corelibs/U2Formats/U2Formats.pri
++++ ugene/src/corelibs/U2Formats/U2Formats.pri
 @@ -12,7 +12,7 @@ UGENE_RELATIVE_DESTDIR = ''
  DEFINES+= QT_FATAL_ASSERT BUILDING_U2FORMATS_DLL
  
@@ -58,8 +64,10 @@ Last-Updated: 2013-11-30
  
          win32-msvc2013 {
              LIBS -= -lzlib
---- a/src/plugins/dbi_bam/dbi_bam.pri
-+++ b/src/plugins/dbi_bam/dbi_bam.pri
+Index: ugene/src/plugins/dbi_bam/dbi_bam.pri
+===================================================================
+--- ugene.orig/src/plugins/dbi_bam/dbi_bam.pri
++++ ugene/src/plugins/dbi_bam/dbi_bam.pri
 @@ -10,7 +10,7 @@ use_bundled_zlib() {
      INCLUDEPATH += ../../libs_3rdparty/zlib/src
  }
@@ -80,8 +88,10 @@ Last-Updated: 2013-11-30
  
          win32-msvc2013 {
              LIBS -= -lzlib
---- a/src/ugenecl/ugenecl.pri
-+++ b/src/ugenecl/ugenecl.pri
+Index: ugene/src/ugenecl/ugenecl.pri
+===================================================================
+--- ugene.orig/src/ugenecl/ugenecl.pri
++++ ugene/src/ugenecl/ugenecl.pri
 @@ -14,7 +14,7 @@ CONFIG +=qt dll thread debug_and_release
  DEFINES+= QT_DLL QT_FATAL_ASSERT
  INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src
@@ -102,8 +112,10 @@ Last-Updated: 2013-11-30
      }
  
      CONFIG(release, debug|release) {
---- a/src/ugeneui/ugeneui.pri
-+++ b/src/ugeneui/ugeneui.pri
+Index: ugene/src/ugeneui/ugeneui.pri
+===================================================================
+--- ugene.orig/src/ugeneui/ugeneui.pri
++++ ugene/src/ugeneui/ugeneui.pri
 @@ -16,7 +16,7 @@ DEFINES+= QT_DLL QT_FATAL_ASSERT
  INCLUDEPATH += src _tmp ../include ../corelibs/U2Private/src
  macx : INCLUDEPATH += /System/Library/Frameworks/Security.framework/Headers
@@ -124,3 +136,33 @@ Last-Updated: 2013-11-30
      }
  
      CONFIG(release, debug|release) {
+Index: ugene/src/corelibs/U2Script/U2Script.pri
+===================================================================
+--- ugene.orig/src/corelibs/U2Script/U2Script.pri
++++ ugene/src/corelibs/U2Script/U2Script.pri
+@@ -21,15 +21,15 @@ INCLUDEPATH +=      ../../include \
+ #                    $${UGENE_NODE_DIR}/deps/uv/include
+ #}
+ 
+-LIBS += -L../../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Remote -lU2Lang -lU2Private -lugenedb -lU2Gui -lU2Test
++LIBS += -L../../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Remote -lU2Lang -lU2Private -lsqlite3 -lU2Gui -lU2Test
+ 
+ !debug_and_release|build_pass {
+ 
+     CONFIG( debug, debug|release ) {
+         DESTDIR =   ../../_debug
+ 
+-        LIBS -=     -L../../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Remote -lU2Lang -lU2Private -lugenedb -lU2Gui -lU2Test
+-        LIBS +=     -L../../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Remoted -lU2Langd -lU2Privated -lugenedbd -lU2Guid -lU2Testd
++        LIBS -=     -L../../_release -lU2Core -lU2Algorithm -lU2Formats -lU2Remote -lU2Lang -lU2Private -lsqlite3 -lU2Gui -lU2Test
++        LIBS +=     -L../../_debug -lU2Cored -lU2Algorithmd -lU2Formatsd -lU2Remoted -lU2Langd -lU2Privated -lsqlite3 -lU2Guid -lU2Testd
+                     
+ #        count( UGENE_NODE_DIR, 1 ) {
+ #            LIBS += -l$${UGENE_NODE_DIR}/Debug/node
+@@ -48,4 +48,4 @@ LIBS += -L../../_release -lU2Core -lU2Al
+ unix {
+     target.path =   $$UGENE_INSTALL_DIR/$$UGENE_RELATIVE_DESTDIR
+     INSTALLS +=     target
+-}
+\ No newline at end of file
++}

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