[devscripts] 03/04: uupdate: work around missing debian.tar.xz etc.
James McCoy
jamessan at debian.org
Sat Sep 12 18:55:45 UTC 2015
On Sat, Sep 12, 2015 at 04:03:38PM +0000, Osamu Aoki wrote:
> 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
This would have been better as part of the previous commit, so all the
--verbose changes were self-contained.
> @@ -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";'`
>
> -UVERSION=`expr "$SVERSION" : '\(.*\)-[0-9a-zA-Z.+~]*$'`
> +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 (oversionmangled)" >&2
uversionmangled? -----^
> + 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.+~]*$'` || true
> 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`
>
> @@ -723,6 +741,24 @@ else
> DIFF="../${PACKAGE}_$SVERSION.debian.tar.xz"
> DIFFTYPE=tar
> DIFFUNPACK="tar --xz -xf"
> + else
> + # non-native package with $SVERSION in <version>-<revision> format
> + # missing diff.gz/debian.tar.xz, make it with $OPWD/debian/*
> + # force to update next version to 3.0 (quilt)
Why force it to 3.0 (quilt) when we don't have a known previous source
package format to update from? If we don't know what the maintainer is
using, I'm not sure we should just arbitrarily choose a format for them.
Stopping with an message that we don't know how to proceed seems better
to me.
Cheers,
--
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/devscripts-devel/attachments/20150912/e9c65ea5/attachment.sig>
More information about the devscripts-devel
mailing list