This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 6b552538aa8ab5aa17f4e6fba0da0e0aefa78ced Author: Osamu Aoki <[email protected]> Date: Thu Sep 7 21:27:47 2017 +0900 Make source package bootstrappable Run syntax checker in test target to enable use of <!nocheck> in build-deps. Closes: #870640 --- debian/changelog | 1 + debian/control | 12 ++++++------ scripts/Makefile | 14 ++++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb199a1..40a3c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ devscripts (2.17.10) UNRELEASED; urgency=medium #870281 * uupdate + -b option is not "New upstream release". Closes: #842468, #845610 + * Made source package bootstrappable. Closes: #870640 -- Mattia Rizzolo <[email protected]> Tue, 25 Jul 2017 14:18:24 +0200 diff --git a/debian/control b/debian/control index d8b74e9..918f482 100644 --- a/debian/control +++ b/debian/control @@ -17,13 +17,13 @@ Build-Depends: bash-completion, help2man, libdistro-info-perl <!nocheck>, libdpkg-perl <!nocheck>, - libfile-desktopentry-perl, - libfile-homedir-perl, - libgit-wrapper-perl, - liblist-compare-perl, + libfile-desktopentry-perl <!nocheck>, + libfile-homedir-perl <!nocheck>, + libgit-wrapper-perl <!nocheck>, + liblist-compare-perl <!nocheck>, libtimedate-perl <!nocheck>, - liburi-perl, - libwww-perl, + liburi-perl <!nocheck>, + libwww-perl <!nocheck>, lsb-release <!nocheck>, mozilla-devscripts <!nocheck>, perl, diff --git a/scripts/Makefile b/scripts/Makefile index 21ed11a..d70109c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,6 +18,8 @@ CFLAGS += -std=c99 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) CWRAPPERS = debpkg-wrapper SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES)) +PL_CHECKS = $(patsubst %.pl,%.pl_check,$(PL_FILES)) +SH_CHECKS = $(patsubst %.pl,%.sh_check,$(SH_FILES)) COMPL_FILES := $(wildcard *.bash_completion) BC_BUILD_DIR:=bash_completion COMPLETION = $(patsubst %.bash_completion,$(BC_BUILD_DIR)/%,$(COMPL_FILES)) @@ -44,14 +46,11 @@ ifeq ($(shell dpkg-vendor --query Vendor),Ubuntu) # will be for preparing PPA uploads. sed -i 's/get_ubuntu_devel_distro()/"$(shell lsb_release -cs)"/' $@ endif - perl -I ../lib -c $@ %.tmp: %.sh $(VERSION_FILE) sed -e "s/###VERSION###/$(VERSION)/" $< > $@ - bash -n $@ %.tmp: %.pl $(VERSION_FILE) sed -e "s/###VERSION###/$(VERSION)/" $< > $@ - perl -I ../lib -c $@ %: %.tmp cp $< $@ chmod +x $@ @@ -66,6 +65,13 @@ endif xsltproc --nonet -o $@ \ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< +# Syntax checker +%.sh.check: % + bash -n $< + +%.pl_check: % + perl -I ../lib -c $< + # There is a slight chance this gets called twice, once here from here and once # from ../po4a/Makefile. Treat files with care. PID := $(shell echo $$$$-$$PPID) @@ -91,7 +97,7 @@ clean: rm -f $(SCRIPTS) $(patsubst %,%.tmp,$(SCRIPTS)) \ $(GEN_MAN1S) $(SCRIPT_LIBS) $(CWRAPPERS) -test: +test: $(PL_CHECKS) $(SH_CHECKS) python3 -m flake8 --max-line-length=99 $(PYTHON3_SCRIPTS) $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n)) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
