[med-svn] [ray] 03/03: Package for Ray version 2.3.0 (release 1)

[Sébastien Boisvert]

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

sboisvert-guest pushed a commit to branch master
in repository ray.

commit f10322ee4e5bab94cc62f5b23861c528ef9b85ab
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date:   Mon Feb 3 14:21:13 2014 -0500

    Package for Ray version 2.3.0 (release 1)
    
    Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
---
 debian/changelog                                 |  6 +++++
 debian/patches/reorder_args_to_keep_linker_happy | 29 ------------------------
 debian/patches/series                            |  1 -
 debian/rules                                     |  7 +++---
 debian/watch                                     |  2 +-
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc1f2ad..8e82d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ray (2.3.0-1) unstable; urgency=low
+
+  * package for Ray 2.3.0
+
+ -- Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>  Mon, 3 Feb 2014 13:17:00 -0500
+
 ray (2.1.0-2) UNRELEASED; urgency=low
 
   * debian/control:
diff --git a/debian/patches/reorder_args_to_keep_linker_happy b/debian/patches/reorder_args_to_keep_linker_happy
deleted file mode 100644
index b9f4a67..0000000
--- a/debian/patches/reorder_args_to_keep_linker_happy
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: <short summary of the patch>
-     Patched makefile to keep g++ linker on Ubuntu happy - -l flags
-     have to come after files to link for some reason.
-Author: Tim Booth <tbooth at ceh.ac.uk>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ray-2.1.0.orig/Makefile
-+++ ray-2.1.0/Makefile
-@@ -186,7 +186,7 @@ showOptions:
- 	
- # how to make Ray
- Ray: showOptions RayPlatform/libRayPlatform.a code/TheRayGenomeAssembler.a
--	$(MPICXX) $(LDFLAGS)  code/TheRayGenomeAssembler.a RayPlatform/libRayPlatform.a -o $@
-+	$(MPICXX) code/TheRayGenomeAssembler.a RayPlatform/libRayPlatform.a $(LDFLAGS) -o $@
- 	@echo $(PREFIX) > PREFIX
- 	@echo Ray > TARGETS
- 
diff --git a/debian/patches/series b/debian/patches/series
index f48af8e..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-reorder_args_to_keep_linker_happy
diff --git a/debian/rules b/debian/rules
index d49da74..fe28108 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,12 @@
 CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 CXXFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=-I. -I../RayPlatform -DHAVE_LIBZ -DHAVE_LIBBZ2 
-CXXFLAGS+=-DRAY_VERSION=\\\\\\\"2.1.0\\\\\\\" 
 
 %:
 	dh $@ 
 
 override_dh_auto_clean :
-	dh_auto_clean -- HAVE_LIBZ=y HAVE_LIBBZ2=y
+	dh_auto_clean -- CXXFLAGS="$(CXXFLAGS)" HAVE_LIBZ=y HAVE_LIBBZ2=y
 	rm -rf install-prefix
 	rm -f README.Ray  README.RayPlatform
 
@@ -22,5 +20,6 @@ override_dh_auto_build :
 	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)" HAVE_LIBBZ2=y HAVE_LIBZ=y
 	#Rename 2 docs to make more sence in package context
 	cp README.md README.Ray
-	cp RayPlatform/README README.RayPlatform
+	cp RayPlatform/README.md README.RayPlatform
+	cp RayPlatform/README.md RayPlatform/README
 
diff --git a/debian/watch b/debian/watch
index 664d4cb..adcda96 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/denovoassembler/Ray-v?(\d[\d\.]+)\.tar\.bz2
+http://sf.net/denovoassembler/Ray-?(\d[\d\.]+)\.tar\.bz2

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