[med-svn] [dazzdb] 01/05: Drop rename-simulator.patch in favor of a line in d/rules

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository dazzdb.

commit b74060b18f98695c55211b98e816d6657e0dbd14
Author: Afif Elghraoui <afif at debian.org>
Date:   Tue Dec 27 13:12:02 2016 -0800

    Drop rename-simulator.patch in favor of a line in d/rules
---
 debian/patches/rename-simulator.patch | 36 -----------------------------------
 debian/patches/series                 |  1 -
 debian/rules                          |  2 ++
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/debian/patches/rename-simulator.patch b/debian/patches/rename-simulator.patch
deleted file mode 100644
index eb16118..0000000
--- a/debian/patches/rename-simulator.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Rename simulator binary
- simulator is too generic a name. Rename it to dsimulator.
-Author: Afif Elghraoui <afif at ghraoui.name>
-Forwarded: no
-Last-Update: 2015-09-20
---- dazzdb.orig/Makefile
-+++ dazzdb/Makefile
-@@ -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 DBdump rangen
- 
- all: $(ALL)
-@@ -31,7 +31,10 @@
- 
- DBrm: DBrm.c DB.c DB.h QV.c QV.h
- 
--simulator: simulator.c DB.c DB.h QV.c QV.h
-+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
- 
- 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 3348c58..d7eb8f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 append-cflags.patch
 compiler-flags.patch
 destdir.patch
-rename-simulator.patch
diff --git a/debian/rules b/debian/rules
index 1ddf78e..096184a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ include /usr/share/dpkg/default.mk
 
 override_dh_auto_install:
 	dh_auto_install
+# Use a less generic name for `simulator`
+	cd $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin && mv simulator dsimulator
 	mkdir -p $(CURDIR)/debian/$(DEB_SOURCE)/usr/share/man/man1
 	for command in $(CURDIR)/debian/$(DEB_SOURCE)/usr/bin/*; \
 	do \

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