[med-svn] [genometools] 03/03: WIP: ner upstream

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository genometools.

commit 80bbe17288c0e29e520fcfc92f7ec7274c427962
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sun Aug 6 16:14:27 2017 +0200

    WIP: ner upstream
---
 debian/changelog                  |  7 +++++++
 debian/genometools-common.install | 19 +------------------
 debian/patches/adding_soname      |  4 ++--
 debian/patches/libbam-fix         |  6 +++---
 debian/patches/reproducible       |  4 ++--
 debian/patches/series             |  2 --
 6 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42b65dd..0bc9716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+genometools (1.5.10+ds-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop and update patches applied upstream.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sun, 06 Aug 2017 15:59:14 +0200
+
 genometools (1.5.9+ds-5) unstable; urgency=medium
 
   * Change test data to make run less problematic.
diff --git a/debian/genometools-common.install b/debian/genometools-common.install
index 1ffbe54..7e21d50 100644
--- a/debian/genometools-common.install
+++ b/debian/genometools-common.install
@@ -1,18 +1 @@
-usr/bin/gtdata/doc usr/share/genometools/gtdata
-usr/bin/gtdata/obo_files usr/share/genometools/gtdata
-usr/bin/gtdata/sketch usr/share/genometools/gtdata
-usr/bin/gtdata/spec usr/share/genometools/gtdata
-usr/bin/gtdata/trans usr/share/genometools/gtdata
-usr/bin/gtdata/xrf_abbr usr/share/genometools/gtdata
-usr/bin/gtdata/modules/fileutils.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtdoclib.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtdoclib usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtlua.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtlua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtmodulehelper.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/stringext.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/warning.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/gtlua.lua usr/share/genometools/gtdata/modules
-usr/bin/gtdata/modules/external/md5.lua usr/share/genometools/gtdata/modules/external
-usr/bin/gtdata/modules/external/re.lua usr/share/genometools/gtdata/modules/external
-
+usr/share/genometools/gtdata usr/share/genometools
diff --git a/debian/patches/adding_soname b/debian/patches/adding_soname
index 5d59b48..bd33df8 100644
--- a/debian/patches/adding_soname
+++ b/debian/patches/adding_soname
@@ -13,7 +13,7 @@ Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
  
  # compiled executables
  GTMAIN_SRC:=src/gt.c src/gtr.c src/gtt.c src/interactive.c
-@@ -622,8 +623,9 @@
+@@ -628,8 +629,9 @@
  	$(V_ECHO) "[link $(@F)]"
  	$(V_DO)test -d $(@D) || mkdir -p $(@D)
  	$(V_DO)$(CC) $(EXP_LDFLAGS) $(VERSION_SCRIPT_PARAM) \
@@ -25,7 +25,7 @@ Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
  
  define PROGRAM_template
  $(1): $(2)
-@@ -990,7 +992,8 @@
+@@ -1003,7 +1005,8 @@
  	$(RANLIB) $(prefix)/lib/libgenometools.a
  endif
  ifneq ($(sharedlib),no)
diff --git a/debian/patches/libbam-fix b/debian/patches/libbam-fix
index 72cef54..6ab230c 100644
--- a/debian/patches/libbam-fix
+++ b/debian/patches/libbam-fix
@@ -5,7 +5,7 @@ Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -601,6 +601,10 @@
+@@ -607,6 +607,10 @@
  	$(V_DO)$(RANLIB) $@
  endif
  
@@ -16,7 +16,7 @@ Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
  lib/libgenometools.a: obj/gt_config.h  $(LIBGENOMETOOLS_OBJ)
  	$(V_ECHO) "[link $(@F)]"
  	$(V_DO)test -d $(@D) || mkdir -p $(@D)
-@@ -619,13 +623,14 @@
+@@ -625,13 +629,14 @@
                                            $(LIBGENOMETOOLS_OBJ) \
                                            $(ADDITIONAL_SO_DEPS) \
                                            $(ADDITIONAL_ZLIBS) \
@@ -32,7 +32,7 @@ Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
  
  define PROGRAM_template
  $(1): $(2)
-@@ -638,46 +643,55 @@
+@@ -644,46 +649,55 @@
  
  $(eval $(call PROGRAM_template, bin/gt, $(GTMAIN_OBJ) $(TOOLS_OBJ) \
                                          lib/libgenometools.a \
diff --git a/debian/patches/reproducible b/debian/patches/reproducible
index ea10bcf..983636d 100644
--- a/debian/patches/reproducible
+++ b/debian/patches/reproducible
@@ -10,7 +10,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  INCLUDEOPT:=-I$(CURDIR)/src -I$(CURDIR)/obj
  
  ifeq ($(shell pkg-config --version > /dev/null 2> /dev/null; echo $$?),0)
-@@ -706,7 +707,7 @@
+@@ -712,7 +713,7 @@
  	$(V_DO)(echo '#ifndef GT_CONFIG_H' ;\
  	echo '#define GT_CONFIG_H' ;\
  	echo '#define GT_CC "'`$(CC) --version | head -n 1`\" ;\
@@ -19,7 +19,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  	echo '$(EXP_CPPFLAGS) $(GT_CPPFLAGS)' | \
  	sed -e 's/\([^\]\)"/\1\\"/g' -e 's/^"/\\"/g' -e 's/$$/"/' \
  	    -e 's/^/#define GT_CPPFLAGS "/'; \
-@@ -910,6 +911,10 @@
+@@ -922,6 +923,10 @@
  	bin/examples/sketch_constructed gtdata/sketch/default.style \
  	  www/genometools.org/htdocs/images/constructed.png
  endif
diff --git a/debian/patches/series b/debian/patches/series
index c49fe86..62b5eaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,3 @@ split-manuals
 use-mx32
 gtdoc-traverse-sorted
 ignore-m32-m64.patch
-spelling.patch
-fix_caption.patch

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