diff -Nru cxref-1.6e/debian/changelog cxref-1.6e/debian/changelog --- cxref-1.6e/debian/changelog 2022-07-12 17:03:49.000000000 +0000 +++ cxref-1.6e/debian/changelog 2022-07-15 14:34:54.000000000 +0000 @@ -1,3 +1,16 @@ +cxref (1.6e-5) unstable; urgency=medium + + * Bug fix: "please make the build reproducible - non-reproducible + timestamp in build log", thanks to Philip Rinn (Closes: #1014877). + rm cxref.log from cxref-doc package. + * Bug fix: "please rebuild with dh_elpa 2.x", thanks to David Bremner + (Closes: #973966). Remove build-dep on dh-elpa for now. + * Bug fix: "cxref FTCBFS: uses AC_TRY_COMPILE", thanks to Helmut Grohne + (Closes: #962163). Apply AC_TRY_COMPILE patch + * tempfile -> mktemp in cxref-cpp-wrap + + -- Camm Maguire Fri, 15 Jul 2022 10:34:54 -0400 + cxref (1.6e-4) unstable; urgency=medium * Acknowledge NMU with modifications, thanks Philip Rinn diff -Nru cxref-1.6e/debian/control cxref-1.6e/debian/control --- cxref-1.6e/debian/control 2022-07-12 16:42:25.000000000 +0000 +++ cxref-1.6e/debian/control 2022-07-15 14:10:50.000000000 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Camm Maguire -Build-Depends: bison (>= 1:1.28-5), debhelper-compat (= 13), flex (>= 2.5.4a-6), linuxdoc-tools, texlive-base-bin, texlive-latex-recommended, debconf, po-debconf, dpkg-dev (>= 1.16.1~), dh-elpa +Build-Depends: bison (>= 1:1.28-5), debhelper-compat (= 13), flex (>= 2.5.4a-6), linuxdoc-tools, texlive-base-bin, texlive-latex-recommended, debconf, po-debconf, dpkg-dev (>= 1.16.1~) Standards-Version: 4.1.3 Homepage: https://www.gedanken.org.uk/software/cxref/ diff -Nru cxref-1.6e/debian/cxref-cpp.wrap cxref-1.6e/debian/cxref-cpp.wrap --- cxref-1.6e/debian/cxref-cpp.wrap 2010-06-07 20:43:39.000000000 +0000 +++ cxref-1.6e/debian/cxref-cpp.wrap 2022-07-15 14:26:50.000000000 +0000 @@ -3,7 +3,8 @@ set -e DEF=/etc/cxref/cxref-cpp.defines -TMP=`tempfile -p cxref -m 600` +#TMP=`tempfile -p cxref -m 600` +TMP=`mktemp cxref.XXXXXXXXXX` ( # LC_ALL=C diff -Nru cxref-1.6e/debian/patches/AC_TRY_COMPILE cxref-1.6e/debian/patches/AC_TRY_COMPILE --- cxref-1.6e/debian/patches/AC_TRY_COMPILE 1970-01-01 00:00:00.000000000 +0000 +++ cxref-1.6e/debian/patches/AC_TRY_COMPILE 2022-07-15 14:33:14.000000000 +0000 @@ -0,0 +1,52 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + cxref (1.6e-5) unstable; urgency=medium + . + * Bug fix: "please make the build reproducible - non-reproducible + timestamp in build log", thanks to Philip Rinn (Closes: #1014877). + * Bug fix: "please rebuild with dh_elpa 2.x", thanks to David Bremner + (Closes: #973966). Remove build-dep on dh-elpa for now. + * Bug fix: "cxref FTCBFS: uses AC_TRY_COMPILE", thanks to Helmut Grohne + (Closes: #962163). Apply AC_TRY_COMPILE patch + * tempfile -> mktemp in cxref-cpp-wrap +Author: Camm Maguire +Bug-Debian: https://bugs.debian.org/962163 +Bug-Debian: https://bugs.debian.org/973966 +Bug-Debian: https://bugs.debian.org/1014877 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2022-07-15 + +--- cxref-1.6e.orig/cpp/configure.in ++++ cxref-1.6e/cpp/configure.in +@@ -44,13 +44,13 @@ if test ! "x$GCC" = "x" ; then + + AC_MSG_CHECKING([if installed gcc is new enough to use instead of cxref-cpp]) + +- AC_TRY_RUN([ ++ AC_TRY_COMPILE([ + int main() + { + #if defined(__GNUC__) && ( ( __GNUC__==2 && __GNUC_MINOR__>=8 ) || __GNUC__>=3 ) + exit(0); + #else +- exit(1); ++ #error too old + #endif + } + ], diff -Nru cxref-1.6e/debian/patches/series cxref-1.6e/debian/patches/series --- cxref-1.6e/debian/patches/series 2018-01-30 16:50:37.000000000 +0000 +++ cxref-1.6e/debian/patches/series 2022-07-15 14:33:14.000000000 +0000 @@ -3,3 +3,4 @@ kr-crash-doc c_warning_cleanups_and_defines_for_Float128 # CPPFLAGS-hardening-patch +AC_TRY_COMPILE diff -Nru cxref-1.6e/debian/rules cxref-1.6e/debian/rules --- cxref-1.6e/debian/rules 2022-07-12 16:34:36.000000000 +0000 +++ cxref-1.6e/debian/rules 2022-07-15 14:06:56.000000000 +0000 @@ -69,6 +69,9 @@ $(MAKE) install DESTDIR=`pwd`/debian/tmp $(MAKE) docs DESTDIR=`pwd`/debian/tmp +# Remove log file (contains non-reproducible timestamp) + rm -f doc/example/cxref.log + # Remove build path from documentation find doc/ -type f -exec sed -i -e "s,$(CURDIR),BUILDPATH,g" '{}' \;