diff -Nru ent-1.2debian/debian/changelog ent-1.2debian/debian/changelog --- ent-1.2debian/debian/changelog 2018-04-03 12:21:50.000000000 +0000 +++ ent-1.2debian/debian/changelog 2018-12-12 18:00:00.000000000 +0000 @@ -1,8 +1,11 @@ -ent (1.2debian-1build1) bionic; urgency=high +ent (1.2debian-2) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + * debian/control: use dh11 + * debian/control: bump standard to 4.2.1 (no changes) + * debian/control: add salsa VCS URLs + * debian/rules: add hardening flags - -- Balint Reczey Tue, 03 Apr 2018 12:21:50 +0000 + -- Thorsten Alteholz Wed, 12 Dec 2018 19:00:00 +0100 ent (1.2debian-1) unstable; urgency=medium @@ -108,7 +111,7 @@ - Standard-versions to 3.6.1 * Debhelper compatibility level updated to 4. * Project homepage added in the long description. - + -- Emanuele Rocca Sun, 16 Nov 2003 17:30:41 +0100 ent (1.0-1) unstable; urgency=low diff -Nru ent-1.2debian/debian/compat ent-1.2debian/debian/compat --- ent-1.2debian/debian/compat 2012-06-05 09:15:49.000000000 +0000 +++ ent-1.2debian/debian/compat 2018-12-12 18:00:00.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru ent-1.2debian/debian/control ent-1.2debian/debian/control --- ent-1.2debian/debian/control 2018-04-03 12:21:50.000000000 +0000 +++ ent-1.2debian/debian/control 2018-12-12 18:00:00.000000000 +0000 @@ -1,11 +1,14 @@ Source: ent Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Thorsten Alteholz -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), asciidoc, docbook2x +Maintainer: Thorsten Alteholz +Standards-Version: 4.2.1 +Build-Depends: debhelper (>= 11) + ,asciidoc + ,docbook2x Homepage: http://www.fourmilab.ch/random/ +Vcs-Browser: https://salsa.debian.org/alteholz/ent +Vcs-Git: https://salsa.debian.org/alteholz/ent.git Package: ent Architecture: any diff -Nru ent-1.2debian/debian/patches/Makefile.patch ent-1.2debian/debian/patches/Makefile.patch --- ent-1.2debian/debian/patches/Makefile.patch 2015-06-13 18:07:55.000000000 +0000 +++ ent-1.2debian/debian/patches/Makefile.patch 2018-12-12 18:00:00.000000000 +0000 @@ -1,13 +1,18 @@ -Desription: docbook2x-man does not create output that lintian is delighted by +Description: docbook2x-man does not create output that lintian is delighted by Author: Thorsten Alteholz -Index: ent/Makefile +Index: ent-1.2debian/Makefile =================================================================== ---- ent.orig/Makefile 2015-06-13 17:31:27.342059056 +0200 -+++ ent/Makefile 2015-06-13 17:31:42.282022110 +0200 -@@ -5,8 +5,8 @@ - CFLAGS = -g -Wall +--- ent-1.2debian.orig/Makefile 2018-12-12 13:49:49.300294267 +0100 ++++ ent-1.2debian/Makefile 2018-12-12 13:50:05.736293774 +0100 +@@ -2,11 +2,12 @@ + # Unix make file for random test program + + CC = gcc +-CFLAGS = -g -Wall ++CFLAGS += -g -Wall #CFLAGS = -O ++LDFLAGS += -Wl,-z,now -ent: ent.o iso8859.o randtest.o chisq.o - $(CC) $(CFLAGS) ent.o iso8859.o randtest.o chisq.o -o ent -lm @@ -16,7 +21,7 @@ ent.c: iso8859.h randtest.h -@@ -31,3 +31,16 @@ +@@ -31,3 +32,16 @@ clean: rm -f *.o *.bak ent ent.zip diff -Nru ent-1.2debian/debian/patches/manpage.patch ent-1.2debian/debian/patches/manpage.patch --- ent-1.2debian/debian/patches/manpage.patch 2012-06-05 10:04:05.000000000 +0000 +++ ent-1.2debian/debian/patches/manpage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -Index: ent/ent.1 -=================================================================== ---- ent.orig/ent.1 2012-06-05 11:56:49.000000000 +0200 -+++ ent/ent.1 2012-06-05 12:04:03.000000000 +0200 -@@ -123,12 +123,12 @@ - [Knuth, pp. 64-65] for more details. - .SH OPTIONS - .TP ---b -+\-b - The input is treated as a stream of bits rather than of 8-bit - bytes. Statistics reported reflect the properties of the - bitstream. - .TP ---c -+\-c - Print a table of the number of occurrences of each possible - byte (or bit, if the \fI-b\fR option is also specified) value, and - the fraction of the overall file made up by that value. -@@ -136,18 +136,18 @@ - shown along with their decimal byte values. In non-terse output - mode, values with zero occurrences are not printed. - .TP ---f -+\-f - Fold upper case letters to lower case before computing - statistics. Folding is done based on the ISO-8859-1 (Latin-1) - character set, with accented letters correctly processed. - .TP ---t -+\-t - Terse mode: output is written in Comma Separated Value (CSV) - format, suitable for loading into a spreadsheet and easily read - by any programming language. See Terse Mode Output Format - below for additional details. - .TP ---u -+\-u - Print how-to-call information. - .SH FILES - If no \fIfile\fR is specified, \fIent\fR obtains its input from standard input. -@@ -168,7 +168,7 @@ - .PP - where the italicised values in the type 1 record are the numerical - values for the quantities named in the type 0 column title record. If --the_ -b_ option is specified, the second field of the type 0 record will -+the_ \-b_ option is specified, the second field of the type 0 record will - be "File-bits", and the file_length field in type 1 record will be - given in bits instead of bytes. If the \fI-c\fR option is specified, - additional records are appended to the terse mode output which contain diff -Nru ent-1.2debian/debian/patches/randtest.patch ent-1.2debian/debian/patches/randtest.patch --- ent-1.2debian/debian/patches/randtest.patch 2015-06-13 18:07:55.000000000 +0000 +++ ent-1.2debian/debian/patches/randtest.patch 2018-12-12 18:00:00.000000000 +0000 @@ -1,5 +1,5 @@ -Desription: Remove private definition of log2() function - use the function provided by the C library library instead +Description: Remove private definition of log2() function + use the function provided by the C library instead Bug-Debian: http://bugs/debian.org/552835 Author: Jakub Wilk diff -Nru ent-1.2debian/debian/patches/totalcount.patch ent-1.2debian/debian/patches/totalcount.patch --- ent-1.2debian/debian/patches/totalcount.patch 2015-06-13 18:07:55.000000000 +0000 +++ ent-1.2debian/debian/patches/totalcount.patch 2018-12-12 18:00:00.000000000 +0000 @@ -1,4 +1,4 @@ -Desription: change type of count of bytes from 'long' to 'unsigned long long' +Description: change type of count of bytes from 'long' to 'unsigned long long' According to bug #692214 there is an overflow when trying to process 10000000000 (>2.147.483.647) bytes. The error occurs after about 30min. As there is a type 'unsigned long long' in C99 now, I use this type to diff -Nru ent-1.2debian/debian/rules ent-1.2debian/debian/rules --- ent-1.2debian/debian/rules 2015-06-13 18:09:03.000000000 +0000 +++ ent-1.2debian/debian/rules 2018-12-12 18:00:00.000000000 +0000 @@ -5,6 +5,7 @@ #export DH_VERBOSE=1 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) %: @@ -13,4 +14,3 @@ override_dh_clean: dh_clean rm -f ent.1 -