[med-svn] [seqtools] 01/02: Add JSONCPP to pkg-config

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository seqtools.

commit fa8a2323ed73499a828d3461083be9e8a8d4619b
Author: Gert Wollny <gewo at debian.org>
Date:   Thu Oct 26 08:36:25 2017 +0200

    Add JSONCPP to pkg-config
---
 debian/patches/dynamic-lib.patch                 | 13 +++++++++++--
 debian/patches/use_debian_packaged_jsoncpp.patch | 21 ++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/patches/dynamic-lib.patch b/debian/patches/dynamic-lib.patch
index ae66cd2..bce34a3 100644
--- a/debian/patches/dynamic-lib.patch
+++ b/debian/patches/dynamic-lib.patch
@@ -4,7 +4,7 @@ Description: Create dynamic library
 
 --- a/gbtools/configure.ac
 +++ b/gbtools/configure.ac
-@@ -36,7 +36,9 @@ fi
+@@ -36,7 +36,9 @@
  
  AC_CONFIG_MACRO_DIR([m4])
  
@@ -15,9 +15,18 @@ Description: Create dynamic library
  
  LT_LANG([C++])
  
+@@ -66,7 +68,7 @@
+ AC_CHECK_FUNCS([dup2 floor gethostbyname memset socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr strtol uname])
+ 
+ # Check for dependencies required by all executables
+-PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10])
++PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10 jsoncpp])
+ 
+ # Check for optional dependencies
+ AX_CHECK_OPENSSL()
 --- a/belvuApp/Makefile.am
 +++ b/belvuApp/Makefile.am
-@@ -19,13 +19,13 @@ belvu_LDADD = $(top_builddir)/seqtoolsUt
+@@ -19,13 +19,13 @@
  
  # If gbtools is in a subdirectory, add it; otherwise look for a local installation
  if USE_GBTOOLS
diff --git a/debian/patches/use_debian_packaged_jsoncpp.patch b/debian/patches/use_debian_packaged_jsoncpp.patch
index 4fd8e05..6ad6784 100644
--- a/debian/patches/use_debian_packaged_jsoncpp.patch
+++ b/debian/patches/use_debian_packaged_jsoncpp.patch
@@ -5,7 +5,7 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
 
 --- a/gbtools/Makefile.am
 +++ b/gbtools/Makefile.am
-@@ -10,11 +10,7 @@ libgbtools_la_SOURCES =
+@@ -10,11 +10,7 @@
  
  libgbtools_la_LIBADD = src/gbtoolsGUI/libgbtoolsGUI.la src/gbtoolsUtils/libgbtoolsUtils.la
  
@@ -20,7 +20,7 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
  libgbtools_la_LIBADD += src/gbtoolsCurl/libgbtoolsCurl.la src/gbtoolsPfetch/libgbtoolsPfetch.la
 --- a/gbtools/configure.ac
 +++ b/gbtools/configure.ac
-@@ -19,8 +19,6 @@ src/gbtoolsGUI/Makefile
+@@ -19,8 +19,6 @@
  src/gbtoolsCurl/Makefile
  src/gbtoolsTrackhub/Makefile
  src/gbtoolsPfetch/Makefile
@@ -46,7 +46,7 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
  SUBDIRS += gbtoolsTrackhub
 --- a/gbtools/src/include/Makefile.am
 +++ b/gbtools/src/include/Makefile.am
-@@ -6,210 +6,6 @@ gbtools/gbtoolsTrackhub.hpp \
+@@ -6,210 +6,6 @@
  gbtools/gbtoolsGUI.hpp \
  gbtools/gbtoolsPfetch.hpp \
  gbtools/gbtoolsUtils.hpp \
@@ -270,7 +270,7 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
  
 --- a/doc/Design_notes/Makefile
 +++ b/doc/Design_notes/Makefile
-@@ -185,7 +185,7 @@ CXXFLAGS = -g -O2
+@@ -185,7 +185,7 @@
  CYGPATH_W = echo
  DEFS = -DHAVE_CONFIG_H
  DEPDIR = .deps
@@ -281,7 +281,7 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
  DEPS_SQLITE3_LIBS = -lsqlite3  
 --- a/doc/Design_notes/modules/Makefile
 +++ b/doc/Design_notes/modules/Makefile
-@@ -185,7 +185,7 @@ CXXFLAGS = -g -O2
+@@ -185,7 +185,7 @@
  CYGPATH_W = echo
  DEFS = -DHAVE_CONFIG_H
  DEPDIR = .deps
@@ -290,3 +290,14 @@ Description: Use Debian packaged jsoncpp as well as get completely rid
  DEPS_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfontconfig -lgobject-2.0 -lglib-2.0 -lfreetype  
  DEPS_SQLITE3_CFLAGS =  
  DEPS_SQLITE3_LIBS = -lsqlite3  
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,7 +70,7 @@
+ AC_CHECK_FUNCS([dup2 floor gethostbyname memset socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr strtol uname])
+ 
+ # Check for dependencies required by all executables
+-PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10])
++PKG_CHECK_MODULES([DEPS], [glib-2.0 gtk+-2.0 >= 2.10 jsoncpp])
+ 
+ # Check for dependencies required by sqlite code
+ PKG_CHECK_MODULES([DEPS_SQLITE3], [sqlite3], [HAVE_SQLITE3=1], [HAVE_SQLITE3=0])

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