Control: tags 1065457 + patch Control: tags 1065457 + pending Dear maintainer,
I've prepared an NMU for openzwave (versioned as 1.6.1914+ds-1.2) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru openzwave-1.6.1914+ds/debian/changelog openzwave-1.6.1914+ds/debian/changelog --- openzwave-1.6.1914+ds/debian/changelog 2024-02-29 19:55:23.000000000 +0100 +++ openzwave-1.6.1914+ds/debian/changelog 2024-04-11 15:37:03.000000000 +0200 @@ -1,3 +1,15 @@ +openzwave (1.6.1914+ds-1.2) unstable; urgency=medium + + * Non-maintainer upload. (Closes: #1065457) + * Bump dpkg-dev versioned Build-Depends for t64 transition. + * Patch upstream Makefiles to show compiler invocations. + * Patch additional upstream Makefile to remove -Wno-format. + * Build-Depends: add pkgconf, necessary to place .pc file. + * Reduce CPPFLAGS updating, to avoid unknown ‘-Werror=implicit-function-declaration’ + in cc1plus aborting the build. + + -- Chris Hofstaedtler <z...@debian.org> Thu, 11 Apr 2024 15:37:03 +0200 + openzwave (1.6.1914+ds-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru openzwave-1.6.1914+ds/debian/control openzwave-1.6.1914+ds/debian/control --- openzwave-1.6.1914+ds/debian/control 2024-02-29 19:55:23.000000000 +0100 +++ openzwave-1.6.1914+ds/debian/control 2024-04-11 15:37:03.000000000 +0200 @@ -7,7 +7,8 @@ , dh-exec (>=0.2) , libudev-dev , libxml2-utils - , dpkg-dev (>= 1.20) + , dpkg-dev (>= 1.22.6) + , pkgconf Standards-Version: 4.6.0 Homepage: http://www.openzwave.net/ Vcs-Browser: https://salsa.debian.org/debian-iot-team/openzwave diff -Nru openzwave-1.6.1914+ds/debian/patches/makefile-no-silent.patch openzwave-1.6.1914+ds/debian/patches/makefile-no-silent.patch --- openzwave-1.6.1914+ds/debian/patches/makefile-no-silent.patch 1970-01-01 01:00:00.000000000 +0100 +++ openzwave-1.6.1914+ds/debian/patches/makefile-no-silent.patch 2024-04-11 15:37:03.000000000 +0200 @@ -0,0 +1,146 @@ +Index: openzwave-1.6.1914+ds/cpp/build/support.mk +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/build/support.mk ++++ openzwave-1.6.1914+ds/cpp/build/support.mk +@@ -184,24 +184,24 @@ endif + + $(OBJDIR)/%.o : %.cpp + @echo "Building $(<:$(top_builddir)/cpp/%=%)" +- @$(CXX) -MM $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d ++ $(CXX) -MM $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d + @mv -f $(DEPDIR)/$*.d $(DEPDIR)/$*.d.tmp + @$(SED) -e 's|.*:|$(OBJDIR)/$*.o: $(DEPDIR)/$*.d|' < $(DEPDIR)/$*.d.tmp > $(DEPDIR)/$*.d; + @$(SED) -e 's/.*://' -e 's/\\$$//' < $(DEPDIR)/$*.d.tmp | $(FMTCMD) | \ + $(SED) -e 's/^ *//' -e 's/$$/:/' >> $(DEPDIR)/.$*.d; + @rm -f $(DEPDIR)/$*.d.tmp +- @$(CXX) $(CFLAGS) $(CPPFLAGS) $(TARCH) $(INCLUDES) -o $@ $< ++ $(CXX) $(CFLAGS) $(CPPFLAGS) $(TARCH) $(INCLUDES) -o $@ $< + + + $(OBJDIR)/%.o : %.c + @echo "Building $(<:$(top_builddir)/cpp/src/%=%)" +- @$(CC) -MM $(CFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d ++ $(CC) -MM $(CFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d + @mv -f $(DEPDIR)/$*.d $(DEPDIR)/$*.d.tmp + @$(SED) -e 's|.*:|$(OBJDIR)/$*.o: $(DEPDIR)/$*.d|' < $(DEPDIR)/$*.d.tmp > $(DEPDIR)/$*.d; + @$(SED) -e 's/.*://' -e 's/\\$$//' < $(DEPDIR)/$*.d.tmp | $(FMTCMD) | \ + $(SED) -e 's/^ *//' -e 's/$$/:/' >> $(DEPDIR)/.$*.d; + @rm -f $(DEPDIR)/$*.d.tmp +- @$(CC) $(CFLAGS) $(TARCH) $(INCLUDES) -o $@ $< ++ $(CC) $(CFLAGS) $(TARCH) $(INCLUDES) -o $@ $< + + + dummy := $(shell test -d $(OBJDIR) || mkdir -p $(OBJDIR)) +Index: openzwave-1.6.1914+ds/cpp/build/Makefile +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/build/Makefile ++++ openzwave-1.6.1914+ds/cpp/build/Makefile +@@ -206,7 +206,7 @@ $(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst + $(patsubst %.cpp,$(OBJDIR)/%.o,$(indep)) \ + $(OBJDIR)/vers.o + @echo "Linking Shared Library" +- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) ++ $(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) + @ln -sf $(SHARED_LIB_NAME) $(LIBDIR)/$(SHARED_LIB_UNVERSIONED) + + $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in $(PKGCONFIG) +@@ -256,35 +256,35 @@ endif + + install: $(LIBDIR)/$(SHARED_LIB_NAME) doc $(top_builddir)/libopenzwave.pc $(top_builddir)/ozw_config + @echo "Installing Shared Library" +- @install -d $(DESTDIR)/$(instlibdir)/ +- @cp $(LIBDIR)/$(SHARED_LIB_NAME) $(DESTDIR)/$(instlibdir)/$(SHARED_LIB_NAME) +- @ln -sf $(SHARED_LIB_NAME) $(DESTDIR)/$(instlibdir)/$(SHARED_LIB_UNVERSIONED) ++ install -d $(DESTDIR)/$(instlibdir)/ ++ cp $(LIBDIR)/$(SHARED_LIB_NAME) $(DESTDIR)/$(instlibdir)/$(SHARED_LIB_NAME) ++ ln -sf $(SHARED_LIB_NAME) $(DESTDIR)/$(instlibdir)/$(SHARED_LIB_UNVERSIONED) + @echo "Installing Headers" +- @install -d $(DESTDIR)/$(includedir) +- @install -m 0644 $(top_srcdir)/cpp/src/*.h $(DESTDIR)/$(includedir) +- @install -d $(DESTDIR)/$(includedir)/command_classes/ +- @install -m 0644 $(top_srcdir)/cpp/src/command_classes/*.h $(DESTDIR)/$(includedir)/command_classes/ +- @install -d $(DESTDIR)/$(includedir)/value_classes/ +- @install -m 0644 $(top_srcdir)/cpp/src/value_classes/*.h $(DESTDIR)/$(includedir)/value_classes/ +- @install -d $(DESTDIR)/$(includedir)/platform/ +- @install -m 0644 $(top_srcdir)/cpp/src/platform/*.h $(DESTDIR)/$(includedir)/platform/ +- @install -d $(DESTDIR)/$(includedir)/platform/unix/ +- @install -m 0644 $(top_srcdir)/cpp/src/platform/unix/*.h $(DESTDIR)/$(includedir)/platform/unix/ +- @install -d $(DESTDIR)/$(includedir)/aes/ +- @install -m 0644 $(top_srcdir)/cpp/src/aes/*.h $(DESTDIR)/$(includedir)/aes/ +- @install -d $(DESTDIR)/$(sysconfdir)/ ++ install -d $(DESTDIR)/$(includedir) ++ install -m 0644 $(top_srcdir)/cpp/src/*.h $(DESTDIR)/$(includedir) ++ install -d $(DESTDIR)/$(includedir)/command_classes/ ++ install -m 0644 $(top_srcdir)/cpp/src/command_classes/*.h $(DESTDIR)/$(includedir)/command_classes/ ++ install -d $(DESTDIR)/$(includedir)/value_classes/ ++ install -m 0644 $(top_srcdir)/cpp/src/value_classes/*.h $(DESTDIR)/$(includedir)/value_classes/ ++ install -d $(DESTDIR)/$(includedir)/platform/ ++ install -m 0644 $(top_srcdir)/cpp/src/platform/*.h $(DESTDIR)/$(includedir)/platform/ ++ install -d $(DESTDIR)/$(includedir)/platform/unix/ ++ install -m 0644 $(top_srcdir)/cpp/src/platform/unix/*.h $(DESTDIR)/$(includedir)/platform/unix/ ++ install -d $(DESTDIR)/$(includedir)/aes/ ++ install -m 0644 $(top_srcdir)/cpp/src/aes/*.h $(DESTDIR)/$(includedir)/aes/ ++ install -d $(DESTDIR)/$(sysconfdir)/ + @echo "Installing Config Database" +- @cp -r $(top_srcdir)/config/* $(DESTDIR)/$(sysconfdir) ++ cp -r $(top_srcdir)/config/* $(DESTDIR)/$(sysconfdir) + @echo "Installing Documentation" +- @install -d $(DESTDIR)/$(docdir)/ +- @cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir) +- @if [ -d "$(top_builddir)/docs/html/" ]; then cp -r $(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi ++ install -d $(DESTDIR)/$(docdir)/ ++ cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir) ++ if [ -d "$(top_builddir)/docs/html/" ]; then cp -r $(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi + @echo "Installing Pkg-config Files" +- @install -d $(DESTDIR)/$(pkgconfigdir) +- @cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(pkgconfigdir) +- @install -d $(DESTDIR)/$(PREFIX)/bin/ +- @cp $(top_builddir)/ozw_config $(DESTDIR)/$(PREFIX)/bin/ozw_config +- @chmod 755 $(DESTDIR)/$(PREFIX)/bin/ozw_config ++ install -d $(DESTDIR)/$(pkgconfigdir) ++ cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(pkgconfigdir) ++ install -d $(DESTDIR)/$(PREFIX)/bin/ ++ cp $(top_builddir)/ozw_config $(DESTDIR)/$(PREFIX)/bin/ozw_config ++ chmod 755 $(DESTDIR)/$(PREFIX)/bin/ozw_config + + + +Index: openzwave-1.6.1914+ds/cpp/examples/MinOZW/Makefile +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/examples/MinOZW/Makefile ++++ openzwave-1.6.1914+ds/cpp/examples/MinOZW/Makefile +@@ -67,7 +67,7 @@ endif + + $(OBJDIR)/MinOZW: $(patsubst %.cpp,$(OBJDIR)/%.o,$(minozwsrc)) + @echo "Linking MinOZW" +- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread ++ $(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread + + $(top_builddir)/MinOZW: $(top_srcdir)/cpp/examples/MinOZW/MinOZW.in $(OBJDIR)/MinOZW + @echo "Creating Temporary Shell Launch Script" +Index: openzwave-1.6.1914+ds/cpp/test/Makefile +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/test/Makefile ++++ openzwave-1.6.1914+ds/cpp/test/Makefile +@@ -74,18 +74,18 @@ endif + + $(OBJDIR)/%.o : %.cc + @echo "Building $(notdir $@)" +- @$(CXX) -MM $(CFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d ++ $(CXX) -MM $(CFLAGS) $(INCLUDES) $< > $(DEPDIR)/$*.d + @mv -f $(DEPDIR)/$*.d $(DEPDIR)/$*.d.tmp + @$(SED) -e 's|.*:|$(OBJDIR)/$*.o: $(DEPDIR)/$*.d|' < $(DEPDIR)/$*.d.tmp > $(DEPDIR)/$*.d; + @$(SED) -e 's/.*://' -e 's/\\$$//' < $(DEPDIR)/$*.d.tmp | fmt -1 | \ + $(SED) -e 's/^ *//' -e 's/$$/:/' >> $(DEPDIR)/.$*.d; + @rm -f $(DEPDIR)/$*.d.tmp +- @$(CXX) $(CFLAGS) $(TARCH) $(INCLUDES) -o $@ $< ++ $(CXX) $(CFLAGS) $(TARCH) $(INCLUDES) -o $@ $< + + $(top_builddir)/gtest-main: $(patsubst %.cc,$(OBJDIR)/%.o,$(gtestsrc)) \ + $(patsubst %.cpp,$(OBJDIR)/%.o,$(testsrc)) $(OZW_LIB) + @echo "Linking $@" +- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -pthread ++ $(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -pthread + + test: $(top_builddir)/gtest-main + $(top_builddir)/gtest-main diff -Nru openzwave-1.6.1914+ds/debian/patches/modify-flags.patch openzwave-1.6.1914+ds/debian/patches/modify-flags.patch --- openzwave-1.6.1914+ds/debian/patches/modify-flags.patch 2021-10-21 21:17:21.000000000 +0200 +++ openzwave-1.6.1914+ds/debian/patches/modify-flags.patch 2024-04-11 15:23:58.000000000 +0200 @@ -1,10 +1,11 @@ Description: we don't want to suppress warnings Author: Thorsten Alteholz <deb...@alteholz.de> Forwarded: not-needed -Index: openzwave-1.6+ds/cpp/tinyxml/Makefile ---- a/cpp/tinyxml/Makefile -+++ b/cpp/tinyxml/Makefile -@@ -25,8 +25,8 @@ +Index: openzwave-1.6.1914+ds/cpp/tinyxml/Makefile +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/tinyxml/Makefile ++++ openzwave-1.6.1914+ds/cpp/tinyxml/Makefile +@@ -25,8 +25,8 @@ LD := g++ AR := ar rc RANLIB := ranlib @@ -15,3 +16,18 @@ LIBS := +Index: openzwave-1.6.1914+ds/cpp/examples/MinOZW/Makefile +=================================================================== +--- openzwave-1.6.1914+ds.orig/cpp/examples/MinOZW/Makefile ++++ openzwave-1.6.1914+ds/cpp/examples/MinOZW/Makefile +@@ -10,8 +10,8 @@ + .PHONY: default clean + + +-DEBUG_CFLAGS := -Wall -Wno-format -ggdb -DDEBUG $(CPPFLAGS) -std=c++11 +-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O3 $(CPPFLAGS) -std=c++11 ++DEBUG_CFLAGS := -Wall -ggdb -DDEBUG $(CPPFLAGS) -std=c++11 ++RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -O3 $(CPPFLAGS) -std=c++11 + + DEBUG_LDFLAGS := -g + diff -Nru openzwave-1.6.1914+ds/debian/patches/series openzwave-1.6.1914+ds/debian/patches/series --- openzwave-1.6.1914+ds/debian/patches/series 2021-10-21 21:17:21.000000000 +0200 +++ openzwave-1.6.1914+ds/debian/patches/series 2024-04-11 15:13:30.000000000 +0200 @@ -1,3 +1,4 @@ gcc11.patch spelling.patch modify-flags.patch +makefile-no-silent.patch diff -Nru openzwave-1.6.1914+ds/debian/rules openzwave-1.6.1914+ds/debian/rules --- openzwave-1.6.1914+ds/debian/rules 2021-10-21 21:17:21.000000000 +0200 +++ openzwave-1.6.1914+ds/debian/rules 2024-04-11 15:20:35.000000000 +0200 @@ -7,9 +7,11 @@ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + #XXX: MORECPPFLAGS=-fPIE -pie # add CFLAGS here as upstream make does not care about them and we need -Wformat -CPPFLAGS += $(CFLAGS) +# XXX: not needed, -Wformat is part of CPPFLAGS +#CPPFLAGS += $(CFLAGS) LDFLAGS += -Wl,-z,now #XXX no need to use this: export CC=gcc-8 @@ -37,7 +39,10 @@ dh_clean override_dh_auto_build: - echo "Build version: >$(MAJOR).$(MINOR).$(REV)<" + @echo "Build version: >$(MAJOR).$(MINOR).$(REV)<" + @echo "CPPFLAGS: $(CPPFLAGS)" + @echo "CFLAGS: $(CFLAGS)" + @echo "CXXFLAGS: $(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" VERSION_MAJ=$(MAJOR) VERSION_MIN=$(MINOR) VERSION_REV=$(REV) PREFIX=/usr sysconfdir=/etc/openzwave instlibdir=$(LIBDIR) dh_auto_build -- CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- override_dh_auto_install:
