diff -Nru geneweb-6.08+git20181019+dfsg/debian/changelog geneweb-6.08+git20181019+dfsg/debian/changelog --- geneweb-6.08+git20181019+dfsg/debian/changelog 2018-12-27 17:25:00.000000000 +0000 +++ geneweb-6.08+git20181019+dfsg/debian/changelog 2018-12-28 20:01:00.000000000 +0000 @@ -1,3 +1,13 @@ +geneweb (6.08+git20181019+dfsg-2) unstable; urgency=medium + + * Fix a regression in the previous release in 0007-compile-gui.patch + to avoid build failures for some architectures + * Add a comment in debian/rules to remember how to test with WAY=out + * Remove Christian Perrier from Uploaders + * Lintian override for geneweb-connex (like other binaries) + + -- Guillaume Brochu Fri, 28 Dec 2018 15:01:00 -0500 + geneweb (6.08+git20181019+dfsg-1) unstable; urgency=medium * New upstream release: diff -Nru geneweb-6.08+git20181019+dfsg/debian/control geneweb-6.08+git20181019+dfsg/debian/control --- geneweb-6.08+git20181019+dfsg/debian/control 2018-12-27 17:25:00.000000000 +0000 +++ geneweb-6.08+git20181019+dfsg/debian/control 2018-12-28 20:01:00.000000000 +0000 @@ -2,7 +2,6 @@ Section: misc Priority: optional Maintainer: Guillaume Brochu -Uploaders: Christian Perrier Standards-Version: 4.3.0 Build-Depends: debhelper-compat (= 11), ocaml-nox (>= 4.02), camlp5, doc-base, dh-buildinfo, iso-codes, isoquery, po-debconf, liblablgtk2-ocaml-dev, ocaml-findlib Homepage: https://geneweb.org diff -Nru geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides --- geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides 2018-12-24 08:41:04.000000000 +0000 +++ geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides 2018-12-28 20:01:00.000000000 +0000 @@ -9,3 +9,4 @@ geneweb: hardening-no-fortify-functions usr/bin/gwd geneweb: hardening-no-fortify-functions usr/bin/gwu geneweb: hardening-no-fortify-functions usr/bin/update_nldb +geneweb: hardening-no-fortify-functions usr/bin/geneweb-connex diff -Nru geneweb-6.08+git20181019+dfsg/debian/patches/0007-compile-gui.patch geneweb-6.08+git20181019+dfsg/debian/patches/0007-compile-gui.patch --- geneweb-6.08+git20181019+dfsg/debian/patches/0007-compile-gui.patch 2018-12-24 08:41:04.000000000 +0000 +++ geneweb-6.08+git20181019+dfsg/debian/patches/0007-compile-gui.patch 2018-12-28 20:01:00.000000000 +0000 @@ -1,12 +1,12 @@ From: Guillaume Brochu -Date: Sat, 10 Nov 2018 21:15:18 -0500 +Date: Fri, 28 Dec 2018 14:55:18 -0500 Subject: compile-gui compile gui and tweak makefile accordingly --- Makefile | 6 ++++++ - gui/Makefile | 13 ++++--------- - 2 files changed, 10 insertions(+), 9 deletions(-) + gui/Makefile | 15 +++++---------- + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 54ac39a..29ccbed 100644 @@ -51,10 +51,10 @@ cd gwtp; $(MAKE) depend + cd gui; $(MAKE) depend diff --git a/gui/Makefile b/gui/Makefile -index eda1316..af383a3 100644 +index eda1316..3f106c6 100644 --- a/gui/Makefile +++ b/gui/Makefile -@@ -2,14 +2,10 @@ +@@ -2,16 +2,12 @@ # Copyright (c) 2006-2007 INRIA include ../tools/Makefile.inc @@ -68,8 +68,11 @@ OCAMLI=-I ../src -I $(LABLGTK2) -TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; } - all:: opt +-all:: opt ++all:: out + out:: gui.out + $(RM) gui @@ -20,6 +16,7 @@ out:: gui.out opt:: gui.opt $(RM) gui diff -Nru geneweb-6.08+git20181019+dfsg/debian/rules geneweb-6.08+git20181019+dfsg/debian/rules --- geneweb-6.08+git20181019+dfsg/debian/rules 2018-12-24 08:54:15.000000000 +0000 +++ geneweb-6.08+git20181019+dfsg/debian/rules 2018-12-28 20:01:00.000000000 +0000 @@ -8,12 +8,14 @@ else echo "out"; \ fi) +# Maintainer test : uncomment the next line to test WAY=out +#WAY=out + ifeq ($(WAY),out) override_dh_strip: # Don't strip ocaml bytecode executables endif - override_dh_installdeb: # Use of the dh-buildinfo package: see http://people.debian.org/~dirson/buildinfo/ dh_buildinfo