add headers to patches, prepare for upload

diff --git a/debian/control b/debian/control
index 398569889bfbad240c0b713672b0910bf0b4d2d1..47a43065c12b52e1f12fb474de441c7c6d9356ce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,12 @@ Source: ncbi-blast+
 Section: science
 Priority: optional
 Build-Depends: autotools-dev (>= 20100122),
-               debhelper (>= 7.0.50~),
+               debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                libboost-test-dev,
                libbz2-dev,
                libc0.3-dev (>= 2.13-9~) [hurd-i386],
                libpcre3-dev,
-               quilt (>= 0.46-7~),
                time,
                zlib1g-dev
 Standards-Version: 3.9.3

diff --git a/debian/patches/enable_clean_after_failed_compile b/debian/patches/enable_clean_after_failed_compile
index bcc1bfac63f912ba0285ea58b6f94784b125ed7f..27a2cd0fe296cbc9afa64710d158e77148c01108 100644 (file)
--- a/debian/patches/enable_clean_after_failed_compile
+++ b/debian/patches/enable_clean_after_failed_compile
@@ -1,3 +1,8 @@
+Subject: clean after failure
+Description: Enable clean
+Author: Tim Booth
+Last-Updated: 2013-06-01
+Forwarded: no
 --- a/c++/src/build-system/new_module.sh.in
 +++ b/c++/src/build-system/new_module.sh.in
 @@ -178,7 +178,7 @@

diff --git a/debian/patches/skip_services_unit_test b/debian/patches/skip_services_unit_test
index 2d5249b16f4a5656bbae2432f2f9b6e0c72a6273..d23a16438b540c5728e13252e74c384e53407799 100644 (file)
--- a/debian/patches/skip_services_unit_test
+++ b/debian/patches/skip_services_unit_test
@@ -1,3 +1,8 @@
+Subject: remove network required test
+Author: Tim Booth
+Forwarded: no
+Description: test require internet connection
+Last-Updated: 2013-06-01
 --- a/c++/src/objtools/blast/services/unit_test/Makefile.blast_services_unit_test.app
 +++ b/c++/src/objtools/blast/services/unit_test/Makefile.blast_services_unit_test.app
 @@ -11,6 +11,7 @@

diff --git a/debian/rules b/debian/rules
index 99f222210176547229863dc169d874a397c3e52d..76998faadd28d848248daccfbf78566934fde4c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
 DEB_CONFIGURE_EXTRA_FLAGS=--with-dll --with-mt --without-autodep \
     --without-makefile-auto-update --with-flat-makefile --without-caution \
     --without-dbapi --without-lzo --with-runpath=/usr/lib/ncbi-blast+ \
@@ -14,7 +15,10 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 DEB_CONFIGURE_EXTRA_FLAGS += --with-symbols
 endif
 
+#export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+export DEB_CFLAGS_MAINT_APPEND=-Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -30,6 +34,7 @@ endif
 
 export CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MAKE
 
+
 llp=LD_LIBRARY_PATH
 override_dh_auto_configure:
        cd c++  &&  $(llp)=$(CURDIR)/c++/BUILD/lib$${$(llp)+:$$$(llp)} \