This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 97d8771e5b76d6f8d90896f3ab2547722c31d9b6 Author: Osamu Aoki <[email protected]> Date: Thu May 5 21:31:15 2016 +0900 uupdate: add --skip-patches to dpkg-source > Jordi > -- > Jordi Mallach Pérez -- Debian developer http://www.debian.org/ > [email protected] [email protected] http://www.sindominio.net/ > GnuPG public key information available at http://oskuro.net/ > > --- debian/changelog | 3 +++ scripts/uupdate.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 32f2e0d..ab26506 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ devscripts (2.16.5) UNRELEASED; urgency=medium + Clarify --no-symlink meaning. (Closes: #819111) + No output if upstream == debian and no errors. (Closes: #822649) + Better @ANY_VERSION@ regex. (Closes: #821224) + * uupdate: + + Use "dpkg-source --skip-patches ..." with -f to prevent patches to be + applied. Thanks Herbert Parentes Fortes Neto. (Closes: #823350) -- James McCoy <[email protected]> Mon, 02 May 2016 19:41:06 -0400 diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh index b1f46af..caeae4d 100755 --- a/scripts/uupdate.sh +++ b/scripts/uupdate.sh @@ -1092,7 +1092,7 @@ else echo " 01234567890123456789012345678901 1 ${NEW_DEBIANFILE}" >> "$FAKEDSC" # unpack source tree - if ! dpkg-source --no-copy --no-check -x "$FAKEDSC"; then + if ! dpkg-source --skip-patches --no-copy --no-check -x "$FAKEDSC"; then echo "$PROGNAME: Error with \"dpkg-source --no-copy --no-check -x $FAKEDSC\"" >&2 echo "$PROGNAME: Remember: Your current directory is changed back to the old source tree!" echo "$PROGNAME: Do a \"cd ..\" to see $FAKEDSC." -- 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
