[med-svn] [blat] 01/01: Several small enhancements and polishing; main change: When using -O2 optimisation the BLAT test (cd blat/test; make) will fail - so we are using -O1 instead

[Andreas Tille]

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

tille pushed a commit to branch master
in repository blat.

commit 7aa0a6367d07fd45f244d785554bd36b519c23c6
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 26 13:22:40 2014 +0100

    Several small enhancements and polishing; main change: When using -O2 optimisation the BLAT test (cd blat/test; make) will fail - so we are using -O1 instead
---
 debian/clean   |  7 +++++++
 debian/control |  2 +-
 debian/rules   | 12 +++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/clean b/debian/clean
index ad18507..49ca4c2 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,11 @@
+blat/test/badSplice/small2.log
+blat/test/badSplice/small2.psl
+blat/test/badSplice/smallBest2.psl
 blat/test/intron50k/out/*
 blat/test/throwback/test.psl
 blat/test/v29skips/ex1.psl
+blat/test/v29skips/ex2.psl
+gfServer/tests/testPcr.out
+gfServer/tests/testProtNib.out
 webBlat/webBlat
+blat/test/pslCheck
diff --git a/debian/control b/debian/control
index 8dbc63a..a976254 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Homepage: http://genome.ucsc.edu/cgi-bin/hgBlat
 Package: blat
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The BLAST-Like Alignment Tool
+Description: BLAST-Like Alignment Tool
  BLAT on DNA is designed to quickly find sequences of 95% and greater
  similarity of length 25 bases or more. It may miss more divergent or shorter
  sequence alignments. It will find perfect sequence matches of 25 bases, and
diff --git a/debian/rules b/debian/rules
index 9a7e095..21e83f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,7 @@
 
 DH_VERBOSE := 1
 
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
 DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
 
 # alternatively to manually set those variables you can
 #  include /usr/share/cdbs/1/rules/buildvars.mk
@@ -19,6 +12,9 @@ DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 MACHTYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DESTDIR  := $(CURDIR)/debian/$(DEBPKGNAME)/usr/
 
+# When using -O2 optimisation the BLAT test (cd blat/test; make) will fail
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS | sed 's/-O2/-O1/')
+
 %:
 	dh $@
 
@@ -30,5 +26,3 @@ override_dh_auto_install:
 	dh_auto_build -- MACHTYPE="$(MACHTYPE)" DESTDIR="$(DESTDIR)" BINDIR=bin/
 	# cd debian/pslCheck; make MACHTYPE="$(MACHTYPE)" DESTDIR="$(DESTDIR)" BINDIR=bin/
 
-#get-orig-source:
-#	. debian/get-orig-source

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