[devscripts] 06/08: Merge branch 'master' of git://anonscm.debian.org/collab-maint/devscripts
Nicholas Bamber
periapt at moszumanska.debian.org
Sat Nov 14 08:11:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
periapt pushed a commit to branch master
in repository devscripts.
commit 087affc241ad857a8bb5d66050314a06f82a5d12
Merge: 93559da a056c07
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date: Fri Nov 13 12:24:37 2015 +0000
Merge branch 'master' of git://anonscm.debian.org/collab-maint/devscripts
README | 21 +-
debian/changelog | 44 +-
debian/control | 24 +-
po4a/devscripts-po4a.conf | 4 +-
scripts/Makefile | 2 +-
scripts/debsign.1 | 1 +
scripts/debsign.sh | 2 +
scripts/dscverify.1 | 1 +
scripts/dscverify.pl | 3 +-
scripts/mk-origtargz.pl | 42 +-
scripts/uscan.1 | 596 -------
scripts/uscan.pl | 3459 +++++++++++++++++++++++++++++++++--------
scripts/uupdate.1 | 32 +-
scripts/uupdate.sh | 416 +++--
scripts/who-permits-upload.pl | 4 +-
scripts/who-uploads.1 | 2 +-
scripts/who-uploads.sh | 14 +-
test/test_mk-origtargz | 4 +-
test/test_uscan | 2 +-
test/test_uscan_mangle | 834 ++++++++--
test/uscan/PRIVATE_KEY.asc | 106 ++
test/uscan/PUBLIC_KEY.asc | 52 +
test/uscan/server-head.py | 22 +
23 files changed, 4131 insertions(+), 1556 deletions(-)
diff --cc scripts/Makefile
index 9d4a3e2,872f9d2..9bfadbf
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@@ -19,11 -19,10 +19,11 @@@ LDFLAGS := $(shell dpkg-buildflags --ge
CWRAPPERS = debpkg-wrapper
SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES))
COMPL_FILES := $(wildcard *.bash_completion)
-COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
+BC_BUILD_DIR:=bash_completion
+COMPLETION = $(patsubst %.bash_completion,$(BC_BUILD_DIR)/%,$(COMPL_FILES))
COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)
- GEN_MAN1S += devscripts.1 mk-origtargz.1
+ GEN_MAN1S += devscripts.1 mk-origtargz.1 uscan.1
all: $(SCRIPTS) $(GEN_MAN1S) $(CWRAPPERS) $(COMPLETION)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list