From 27268da0e27966131a285c82efae25d8b6df2997 Mon Sep 17 00:00:00 2001 From: tg Date: Sun, 16 Feb 2014 14:09:25 +0000 Subject: [PATCH] fix FTBFS; modernise --- debian/changelog | 9 +++++++++ debian/control | 7 ++++--- debian/upstream/signing-key.asc | 25 +++++++++++++++++++++++++ debian/watch | 4 ++-- 4 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 debian/upstream/signing-key.asc diff --git a/debian/changelog b/debian/changelog index 5c7893a..c966ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cvs (2:1.12.13+real-12) unstable; urgency=medium + + * Add texlive-fonts-recommended B-D (thanks Norbert Preining) + to fix FTBFS in sid (thanks Daniel Schepler) (Closes: #739138) + * Policy 3.9.5 (no changes AFAICT) + * Check distfile with upstream signing key (thanks lintian) + + -- Thorsten Glaser Sun, 16 Feb 2014 14:07:36 +0000 + cvs (2:1.12.13+real-11) unstable; urgency=medium * Add workaround for eglibc crypt(3) returning NULL diff --git a/debian/control b/debian/control index 92787bd..9940087 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.26 2013/07/18 21:52:57 tg Exp $ +# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.27 2014/02/16 14:09:25 tg Exp $ # Source: cvs Section: vcs @@ -8,8 +8,9 @@ Homepage: http://www.nongnu.org/cvs/ Build-Depends: debhelper (>= 5), autopoint, autotools-dev, bsdmainutils, dh-autoreconf, groff, libbsd-dev, libkrb5-dev | heimdal-dev, procps, texinfo, - texlive-latex-base, texlive-latex-recommended, zlib1g-dev -Standards-Version: 3.9.4 + texlive-latex-base, texlive-fonts-recommended, + texlive-latex-recommended, zlib1g-dev +Standards-Version: 3.9.5 # First word is the $CVSROOT (-d arg) string, second word the module. Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/cvs Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/cvs/ diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..eac4ab4 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,25 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBD4u3XQRBACN7F6Ducb4gaJw7LJPCaNbk4+eW/EWjiC+aoJhnNocWGfeKM2d +NYRDPuyW6IqAmMPGBq0HAdSmi64BQg5mC8Q7NGujfzVDefACELuwQRUxFadbcAXn +1eGUHGsst93FFwlhY+SH3Yuo1plvNBnlMhDt9ylT3/s38zKG874+A44L4wCg/7fh +u0zqxFA0w22lXobhkKO4upED/0zA5BJ+d8brNLe6RpIQXTUzPxZ+UoU5RG9wlzv/ +zabSS6eAPpmeoIPeKdSwRO/G0/f3Qn/vxDKVTqRzNKpusKJz8TS+gDBZSFjQ1L3U +TL6qh5kdnTy/yETg8wiUMXVaTqWtXP2eFEoHoto6dVP46BuULqQK980EmR6jg/ul +EGC/BACD5iO81tygsm6OBEu59hJ+GykU60+9Mzz1/qPYdejJmJkmdoJZWplJULGD +270nQlDarPJzMCpyrUzAZYdnmO6dwic/4hIxJENQ3GBrhbdr6YuuNgTxIXJJxTH7 +qTJqRrHLw9Cvk1oPFYlzE2vQuDNlrqxXg/V06l4/ZJfotj3mI7RNRGVyZWsgUi4g +UHJpY2UgKEdldCBDVlMgU3VwcG9ydCBhdCA8aHR0cDovL3hpbWJpb3QuY29tPiEp +IDxkZXJla0B4aW1iaW90LmNvbT6IYQQTEQIAGQUCPi7ddAQLBwMCAxUCAwMWAgEC +HgECF4AAEgkQLD1OTBfyMaQHZUdQRwABAVEoAJ9o9E9Ya1dKUi1xRepkcpWqzjjt +OgCgqSQSvoBA3NLu8/US2RAb+Xn1vAK5AQ0EPi7dehAEAJgUmO0vNtZJj4qUyyFd +lw9wH9jQVRwblKxItr/0eO28ta+JOXWH668/wcyJFbVCulanS/o1crbq1bq3662Q +EiHaZuB4hUJHCmkrfnxSvyw+w3tvk1ByiWw4uhsIiYCLpq6h/w9Yv0bSXOctGWFv +/dnZw1f/N1PLU955Ze7hofVrAAMGA/9dw6G1LznEO2zjfTYHZtEKSlAtvRGqyOQc +7htMOXagUpPAF/KGHnBETWVyuEfNNW1c/EQ3LQi+L23q9u0L+cAcWiR4SBCejEII +3bFE3hPLGxfa0LamJrq0kkSDoYm6OWB4WNPSGBCSZywwdLnLjqXiCU1+rT6qZcvN +JEKFAJUOA4hOBBgRAgAGBQI+Lt16ABIJECw9TkwX8jGkB2VHUEcAAQE9AACfTWlS +/WpC3LgkF8rcbbap9M8U/RkAoL2DhkJHX3uYYJzagVUiWJffkLnR +=hls5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 45ccede..26863b3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,5 @@ -# $MirOS: contrib/hosted/tg/deb/cvs/debian/watch,v 1.3 2012/04/20 20:04:42 tg Exp $ +# $MirOS: contrib/hosted/tg/deb/cvs/debian/watch,v 1.4 2014/02/16 14:09:25 tg Exp $ version=3 -opts="dversionmangle=s/^[0-9]+://;s/\+real$//" \ +opts="dversionmangle=s/^[0-9]+://;s/\+real$//,pgpsigurlmangle=s/$/.sig/" \ http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/ cvs-([0-9.]*)\.tar\.gz -- 2.1.4