[med-svn] [qtltools] 05/06: Refresh patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository qtltools.

commit 1bfd68cd013dee187114f37df84b9a3a41b5e217
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jan 16 10:08:58 2017 +0100

    Refresh patches
---
 debian/patches/Makefile_config.patch    | 19 ++++++-------------
 debian/patches/reproducible_build.patch |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/patches/Makefile_config.patch b/debian/patches/Makefile_config.patch
index 8b49aaa..f98374a 100644
--- a/debian/patches/Makefile_config.patch
+++ b/debian/patches/Makefile_config.patch
@@ -5,17 +5,17 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -32,7 +32,7 @@
+@@ -28,7 +28,7 @@ OFILE=$(shell for file in `find src -nam
  VPATH=$(shell for file in `find src -name *.cpp`; do echo $$(dirname $$file); done)
  
  #DEFAULT VERSION (I.E. UNIGE DESKTOP RELEASE VERSION)
--all: default
+-all: desktop
 +all: debian
  
- #DEFAULT RELEASE VERSION
- default: CXXFLAG=$(CXXFLAG_REL) $(CXXFLAG_WRN)
-@@ -145,6 +145,14 @@
- mac-dbg: LDFLAG=$(LDFLAG_DBG) -L /opt/local/lib
+ #UNIGE DESKTOP RELEASE VERSION
+ desktop: RMATH_INC=$(HOME)/Tools/R-3.2.2/src/include
+@@ -92,6 +92,14 @@ mac-dbg: LIB_FILES=$(RMATH_LIB)/libRmath
+ mac-dbg: LDFLAG=$(CXXFLAG_DBG) -L /opt/local/lib
  mac-dbg: $(BFILE)
  
 +#DEBIAN PACKAGE VERSION
@@ -29,10 +29,3 @@ Forwarded: not-needed
  #COMPILATION RULES
  $(BFILE): $(OFILE)
  	$(CXX) $^ $(LIB_FILES) -o $@ $(LIB_FLAGS) $(LDFLAG)
-@@ -242,4 +250,4 @@
- clean-fdensity:
- 	rm -f obj/fdensity_*.o $(BFILE)
- 		
--		
-\ No newline at end of file
-+		
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
index 00cd518..3af3c47 100644
--- a/debian/patches/reproducible_build.patch
+++ b/debian/patches/reproducible_build.patch
@@ -5,7 +5,7 @@ Forwarded: TODO
 
 --- a/Makefile
 +++ b/Makefile
-@@ -27,8 +27,8 @@
+@@ -23,8 +23,8 @@ LIB_FLAGS=-Wl,-Bstatic -lz -lgsl -lblas
  BFILE=bin/QTLtools
  HFILE=$(shell find src -name *.h)
  TFILE=$(shell find lib -name *.h)

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