[med-svn] [genometools] 03/08: make __FILE__ paths relative

[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 0f57a25bfc78e9395cf4d1450faf455d70573f76
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Sep 2 15:47:21 2016 +0000

    make __FILE__ paths relative
---
 debian/changelog                                       |  2 ++
 debian/patches/adding_soname                           |  6 +++---
 debian/patches/ignore-m32-m64.patch                    |  2 +-
 debian/patches/libbam-fix                              |  6 +++---
 debian/patches/{remove_png_timestamps => reproducible} | 13 +++++++++++--
 debian/patches/series                                  |  2 +-
 debian/patches/use-mx32                                |  2 +-
 7 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 751771d..a0f5719 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ genometools (1.5.9+ds-3) unstable; urgency=medium
 
   * Remove hardcoded number of threads from testsuite call.
     Closes: #836283
+  * Make build reproducible.
+    - Remove absolute include path to make __FILE__ use relative paths.
 
  -- Sascha Steinbiss <satta at debian.org>  Thu, 01 Sep 2016 17:16:40 +0000
 
diff --git a/debian/patches/adding_soname b/debian/patches/adding_soname
index f0f8b89..5d59b48 100644
--- a/debian/patches/adding_soname
+++ b/debian/patches/adding_soname
@@ -5,7 +5,7 @@ Description: add soname to linker call in Makefile
 Author: Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>
 --- a/Makefile
 +++ b/Makefile
-@@ -137,6 +137,7 @@
+@@ -138,6 +138,7 @@
    SHARED_OBJ_NAME_EXT:=.so
    SHARED:=-shared
  endif
@@ -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
-@@ -621,8 +622,9 @@
+@@ -622,8 +623,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)
-@@ -989,7 +991,8 @@
+@@ -990,7 +992,8 @@
  	$(RANLIB) $(prefix)/lib/libgenometools.a
  endif
  ifneq ($(sharedlib),no)
diff --git a/debian/patches/ignore-m32-m64.patch b/debian/patches/ignore-m32-m64.patch
index f781d65..d9236ba 100644
--- a/debian/patches/ignore-m32-m64.patch
+++ b/debian/patches/ignore-m32-m64.patch
@@ -2,7 +2,7 @@ Description: remove explicit -m32 and -m64
 Author: Sascha Steinbiss <satta at debian.org>
 --- a/Makefile
 +++ b/Makefile
-@@ -354,22 +354,6 @@
+@@ -355,22 +355,6 @@
    endif
  endif
  
diff --git a/debian/patches/libbam-fix b/debian/patches/libbam-fix
index 62b711a..72cef54 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
-@@ -600,6 +600,10 @@
+@@ -601,6 +601,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)
-@@ -618,13 +622,14 @@
+@@ -619,13 +623,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)
-@@ -637,46 +642,55 @@
+@@ -638,46 +643,55 @@
  
  $(eval $(call PROGRAM_template, bin/gt, $(GTMAIN_OBJ) $(TOOLS_OBJ) \
                                          lib/libgenometools.a \
diff --git a/debian/patches/remove_png_timestamps b/debian/patches/reproducible
similarity index 92%
rename from debian/patches/remove_png_timestamps
rename to debian/patches/reproducible
index 57db40f..7b7f40a 100644
--- a/debian/patches/remove_png_timestamps
+++ b/debian/patches/reproducible
@@ -1,7 +1,16 @@
-Description: Remove_png_timestamps
+Description: Make build reproducible
+Author: Sascha Steinbiss <satta at debian.org> 
 --- a/Makefile
 +++ b/Makefile
-@@ -910,6 +910,10 @@
+@@ -16,6 +16,7 @@
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
++CURDIR=.
+ INCLUDEOPT:=-I$(CURDIR)/src -I$(CURDIR)/obj
+ 
+ ifeq ($(shell pkg-config --version > /dev/null 2> /dev/null; echo $$?),0)
+@@ -910,6 +911,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 abbaab0..62b5eaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-remove_png_timestamps
+reproducible
 use-pkgconfig
 adding_soname
 libbam-fix
diff --git a/debian/patches/use-mx32 b/debian/patches/use-mx32
index 85b690c..69237e0 100644
--- a/debian/patches/use-mx32
+++ b/debian/patches/use-mx32
@@ -1,7 +1,7 @@
 Description: Use mx32
 --- a/Makefile
 +++ b/Makefile
-@@ -354,17 +354,19 @@
+@@ -355,17 +355,19 @@
    endif
  endif
  

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