[med-svn] [dazzdb] 08/10: Update patches

Afif Elghraoui afif at moszumanska.debian.org
Wed Oct 12 09:04:24 UTC 2016 

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

afif pushed a commit to branch master
in repository dazzdb.

commit 383b3ff0cae9bb9f9ff36e3737f1b4cf099a27fc
Author: Afif Elghraoui <afif at debian.org>
Date:   Tue Oct 11 21:51:13 2016 -0700

    Update patches
---
 .../patches/{append-cflags => append-cflags.patch} | 10 +--
 debian/patches/compiler-flags.patch                | 65 +++++++++++++++++++
 debian/patches/{destdir => destdir.patch}          |  4 +-
 debian/patches/ldflags                             | 75 ----------------------
 .../{rename-simulator => rename-simulator.patch}   | 30 ++++++---
 debian/patches/series                              |  8 +--
 6 files changed, 97 insertions(+), 95 deletions(-)

diff --git a/debian/patches/append-cflags b/debian/patches/append-cflags.patch
similarity index 56%
rename from debian/patches/append-cflags
rename to debian/patches/append-cflags.patch
index c3607c0..d4b7fa8 100644
--- a/debian/patches/append-cflags
+++ b/debian/patches/append-cflags.patch
@@ -4,9 +4,11 @@ Forwarded: no
 Last-Update: 2015-09-13
 --- dazzdb.orig/Makefile
 +++ dazzdb/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS = -O3 -Wall -Wextra -fno-strict-aliasing
-+CFLAGS += -O3 -Wall -Wextra -fno-strict-aliasing
+@@ -1,6 +1,6 @@
+ DEST_DIR = ~/bin
+ 
+-CFLAGS = -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
++CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
  
  ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm simulator \
-       fasta2DAM DAM2fasta
+       fasta2DAM DAM2fasta DBdump rangen
diff --git a/debian/patches/compiler-flags.patch b/debian/patches/compiler-flags.patch
new file mode 100644
index 0000000..988217d
--- /dev/null
+++ b/debian/patches/compiler-flags.patch
@@ -0,0 +1,65 @@
+Description: Honor LDFLAGS in upstream Makefile
+Author: Afif Elghraoui <afif at ghraoui.name>
+Forwarded: no
+Last-Update: 2015-09-13
+--- dazzdb.orig/Makefile
++++ dazzdb/Makefile
+@@ -1,6 +1,7 @@
+ DEST_DIR = ~/bin
+ 
+ CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
++LDFLAGS += -lm
+ 
+ ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm simulator \
+       fasta2DAM DAM2fasta DBdump rangen
+@@ -8,49 +9,35 @@
+ all: $(ALL)
+ 
+ fasta2DB: fasta2DB.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o fasta2DB fasta2DB.c DB.c QV.c -lm
+ 
+ DB2fasta: DB2fasta.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DB2fasta DB2fasta.c DB.c QV.c -lm
+ 
++quiva2DB: CPPFLAGS += -DINTERACTIVE
+ quiva2DB: quiva2DB.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -DINTERACTIVE -o quiva2DB quiva2DB.c DB.c QV.c -lm
+ 
+ DB2quiva: DB2quiva.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DB2quiva DB2quiva.c DB.c QV.c -lm
+ 
+ DBsplit: DBsplit.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBsplit DBsplit.c DB.c QV.c -lm
+ 
+ DBdust: DBdust.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBdust DBdust.c DB.c QV.c -lm
+ 
+ Catrack: Catrack.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o Catrack Catrack.c DB.c QV.c -lm
+ 
+ DBshow: DBshow.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBshow DBshow.c DB.c QV.c -lm
+ 
+ DBdump: DBdump.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBdump DBdump.c DB.c QV.c -lm
+ 
+ DBstats: DBstats.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBstats DBstats.c DB.c QV.c -lm
+ 
+ DBrm: DBrm.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DBrm DBrm.c DB.c QV.c -lm
+ 
+ simulator: simulator.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o simulator simulator.c DB.c QV.c -lm
+ 
+ rangen: rangen.c
+-	gcc $(CFLAGS) -o rangen rangen.c
+ 
+ fasta2DAM: fasta2DAM.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o fasta2DAM fasta2DAM.c DB.c QV.c -lm
+ 
+ DAM2fasta: DAM2fasta.c DB.c DB.h QV.c QV.h
+-	gcc $(CFLAGS) -o DAM2fasta DAM2fasta.c DB.c QV.c -lm
+ 
+ clean:
+ 	rm -f $(ALL)
diff --git a/debian/patches/destdir b/debian/patches/destdir.patch
similarity index 89%
rename from debian/patches/destdir
rename to debian/patches/destdir.patch
index 22fc2d8..c0ecac5 100644
--- a/debian/patches/destdir
+++ b/debian/patches/destdir.patch
@@ -5,11 +5,11 @@ Forwarded: no
 Last-Update: 2015-09-13
 --- dazzdb.orig/Makefile
 +++ dazzdb/Makefile
-@@ -60,7 +60,8 @@
+@@ -44,7 +44,8 @@
  	rm -f dazz.db.tar.gz
  
  install:
--	cp $(ALL) ~/bin
+-	cp $(ALL) $(DEST_DIR)
 +	install -d $(DESTDIR)/usr/bin
 +	install $(ALL) $(DESTDIR)/usr/bin
  
