[med-svn] [Git][med-team/poa][master] 2 commits: Merge changes

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / poa


Commits:
865cc6b9 by Andreas Tille at 2018-05-02T16:15:06+02:00
Merge changes

- - - - -
e203aa3c by Andreas Tille at 2018-05-02T16:17:59+02:00
Merge hardening patch

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/hardening.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-poa (2.0+20060928-6) UNRELEASED; urgency=medium
+poa (2.0+20060928-7) UNRELEASED; urgency=medium
 
   * Team upload.
 
@@ -6,6 +6,19 @@ poa (2.0+20060928-6) UNRELEASED; urgency=medium
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 21 Jul 2017 12:16:26 +0200
 
+poa (2.0+20060928-6) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #864558)
+    + Let dh_auto_build pass cross compilers.
+    + Honour DEB_BUILD_OPTIONS=nocheck.
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.1.0
+  * Fix propagation of hardening options
+
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Sep 2017 09:50:18 +0200
+
 poa (2.0+20060928-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Charles Plessy <plessy at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10)
-Standards-Version: 4.0.0
+Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/poa.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/poa.git
 Homepage: http://poamsa.sourceforge.net/


=====================================
debian/patches/hardening.patch
=====================================
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,10 +1,19 @@
 Description: propagate hardening options
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 11 Jan 2016 12:48:42 +0100
+Last-Update: Thu, 14 Sep 2017 09:50:18 +0200
 
 
 --- a/Makefile
 +++ b/Makefile
+@@ -28,7 +28,7 @@ LIBOBJECTS= \
+ 
+ CC = gcc
+ #CFLAGS= -g -ansi-strict -W -Wall -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
+-CFLAGS= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
++CFLAGS+= -g -DUSE_WEIGHTED_LINKS -DUSE_PROJECT_HEADER -I.
+ # -I$(HOME)/lib/include
+ # -DREPORT_MAX_ALLOC
+ 
 @@ -44,7 +44,7 @@ liblpo.a: $(LIBOBJECTS)
  
  # NB: LIBRARY MUST FOLLOW OBJECTS OR LINK FAILS WITH UNRESOLVED REFERENCES!!


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,9 @@ $(DEB_SOURCE).1: debian/$(DEB_SOURCE).1.xml
 	$(XP) $(DB2MAN) $<
 
 override_dh_auto_build:
-	$(MAKE) poa
+	dh_auto_build -- poa
 
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
 	tmpfile=`mktemp` ; \
 	./$(DEB_SOURCE) -read_fasta multidom.seq -clustal $$tmpfile -v blosum80.mat ; \
@@ -29,3 +30,4 @@ override_dh_auto_test:
 	    echo "File $$tmpfile is different from $(CURDIR)/multidom.clustal" ; \
 	    exit 1 ; \
 	fi
+endif



View it on GitLab: https://salsa.debian.org/med-team/poa/compare/bdaf26af3a728a4e3bfb9d2e6fc560a931d651b6...e203aa3c633d31c8448b1a343b606cd446e6ad9d

---
View it on GitLab: https://salsa.debian.org/med-team/poa/compare/bdaf26af3a728a4e3bfb9d2e6fc560a931d651b6...e203aa3c633d31c8448b1a343b606cd446e6ad9d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180502/8b874beb/attachment-0001.html>