diff -Nru matanza-0.13+ds1/debian/changelog matanza-0.13+ds2/debian/changelog --- matanza-0.13+ds1/debian/changelog 2018-02-08 14:52:15.000000000 +0000 +++ matanza-0.13+ds2/debian/changelog 2019-08-27 21:09:15.000000000 +0000 @@ -1,3 +1,20 @@ +matanza (0.13+ds2-1) unstable; urgency=medium + + * Team upload. + * Repack tarball with sources for deleting of extra debian/ directory. + * Bump Standards-Version to 4.4.0 (was 4.1.3). + * Fix cross build from sources. (Closes: #929441) + [Thanks to Helmut Grohne] + * Cosmetic changes in debian/rules. + * Cosmetic changes in debian/copyright. + * Delete debian/source/options: fixes lintian warnings: + debian-source-options-has-custom-compression-settings. + * Add Files-Excluded and Comment fields to debian/copyright: + fixes lintian notes: missing-explanation-for-repacked-upstream-tarball. + * Fix lintian notes: file-contains-trailing-whitespace. + + -- Boris Pek Wed, 28 Aug 2019 00:09:15 +0300 + matanza (0.13+ds1-6) unstable; urgency=medium * Team upload. @@ -152,4 +169,3 @@ - Added small man page -- Polkan Alexis Garcia Rodriguez Mon, 28 Jun 2004 16:23:55 -0500 - diff -Nru matanza-0.13+ds1/debian/control matanza-0.13+ds2/debian/control --- matanza-0.13+ds1/debian/control 2018-02-08 14:52:15.000000000 +0000 +++ matanza-0.13+ds2/debian/control 2019-08-27 21:09:14.000000000 +0000 @@ -7,7 +7,7 @@ debhelper (>= 9), libpng-dev, texlive-extra-utils -Standards-Version: 4.1.3 +Standards-Version: 4.4.0 Homepage: https://web.archive.org/web/20071226080243/http://bachue.com/matanza/ Vcs-Git: https://salsa.debian.org/games-team/matanza.git Vcs-Browser: https://salsa.debian.org/games-team/matanza diff -Nru matanza-0.13+ds1/debian/copyright matanza-0.13+ds2/debian/copyright --- matanza-0.13+ds1/debian/copyright 2018-02-08 14:52:15.000000000 +0000 +++ matanza-0.13+ds2/debian/copyright 2019-08-27 21:09:14.000000000 +0000 @@ -2,27 +2,22 @@ Upstream-Name: matanza Upstream-Contact: Alejandro Forero Cuervo Source: https://web.archive.org/web/20071226080243/http://bachue.com/matanza/ +Files-Excluded: ai.c matanza.c +Comment: delete automatically generated files to ensure that everything is + built from sources. Files: * -Copyright: 1999, 2000 Alejandro Forero Cuervo +Copyright: 1999-2000 Alejandro Forero Cuervo License: GPL-2+ Files: ascii.h asciitab.h iasciitab.h latin1tab.h utf8tab.h xmldef.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h -Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd +Copyright: 1998-2000 Thai Open Source Software Center Ltd License: GPL-2+ -Files: getopt1.c -Copyright: 1987,88,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. -License: GPL-2+ - -Files: getopt.c -Copyright: 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. -License: GPL-2+ - -Files: getopt.h -Copyright: 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. +Files: getopt1.c getopt.* +Copyright: 1987-1998 Free Software Foundation, Inc. License: GPL-2+ Files: debian/* @@ -35,7 +30,7 @@ 2010, 2011 Peter Pentchev 2012 Bart Martens 2012 Nobuhiro Iwamatsu - 2012, 2018 Boris Pek + 2012, 2018, 2019 Boris Pek 2013 Markus Koschany License: GPL-2+ diff -Nru matanza-0.13+ds1/debian/rules matanza-0.13+ds2/debian/rules --- matanza-0.13+ds1/debian/rules 2018-02-08 14:52:15.000000000 +0000 +++ matanza-0.13+ds2/debian/rules 2019-08-27 21:09:14.000000000 +0000 @@ -1,14 +1,16 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +-include /usr/share/dpkg/buildtools.mk -CFLAGS:= $(shell dpkg-buildflags --get CFLAGS) -CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS:= $(shell dpkg-buildflags --get LDFLAGS) +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CFLAGS += -Wall -export CFLAGS CPPFLAGS LDFLAGS +export CC CFLAGS CPPFLAGS LDFLAGS + +%: + dh $@ # Note: this could be simplified even further using --with autotools_dev, # but it would require another repacking to bring back config.{guess,sub} :) @@ -20,6 +22,3 @@ override_dh_auto_build: dh_auto_build -- CFLAGS="$(CFLAGS)" - -%: - dh $@ diff -Nru matanza-0.13+ds1/debian/source/options matanza-0.13+ds2/debian/source/options --- matanza-0.13+ds1/debian/source/options 2018-02-08 14:52:15.000000000 +0000 +++ matanza-0.13+ds2/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -compression = "bzip2" -compression-level = 9