diff --git a/debian/patches/ldflags b/debian/patches/ldflags
deleted file mode 100644
index 21a9723..0000000
--- a/debian/patches/ldflags
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Honor LDFLAGS in upstream Makefile
-Author: Afif Elghraoui <afif at ghraoui.name>
-Forwarded: no
-Last-Update: 2015-09-13
---- dazzdb.orig/Makefile
-+++ dazzdb/Makefile
-@@ -6,52 +6,52 @@
- all: $(ALL)
- 
- fasta2DB: fasta2DB.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o fasta2DB fasta2DB.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o fasta2DB fasta2DB.c DB.c QV.c -lm $(LDFLAGS)
- 
- DB2fasta: DB2fasta.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DB2fasta DB2fasta.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DB2fasta DB2fasta.c DB.c QV.c -lm $(LDFLAGS)
- 
- quiva2DB: quiva2DB.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o quiva2DB quiva2DB.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o quiva2DB quiva2DB.c DB.c QV.c -lm $(LDFLAGS)
- 
- DB2quiva: DB2quiva.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DB2quiva DB2quiva.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DB2quiva DB2quiva.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBsplit: DBsplit.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBsplit DBsplit.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBsplit DBsplit.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBdust: DBdust.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBdust DBdust.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBdust DBdust.c DB.c QV.c -lm $(LDFLAGS)
- 
- Catrack: Catrack.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o Catrack Catrack.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o Catrack Catrack.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBshow: DBshow.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBshow DBshow.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBshow DBshow.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBstats: DBstats.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBstats DBstats.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBstats DBstats.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBrm: DBrm.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBrm DBrm.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBrm DBrm.c DB.c QV.c -lm $(LDFLAGS)
- 
- simulator: simulator.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o simulator simulator.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o simulator simulator.c DB.c QV.c -lm $(LDFLAGS)
- 
- fasta2DAM: fasta2DAM.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o fasta2DAM fasta2DAM.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o fasta2DAM fasta2DAM.c DB.c QV.c -lm $(LDFLAGS)
- 
- DAM2fasta: DAM2fasta.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DAM2fasta DAM2fasta.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DAM2fasta DAM2fasta.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBupgrade.Sep.25.2014: DBupgrade.Sep.25.2014.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBupgrade.Sep.25.2014 DBupgrade.Sep.25.2014.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBupgrade.Sep.25.2014 DBupgrade.Sep.25.2014.c DB.c QV.c -lm $(LDFLAGS)
- 
- DBupgrade.Dec.31.2014: DBupgrade.Dec.31.2014.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DBupgrade.Dec.31.2014 DBupgrade.Dec.31.2014.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DBupgrade.Dec.31.2014 DBupgrade.Dec.31.2014.c DB.c QV.c -lm $(LDFLAGS)
- 
- DUSTupgrade.Jan.1.2015: DUSTupgrade.Jan.1.2015.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o DUSTupgrade.Jan.1.2015 DUSTupgrade.Jan.1.2015.c DB.c QV.c -lm
-+	gcc $(CFLAGS) -o DUSTupgrade.Jan.1.2015 DUSTupgrade.Jan.1.2015.c DB.c QV.c -lm $(LDFLAGS)
- 
- clean:
- 	rm -f $(ALL)
diff --git a/debian/patches/rename-simulator b/debian/patches/rename-simulator.patch
similarity index 53%
rename from debian/patches/rename-simulator
rename to debian/patches/rename-simulator.patch
index 77d68f3..eb16118 100644
--- a/debian/patches/rename-simulator
+++ b/debian/patches/rename-simulator.patch
@@ -5,22 +5,32 @@ Forwarded: no
 Last-Update: 2015-09-20
 --- dazzdb.orig/Makefile
 +++ dazzdb/Makefile
-@@ -1,6 +1,6 @@
- CFLAGS += -O3 -Wall -Wextra -fno-strict-aliasing
+@@ -3,7 +3,7 @@
+ CFLAGS += -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
+ LDFLAGS += -lm
  
 -ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm simulator \
 +ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm dsimulator \
-       fasta2DAM DAM2fasta
+       fasta2DAM DAM2fasta DBdump rangen
  
  all: $(ALL)
-@@ -35,8 +35,8 @@
+@@ -31,7 +31,10 @@
+ 
  DBrm: DBrm.c DB.c DB.h QV.c QV.h
- 	gcc $(CFLAGS) -o DBrm DBrm.c DB.c QV.c -lm $(LDFLAGS)
  
 -simulator: simulator.c DB.c DB.h QV.c QV.h
--	gcc $(CFLAGS) -o simulator simulator.c DB.c QV.c -lm $(LDFLAGS)
-+dsimulator: simulator.c DB.c DB.h QV.c QV.h
-+	gcc $(CFLAGS) -o dsimulator simulator.c DB.c QV.c -lm $(LDFLAGS)
++dsimulator: dsimulator.c DB.c DB.h QV.c QV.h
++
++dsimulator.c: simulator.c
++	ln $< $@
+ 
+ rangen: rangen.c
+ 
+@@ -40,6 +43,7 @@
+ DAM2fasta: DAM2fasta.c DB.c DB.h QV.c QV.h
  
- fasta2DAM: fasta2DAM.c DB.c DB.h QV.c QV.h
- 	gcc $(CFLAGS) -o fasta2DAM fasta2DAM.c DB.c QV.c -lm $(LDFLAGS)
+ clean:
++	$(RM) dsimulator.c
+ 	rm -f $(ALL)
+ 	rm -fr *.dSYM
+ 	rm -f dazz.db.tar.gz
diff --git a/debian/patches/series b/debian/patches/series
index 750efe3..3348c58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-append-cflags
-ldflags
-destdir
-rename-simulator
+append-cflags.patch
+compiler-flags.patch
+destdir.patch
+rename-simulator.patch

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

More information about the debian-med-commit mailing list