[med-svn] r20669 - in trunk/packages/genometools/trunk/debian: . patches tests

[Sascha Steinbiss]

Author: sascha-guest
Date: 2015-12-08 00:44:48 +0000 (Tue, 08 Dec 2015)
New Revision: 20669

Modified:
   trunk/packages/genometools/trunk/debian/changelog
   trunk/packages/genometools/trunk/debian/patches/adding_soname
   trunk/packages/genometools/trunk/debian/patches/libbam-fix
   trunk/packages/genometools/trunk/debian/tests/control
Log:
use correct shared lib in python bindings



Modified: trunk/packages/genometools/trunk/debian/changelog
===================================================================
--- trunk/packages/genometools/trunk/debian/changelog	2015-12-07 16:19:24 UTC (rev 20668)
+++ trunk/packages/genometools/trunk/debian/changelog	2015-12-08 00:44:48 UTC (rev 20669)
@@ -1,3 +1,10 @@
+genometools (1.5.7-5) unstable; urgency=medium
+
+  * Try to load correct renamed .so file in Python bindings
+  * Refresh patches
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Tue, 08 Dec 2015 00:42:49 +0000
+
 genometools (1.5.7-4) unstable; urgency=medium
 
   * Fix builds on less popular platforms

Modified: trunk/packages/genometools/trunk/debian/patches/adding_soname
===================================================================
--- trunk/packages/genometools/trunk/debian/patches/adding_soname	2015-12-07 16:19:24 UTC (rev 20668)
+++ trunk/packages/genometools/trunk/debian/patches/adding_soname	2015-12-08 00:44:48 UTC (rev 20669)
@@ -5,7 +5,7 @@
 Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
 --- a/Makefile
 +++ b/Makefile
-@@ -102,6 +102,7 @@
+@@ -105,6 +105,7 @@
    SHARED_OBJ_NAME_EXT:=.so
    SHARED:=-shared
  endif
@@ -13,7 +13,7 @@
  
  # compiled executables
  GTMAIN_SRC:=src/gt.c src/gtr.c src/gtt.c src/interactive.c
-@@ -559,8 +560,9 @@
+@@ -585,8 +586,9 @@
  	@echo "[link $(@F)]"
  	@test -d $(@D) || mkdir -p $(@D)
  	@$(CC) $(EXP_LDFLAGS) $(VERSION_SCRIPT_PARAM) \
@@ -25,7 +25,7 @@
  
  define PROGRAM_template
  $(1): $(2)
-@@ -915,7 +917,8 @@
+@@ -940,7 +942,8 @@
  	$(RANLIB) $(prefix)/lib/libgenometools.a
  endif
  ifneq ($(sharedlib),no)
@@ -35,3 +35,19 @@
  endif
  	@echo '[build config script $(@F)]'
  	sed -e 's!@CC@!$(CC)!' -e 's!@CFLAGS@!$(EXP_CFLAGS)!' \
+--- a/gtpython/gt/dlload.py
++++ b/gtpython/gt/dlload.py
+@@ -26,8 +26,12 @@
+     soext = ".dylib"
+ else:
+     soext = ".so"
++try:
++	gtlib = CDLL("libgenometools" + soext)
++except OSError:
++	# Debian sets a version suffix
++	gtlib = CDLL("libgenometools" + soext + ".0")
+ 
+-gtlib = CDLL("libgenometools" + soext)
+ gtlib.gt_lib_init()
+ gtlib.gt_lib_reg_atexit_func()
+ 

Modified: trunk/packages/genometools/trunk/debian/patches/libbam-fix
===================================================================
--- trunk/packages/genometools/trunk/debian/patches/libbam-fix	2015-12-07 16:19:24 UTC (rev 20668)
+++ trunk/packages/genometools/trunk/debian/patches/libbam-fix	2015-12-08 00:44:48 UTC (rev 20669)
@@ -5,7 +5,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -192,7 +192,7 @@
+@@ -195,7 +195,7 @@
  # add necessary shared lib dependencies then not building them ourselves
  ifeq ($(useshared),yes)
    DEPLIBS:=-lbz2 -lz -lexpat -llua5.1-lpeg -llua5.1 -llua5.1-md5 \
@@ -14,7 +14,7 @@
  else
    DEPLIBS:=
  endif
-@@ -538,6 +538,10 @@
+@@ -564,6 +564,10 @@
  	@$(RANLIB) $@
  endif
  
@@ -25,7 +25,7 @@
  lib/libgenometools.a: obj/gt_config.h  $(LIBGENOMETOOLS_OBJ)
  	@echo "[link $(@F)]"
  	@test -d $(@D) || mkdir -p $(@D)
-@@ -556,13 +560,14 @@
+@@ -582,13 +586,14 @@
                                            $(LIBGENOMETOOLS_OBJ) \
                                            $(ADDITIONAL_SO_DEPS) \
                                            $(ADDITIONAL_ZLIBS) \
@@ -41,7 +41,7 @@
  
  define PROGRAM_template
  $(1): $(2)
-@@ -575,46 +580,55 @@
+@@ -601,46 +606,55 @@
  
  $(eval $(call PROGRAM_template, bin/gt, $(GTMAIN_OBJ) $(TOOLS_OBJ) \
                                          lib/libgenometools.a \

Modified: trunk/packages/genometools/trunk/debian/tests/control
===================================================================
--- trunk/packages/genometools/trunk/debian/tests/control	2015-12-07 16:19:24 UTC (rev 20668)
+++ trunk/packages/genometools/trunk/debian/tests/control	2015-12-08 00:44:48 UTC (rev 20669)
@@ -1,5 +1,5 @@
 Tests: build-lib
-Depends: @, libgenometools0-dev, libgenometools0, build-essential
+Depends: libgenometools0-dev, libgenometools0, build-essential
 
 Tests: python-lib
-Depends: @, libgenometools0-dev, libgenometools0, python-genometools, python
\ No newline at end of file
+Depends: python-genometools, python
\ No newline at end of file