[devscripts] 05/07: uscan+uupdate: "uupdate --verbose" support from uscan

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit 8678731ef3d845b70d7a5e64582f2777919710e7
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Sep 13 16:51:00 2015 +0900

    uscan+uupdate: "uupdate --verbose" support from uscan
    
    https://bugs.debian.org/350454
    [uscan] please offer debugging possibility for mangle rules
    
     * add --verbose option to uupdate
     * invoke uupdate --verbose if uscan is run under --verbose
    
    This is a new fix for --verbose part.
    
    The old fix was reverted in:
     Revert "uscan: --verbose"
     Revert "uupdate: work around missing debian.tar.xz etc.
---
 scripts/uscan.pl   |  5 ++++-
 scripts/uupdate.1  |  3 +++
 scripts/uupdate.sh | 30 ++++++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 33f3ad4..b2e12df 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1544,8 +1544,11 @@ EOF
 	my @cmd = shellwords($action);
 
 	# Any symlink requests are already handled by uscan
-	if ($action =~ /^uupdate(\s|$)/) {
+	if ($cmd[0] eq "uupdate") {
 	    push @cmd, "--no-symlink";
+	    if ($verbose) {
+		push @cmd, "--verbose";
+	    }
 	}
 
 	if ($watch_version > 1) {
diff --git a/scripts/uupdate.1 b/scripts/uupdate.1
index 41c86ca..e795d4d 100644
--- a/scripts/uupdate.1
+++ b/scripts/uupdate.1
@@ -72,6 +72,9 @@ Simply create a symlink when moving a new upstream \fI.tar.gz\fR
 archive to the new \fI<package>_<version>.orig.tar.gz\fR location.
 This is the default behaviour.
 .TP
+.B \-\-verbose
+Give verbose output.
+.TP
 \fB\-\-no\-symlink\fR
 Copy the upstream \fI.tar.gz\fR to the new location instead of making
 a symlink.
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index 759d497..91f7c67 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -63,6 +63,7 @@ Options are:
    --no-conf, --noconf
                       Don't read devscripts config files;
                       must be the first option given
+   --verbose          Give verbose output
 
 $PROGNAME [--help|--version]
   show this message or give version information.
@@ -173,6 +174,7 @@ TEMP=$(getopt -s bash -o v:p:r:ubs \
 	--long pristine,no-pristine,nopristine \
 	--long symlink,no-symlink,nosymlink \
 	--long no-conf,noconf \
+	--long verbose \
 	--long help,version -n "$PROGNAME" -- "$@") || (usage >&2; exit 1)
 
 eval set -- $TEMP
@@ -197,6 +199,8 @@ while [ "$1" ]; do
     --no-conf|--noconf)
 	echo "$PROGNAME: $1 is only acceptable as the first command-line option!" >&2
 	exit 1 ;;
+    --verbose)
+	UUPDATE_VERBOSE=yes ;;
     --help) usage; exit 0 ;;
     --version) version; exit 0 ;;
     --)	shift; break ;;
@@ -237,12 +241,26 @@ mustsetvar VERSION "`dpkg-parsechangelog -SVersion`" "source version"
 # Get epoch and upstream version
 eval `echo "$VERSION" | perl -ne '/^(?:(\d+):)?(.*)/; print "SVERSION=$2\nEPOCH=$1\n";'`
 
+if [ -n "$UUPDATE_VERBOSE" ]; then
+    echo "PATCH       = \"$PATCH\" is the name of the patch file" >&2
+    echo "ARCHIVE     = \"$ARCHIVE\" is the name of the next tarball" >&2
+    echo "NEW_VERSION = \"$NEW_VERSION\" is the next pristine tarball version" >&2
+    echo "PACKAGE     = \"$PACKAGE\" is in the top of debian/changelog" >&2
+    echo "VERSION     = \"$VERSION\" is in the top of debian/changelog" >&2
+    echo "EPOCH       = \"$EPOCH\" is epoch part of \$VERSION" >&2
+    echo "SVERSION    = \"$SVERSION\" is w/o-epoch part of \$VERSION" >&2
+fi
+
 UVERSION=`expr "$SVERSION" : '\(.*\)-[0-9a-zA-Z.+~]*$'`
 if [ -z "$UVERSION" ]; then
     echo "$PROGNAME: a native Debian package cannot take upstream updates" >&2
     exit 1
 fi
 
+if [ -n "$UUPDATE_VERBOSE" ]; then
+    echo "UVERSION    = \"$UVERSION\" the upstream portion w/o-epoch of \$VERSION" >&2
+fi
+
 # Save pwd before we goes walkabout
 OPWD=`pwd`
 
@@ -825,6 +843,9 @@ else
 	    echo "to debian.upstream/ and use the Debian version" >&2
 	    mv debian debian.upstream
 	fi
+	if [ -n "$UUPDATE_VERBOSE" ]; then
+	    echo "-- Use ${DIFF} to create the new debian/ directory." >&2
+	fi
 	if $DIFFUNPACK $DIFF; then
 	    echo "Unpacking the debian/ directory from version $VERSION worked fine."
 	else
@@ -835,8 +856,13 @@ else
 	echo "$PROGNAME: could not find {diff|debian.tar}.{gz|bz2|lzma|xz} from version $VERSION to apply!" >&2
 	exit 1
     fi
-    chmod a+x debian/rules
-    debchange -v "$NEW_VERSION-$SUFFIX" New upstream release
+    if [ -f debian/rules ]; then
+	chmod a+x debian/rules
+    fi
+    if [ -n "$UUPDATE_VERBOSE" ]; then
+	echo "-- New upstream release=$NEW_VERSION-$SUFFIX" >&2
+    fi
+    debchange -v "$NEW_VERSION-$SUFFIX" "New upstream release"
     echo "Remember: Your current directory is the OLD sourcearchive!"
     echo "Do a \"cd ../$PACKAGE-$SNEW_VERSION\" to see the new package"
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git