Control: tags 984268 + patch Control: tags 984268 + pending Dear maintainer,
I've prepared an NMU for ogmtools (versioned as 1:1.5-4.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru ogmtools-1.5/debian/changelog ogmtools-1.5/debian/changelog --- ogmtools-1.5/debian/changelog 2016-09-01 15:34:32.000000000 +0300 +++ ogmtools-1.5/debian/changelog 2021-11-09 11:16:08.000000000 +0200 @@ -1,3 +1,12 @@ +ogmtools (1:1.5-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Don't ignore provided CFLAGS/CXXFLAGS. + * Build with -std=gnu++14 to workaround FTBFS with gcc 11. + (Closes: #984268) + + -- Adrian Bunk <[email protected]> Tue, 09 Nov 2021 11:16:08 +0200 + ogmtools (1:1.5-4) unstable; urgency=medium * debian: add source format to quilt diff -Nru ogmtools-1.5/debian/patches/0006-pass-CFLAGS.patch ogmtools-1.5/debian/patches/0006-pass-CFLAGS.patch --- ogmtools-1.5/debian/patches/0006-pass-CFLAGS.patch 1970-01-01 02:00:00.000000000 +0200 +++ ogmtools-1.5/debian/patches/0006-pass-CFLAGS.patch 2021-11-09 11:15:57.000000000 +0200 @@ -0,0 +1,15 @@ +Description: Don't ignore provided CFLAGS/CXXFLAGS +Author: Adrian Bunk <[email protected]> + +--- ogmtools-1.5.orig/configure.in ++++ ogmtools-1.5/configure.in +@@ -31,7 +31,7 @@ fi + dnl Check for headers + AC_HEADER_STDC() + +-CFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" +-CXXFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" ++CFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS $CFLAGS" ++CXXFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS $CXXFLAGS" + + AC_OUTPUT(Makefile avilib/Makefile) diff -Nru ogmtools-1.5/debian/patches/series ogmtools-1.5/debian/patches/series --- ogmtools-1.5/debian/patches/series 2016-09-01 15:00:20.000000000 +0300 +++ ogmtools-1.5/debian/patches/series 2021-11-09 11:15:18.000000000 +0200 @@ -3,3 +3,4 @@ 0003-ogmmerge-spell-correct.patch 0004-ogminfo-timestamp-correction.patch 0005-ogminfo-increase-verbosity.patch +0006-pass-CFLAGS.patch diff -Nru ogmtools-1.5/debian/rules ogmtools-1.5/debian/rules --- ogmtools-1.5/debian/rules 2016-09-01 15:02:42.000000000 +0300 +++ ogmtools-1.5/debian/rules 2021-11-09 11:16:04.000000000 +0200 @@ -5,5 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_CXXFLAGS_MAINT_APPEND += -std=gnu++14 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk
