Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Merge changes
· 865cc6b9
Andreas Tille
authored
May 02, 2018
865cc6b9
Merge hardening patch
· e203aa3c
Andreas Tille
authored
May 02, 2018
e203aa3c
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
e203aa3c
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@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@debian.org> Thu, 14 Sep 2017 09:50:18 +0200
poa (2.0+20060928-5) unstable; urgency=medium
* Team upload.
...
...
debian/control
View file @
e203aa3c
...
...
@@ -5,7 +5,7 @@ Uploaders: Charles Plessy <plessy@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
View file @
e203aa3c
Description: propagate hardening options
Author: Andreas Tille <tille@debian.org>
Last-Update:
Mon, 11 Jan 2016 12:48:42
+0
1
00
Last-Update:
Thu, 14 Sep 2017 09:50:18
+0
2
00
--- 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
View file @
e203aa3c
...
...
@@ -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