diff -Nru geographiclib-1.49/debian/changelog geographiclib-1.49/debian/changelog --- geographiclib-1.49/debian/changelog 2017-10-07 08:27:17.000000000 +0000 +++ geographiclib-1.49/debian/changelog 2017-12-26 18:39:16.000000000 +0000 @@ -1,3 +1,14 @@ +geographiclib (1.49-2) unstable; urgency=medium + + * Add patch by Chris Lamb to make the build reproducible. + (closes: #878708) + * Strip trailing whitespace from changelog & control files. + * Drop obsolete dbg package. + * Mark libgeographic17 as Multi-Arch: same. + * Bump Standards-Version to 4.1.2, no changes. + + -- Bas Couwenberg Tue, 26 Dec 2017 19:39:16 +0100 + geographiclib (1.49-1) unstable; urgency=medium * Update symbols for other architectures. @@ -318,14 +329,14 @@ * Fixed README.Debian to document use of the new download scripts by Charles K. instead of my previous scripts. - * Patch datadir updated to use the correct data path in geographic-get-* + * Patch datadir updated to use the correct data path in geographic-get-* scripts. -- Francesco Paolo Lovergine Sun, 16 Mar 2014 20:29:01 +0100 geographiclib (1.35-1) unstable; urgency=low - * Sigh, license changed since 1.12 but it has never been annotated in + * Sigh, license changed since 1.12 but it has never been annotated in debian/copyright. Now changed to modern DEP5 format and all authors and contributors also annotated. (closes: #741599) * New upstream release with minor changes. @@ -389,7 +400,7 @@ geographiclib (1.1-2) unstable; urgency=low - * Added longdouble patch: fixed problems with unsupported long double + * Added longdouble patch: fixed problems with unsupported long double on some archs. Thanks Nobuhiro Iwamatsu. (closes: #573930) * Added doxygen as build-dep. diff -Nru geographiclib-1.49/debian/control geographiclib-1.49/debian/control --- geographiclib-1.49/debian/control 2017-10-05 12:17:21.000000000 +0000 +++ geographiclib-1.49/debian/control 2017-12-26 18:39:16.000000000 +0000 @@ -6,7 +6,7 @@ Section: science Priority: optional Build-Depends: autoconf-archive, - debhelper (>= 9), + debhelper (>= 9.20160114), dh-autoreconf, dh-python, doxygen, @@ -15,7 +15,7 @@ python3-all, python3-setuptools, pkg-kde-tools -Standards-Version: 4.1.1 +Standards-Version: 4.1.2 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/geographiclib.git Vcs-Git: https://anonscm.debian.org/git/pkg-grass/geographiclib.git Homepage: https://geographiclib.sourceforge.io/ @@ -55,6 +55,7 @@ Package: libgeographic17 Architecture: any +Multi-Arch: same Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, @@ -70,24 +71,9 @@ for geoid calculations, and for computing geodesic. It is a suitable replacement for the core functionality provided by NGA Geotrans. . - This package contains the GeographicLib shared library used at run-time + This package contains the GeographicLib shared library used at run-time by applications. -Package: libgeographic-dbg -Architecture: any -Section: debug -Depends: libgeographic17 (= ${binary:Version}), - ${misc:Depends} -Breaks: libgeographic14-dbg (<< 1.46) -Replaces: libgeographic14-dbg (<< 1.46) -Description: C++ library to solve some geodesic problems -- debugging symbols - GeographicLib is a small set of C++ classes for converting between - geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, - for geoid calculations, and for computing geodesic. It is a suitable - replacement for the core functionality provided by NGA Geotrans. - . - This package contains debugging symbols for the GeographicLib shared library. - Package: libgeographic-dev Architecture: any Section: libdevel diff -Nru geographiclib-1.49/debian/patches/reproducible-build.patch geographiclib-1.49/debian/patches/reproducible-build.patch --- geographiclib-1.49/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ geographiclib-1.49/debian/patches/reproducible-build.patch 2017-10-16 12:21:10.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2017-10-15 +Bug-Debian: https://bugs.debian.org/878708 + +--- a/doc/doxyfile.in ++++ b/doc/doxyfile.in +@@ -1544,7 +1544,7 @@ TAGFILES = + # When a file name is specified after GENERATE_TAGFILE, doxygen will create + # a tag file that is based on the input files it reads. + +-GENERATE_TAGFILE = html/GeographicLib.tag ++GENERATE_TAGFILE = + + # If the ALLEXTERNALS tag is set to YES all external classes will be listed + # in the class index. If set to NO only the inherited external classes diff -Nru geographiclib-1.49/debian/patches/series geographiclib-1.49/debian/patches/series --- geographiclib-1.49/debian/patches/series 2017-02-16 06:24:08.000000000 +0000 +++ geographiclib-1.49/debian/patches/series 2017-10-16 12:20:10.000000000 +0000 @@ -1,3 +1,4 @@ css.patch privacy.patch disable-python-build.patch +reproducible-build.patch diff -Nru geographiclib-1.49/debian/rules geographiclib-1.49/debian/rules --- geographiclib-1.49/debian/rules 2017-09-27 12:50:28.000000000 +0000 +++ geographiclib-1.49/debian/rules 2017-12-26 18:37:14.000000000 +0000 @@ -67,5 +67,5 @@ dh_makeshlibs -- -v$(UPSTREAM_VERSION) -c0 override_dh_strip: - dh_strip --dbg-package=libgeographic-dbg + dh_strip --dbgsym-migration='libgeographic-dbg (<< 1.49-2~)'