From 2b8ecea6be77e26ad52a47db602767a62ef80409 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sun, 29 May 2011 15:42:19 +0000 Subject: [PATCH] Formal cosmetic cleanups. * debian/control: Drop leading "The" from ncbi-blast+'s short description; use appropriate amounts of whitespace throughout. * debian/patches: Rename lecagy_rename_rpsblast (sic) to legacy_* and fix_gcc46_include_error to fix_gcc46_errors; update series accordingly. * debian/rules: retire long-winded $(SOURCEDIR) and simply pass -Dc++ to dh; drop boilerplate "Sample debian/rules" comment and an extra blank line. --- debian/control | 5 ++--- .../{fix_gcc46_include_error => fix_gcc46_errors} | 0 .../{lecagy_rename_rpsblast => legacy_rename_rpsblast} | 0 debian/patches/series | 4 ++-- debian/rules | 9 +-------- 5 files changed, 5 insertions(+), 13 deletions(-) rename debian/patches/{fix_gcc46_include_error => fix_gcc46_errors} (100%) rename debian/patches/{lecagy_rename_rpsblast => legacy_rename_rpsblast} (100%) diff --git a/debian/control b/debian/control index 7dccdf5a..954fb1df 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,10 @@ Homepage: http://www.ncbi.nlm.nih.gov/IEB/ToolBox/CPP_DOC/ Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/ncbi-blast-plus/trunk/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ncbi-blast-plus/?rev=0 - Package: ncbi-blast+ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}, ncbi-data -Description: The next generation suite of BLAST sequence search tools +Description: next generation suite of BLAST sequence search tools The Basic Local Alignment Search Tool (BLAST) is the most widely used sequence similarity tool. There are versions of BLAST that compare protein queries to protein databases, nucleotide queries @@ -30,7 +29,7 @@ Description: The next generation suite of BLAST sequence search tools Package: ncbi-blast+-legacy Architecture: all -Depends: ncbi-blast+,${misc:Depends} +Depends: ncbi-blast+, ${misc:Depends} Description: NCBI Blast legacy call script This package adds some fake scripts to call NCBI+ programs with the NCBI blast command line. It makes use of the diff --git a/debian/patches/fix_gcc46_include_error b/debian/patches/fix_gcc46_errors similarity index 100% rename from debian/patches/fix_gcc46_include_error rename to debian/patches/fix_gcc46_errors diff --git a/debian/patches/lecagy_rename_rpsblast b/debian/patches/legacy_rename_rpsblast similarity index 100% rename from debian/patches/lecagy_rename_rpsblast rename to debian/patches/legacy_rename_rpsblast diff --git a/debian/patches/series b/debian/patches/series index d9fc96d2..81229f6f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -lecagy_rename_rpsblast +legacy_rename_rpsblast fix_checks -fix_gcc46_include_error +fix_gcc46_errors diff --git a/debian/rules b/debian/rules index d608415b..e1ba35bb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,9 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -SOURCEDIR=${CURDIR}/c++ DEB_CONFIGURE_EXTRA_FLAGS=--with-dll --with-mt --without-autodep \ --without-makefile-auto-update --with-flat-makefile --without-dbapi \ --without-lzo --with-runpath=/usr/lib/ncbi-blast+ --with-build-root=BUILD @@ -22,7 +16,6 @@ else DEB_CONFIGURE_EXTRA_FLAGS += --with-optimization endif - override_dh_auto_configure: cd c++ && LD_LIBRARY_PATH=$(CURDIR)/c++/BUILD/lib \ ./configure $(DEB_CONFIGURE_EXTRA_FLAGS) @@ -67,7 +60,7 @@ override_dh_clean: rm -f c++/src/objects/blastxml/blastxml.module %: - dh $@ --with autotools_dev --with quilt --sourcedir=$(SOURCEDIR) + dh $@ -Dc++ --with autotools_dev --with quilt get-orig-source: . debian/get-orig-source -- 2.30.2