This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=53f756d45b5202095a96478034fbf168c78e4386 commit 53f756d45b5202095a96478034fbf168c78e4386 Author: Guillem Jover <guil...@debian.org> AuthorDate: Tue May 5 05:26:47 2020 +0200 t-deb-conffiles: Rename packages and feature macro Make these more descriptive. --- Feature.mk | 2 +- t-deb-conffiles/Makefile | 12 ++++++------ .../{pkg-conff-dupe => pkg-conff-duped}/DEBIAN/conffiles | 0 .../{pkg-conff-dupe => pkg-conff-duped}/DEBIAN/control | 2 +- .../{pkg-conff-dupe => pkg-conff-duped}/test-conffile-1 | 0 .../{pkg-conff-dupe => pkg-conff-duped}/test-conffile-2 | 0 .../{pkg-conff-noel => pkg-conff-noeol}/DEBIAN/conffiles | 0 .../{pkg-conff-noel => pkg-conff-noeol}/DEBIAN/control | 3 +-- .../{pkg-conff-noel => pkg-conff-noeol}/test-conffile-1 | 0 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Feature.mk b/Feature.mk index 5a8506dcc..8c76fef9f 100644 --- a/Feature.mk +++ b/Feature.mk @@ -20,7 +20,7 @@ endif # dpkg >= 1.17.x ifeq ($(call CHECK_VERSION,$(DPKG_SERIES),ge,1.17.x),yes) $(info Assuming checks for dpkg >= 1.17.x) -export DPKG_HAS_STRICT_CONFFILE_PARSER ?= 1 +export DPKG_HAS_STRICT_CONFFILE_PARSER_NOEOL ?= 1 export DPKG_HAS_STRICT_DEB_PARSER ?= 1 export DPKG_HAS_DEB_CONTROL_UNIFORM_SUPPORT ?= 1 export DPKG_HAS_VERSIONED_PROVIDES ?= 1 diff --git a/t-deb-conffiles/Makefile b/t-deb-conffiles/Makefile index 32920e2e9..95a38dc8f 100644 --- a/t-deb-conffiles/Makefile +++ b/t-deb-conffiles/Makefile @@ -2,20 +2,20 @@ include ../Test.mk test-case: # This should produce a warning - LC_ALL=C $(DPKG_BUILD_DEB) pkg-conff-dupe 2>&1 | \ + LC_ALL=C $(DPKG_BUILD_DEB) pkg-conff-duped 2>&1 | \ grep "warning: conffile name '.*' is duplicated" && echo Pass || \ ( echo Fail: missing warning in output && exit 1 ) -ifdef DPKG_HAS_STRICT_CONFFILE_PARSER +ifdef DPKG_HAS_STRICT_CONFFILE_PARSER_NOEOL # Conffiles need a final newline to guarantee there's been no # accidental file truncation. - ! $(DPKG_BUILD_DEB) pkg-conff-noel + ! $(DPKG_BUILD_DEB) pkg-conff-noeol else - LC_ALL=C $(DPKG_BUILD_DEB) pkg-conff-noel 2>&1 | \ + LC_ALL=C $(DPKG_BUILD_DEB) pkg-conff-noeol 2>&1 | \ grep "warning: conffile name '.*' is too long" && echo Pass || \ ( echo Fail: missing warning in output && exit 1 ) endif test-clean: - $(RM) pkg-conff-dupe.deb - $(RM) pkg-conff-noel.deb + $(RM) pkg-conff-duped.deb + $(RM) pkg-conff-noeol.deb diff --git a/t-deb-conffiles/pkg-conff-dupe/DEBIAN/conffiles b/t-deb-conffiles/pkg-conff-duped/DEBIAN/conffiles similarity index 100% rename from t-deb-conffiles/pkg-conff-dupe/DEBIAN/conffiles rename to t-deb-conffiles/pkg-conff-duped/DEBIAN/conffiles diff --git a/t-deb-conffiles/pkg-conff-dupe/DEBIAN/control b/t-deb-conffiles/pkg-conff-duped/DEBIAN/control similarity index 86% rename from t-deb-conffiles/pkg-conff-dupe/DEBIAN/control rename to t-deb-conffiles/pkg-conff-duped/DEBIAN/control index a25fcfef5..2f6def245 100644 --- a/t-deb-conffiles/pkg-conff-dupe/DEBIAN/control +++ b/t-deb-conffiles/pkg-conff-duped/DEBIAN/control @@ -1,4 +1,4 @@ -Package: pkg-conff-dupe +Package: pkg-conff-duped Version: 0 Section: test Priority: extra diff --git a/t-deb-conffiles/pkg-conff-dupe/test-conffile-1 b/t-deb-conffiles/pkg-conff-duped/test-conffile-1 similarity index 100% rename from t-deb-conffiles/pkg-conff-dupe/test-conffile-1 rename to t-deb-conffiles/pkg-conff-duped/test-conffile-1 diff --git a/t-deb-conffiles/pkg-conff-dupe/test-conffile-2 b/t-deb-conffiles/pkg-conff-duped/test-conffile-2 similarity index 100% rename from t-deb-conffiles/pkg-conff-dupe/test-conffile-2 rename to t-deb-conffiles/pkg-conff-duped/test-conffile-2 diff --git a/t-deb-conffiles/pkg-conff-noel/DEBIAN/conffiles b/t-deb-conffiles/pkg-conff-noeol/DEBIAN/conffiles similarity index 100% rename from t-deb-conffiles/pkg-conff-noel/DEBIAN/conffiles rename to t-deb-conffiles/pkg-conff-noeol/DEBIAN/conffiles diff --git a/t-deb-conffiles/pkg-conff-noel/DEBIAN/control b/t-deb-conffiles/pkg-conff-noeol/DEBIAN/control similarity index 87% rename from t-deb-conffiles/pkg-conff-noel/DEBIAN/control rename to t-deb-conffiles/pkg-conff-noeol/DEBIAN/control index d540f1851..7bc9e5139 100644 --- a/t-deb-conffiles/pkg-conff-noel/DEBIAN/control +++ b/t-deb-conffiles/pkg-conff-noeol/DEBIAN/control @@ -1,8 +1,7 @@ -Package: pkg-conff-noel +Package: pkg-conff-noeol Version: 0 Section: test Priority: extra Maintainer: Dpkg Developers <debian-d...@lists.debian.org> Architecture: all Description: test package - conffile with no end of line - diff --git a/t-deb-conffiles/pkg-conff-noel/test-conffile-1 b/t-deb-conffiles/pkg-conff-noeol/test-conffile-1 similarity index 100% rename from t-deb-conffiles/pkg-conff-noel/test-conffile-1 rename to t-deb-conffiles/pkg-conff-noeol/test-conffile-1 -- Dpkg.Org's dpkg
