Package: blahtexml Version: 0.9-1.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for blahtexml (versioned as 0.9-1.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru blahtexml-0.9/debian/changelog blahtexml-0.9/debian/changelog --- blahtexml-0.9/debian/changelog 2012-04-20 12:59:48.000000000 +0200 +++ blahtexml-0.9/debian/changelog 2025-03-14 13:58:43.000000000 +0100 @@ -1,3 +1,15 @@ +blahtexml (0.9-1.2) unstable; urgency=medium + + [ Emanuele Rocca ] + * Non-maintainer upload. + * Do not override CFLAGS, use CXXFLAGS for cpp. Also set debhelper + compatibility to 13. (Closes: #1100494) + + [ Helmut Grohne ] + * Fix FTCBFS: Let dh_auto_build pass cross tools to make (Closes: #940078) + + -- Emanuele Rocca <e...@debian.org> Fri, 14 Mar 2025 13:58:43 +0100 + blahtexml (0.9-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru blahtexml-0.9/debian/compat blahtexml-0.9/debian/compat --- blahtexml-0.9/debian/compat 2012-04-20 12:59:48.000000000 +0200 +++ blahtexml-0.9/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -7 diff -Nru blahtexml-0.9/debian/control blahtexml-0.9/debian/control --- blahtexml-0.9/debian/control 2012-04-20 12:59:48.000000000 +0200 +++ blahtexml-0.9/debian/control 2025-03-14 13:58:43.000000000 +0100 @@ -2,7 +2,7 @@ Section: text Priority: extra Maintainer: Abhishek Dasgupta <abh...@gmail.com> -Build-Depends: debhelper (>= 7.0.50), libxerces-c-dev +Build-Depends: debhelper-compat (= 13), libxerces-c-dev Standards-Version: 3.9.2 Homepage: http://gva.noekeon.org/blahtexml/ Vcs-Git: git://github.com/abhidg/pkg-blahtexml.git diff -Nru blahtexml-0.9/debian/patches/do-not-override-cflags-use-cxxflags-for-.patch blahtexml-0.9/debian/patches/do-not-override-cflags-use-cxxflags-for-.patch --- blahtexml-0.9/debian/patches/do-not-override-cflags-use-cxxflags-for-.patch 1970-01-01 01:00:00.000000000 +0100 +++ blahtexml-0.9/debian/patches/do-not-override-cflags-use-cxxflags-for-.patch 2025-03-14 13:58:43.000000000 +0100 @@ -0,0 +1,52 @@ +From: Emanuele Rocca <e...@debian.org> +Date: Fri, 14 Mar 2025 13:58:22 +0100 +X-Dgit-Generated: 0.9-1.2 082fe457fc7fe0af5b727fa72a6b90fdf350a7f5 +Subject: Do not override CFLAGS, use CXXFLAGS for cpp + + +--- + +diff --git a/makefile b/makefile +index 32490ff..e1c61f0 100644 +--- a/makefile ++++ b/makefile +@@ -93,20 +93,18 @@ $(BINDIR)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTransl + + $(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc + +-CFLAGS = -O2 +- + VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin + + INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin + + $(BINDIR)/%.o:%.cpp +- $(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@ ++ $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@ + + $(BINDIR)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.cpp +- $(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ ++ $(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ +@@ -115,13 +113,13 @@ blahtex-linux: $(BINDIR) $(OBJECTS) $(HEADERS) + $(CXX) $(CFLAGS) -o blahtex $(OBJECTS) + + blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) +- $(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS) ++ $(CXX) $(CXXFLAGS) -o blahtex -liconv $(OBJECTS) + + blahtexml-linux: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) +- $(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c ++ $(CXX) $(CXXFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c + + blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) +- $(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c ++ $(CXX) $(CXXFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c + + clean: + rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN) diff -Nru blahtexml-0.9/debian/patches/series blahtexml-0.9/debian/patches/series --- blahtexml-0.9/debian/patches/series 2012-04-20 12:59:48.000000000 +0200 +++ blahtexml-0.9/debian/patches/series 2025-03-14 13:58:43.000000000 +0100 @@ -1 +1,2 @@ fix-ftbfs-with-gcc-4.7 +do-not-override-cflags-use-cxxflags-for-.patch diff -Nru blahtexml-0.9/debian/rules blahtexml-0.9/debian/rules --- blahtexml-0.9/debian/rules 2012-04-20 12:59:48.000000000 +0200 +++ blahtexml-0.9/debian/rules 2025-03-14 13:58:43.000000000 +0100 @@ -4,7 +4,7 @@ dh $@ override_dh_auto_build: - make blahtexml-linux + dh_auto_build -- blahtexml-linux override_dh_install: install -D -m755 blahtexml $(CURDIR)/debian/blahtexml/usr/bin/blahtexml
