[devscripts] 01/01: uscan.pl: manpage update for compression etc.
Osamu Aoki
osamu at moszumanska.debian.org
Sat Sep 26 06:46:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
osamu pushed a commit to branch multitar
in repository devscripts.
commit 8ac6ea0e81611e55ca1c4b21ada499c170bf0965
Author: Osamu Aoki <osamu at debian.org>
Date: Sat Sep 26 15:00:24 2015 +0900
uscan.pl: manpage update for compression etc.
https://bugs.debian.org/775526
/usr/bin/uscan: passing --compression=xz ignored
Fixed typos etc.
Remove deprecated pstream-signing-key.pgp and add comment to the source.
Under mangle mode, uscan checks and warn possible GPG keys but does not use it
automatically. There were bug on this caused by my change to manpage and it is
corrected with this commit.
Also, the following was already addressed in the initial POD commit.
https://bugs.debian.org/573631
[uscan] manpage diverges from actual behaviour
---
scripts/uscan.pl | 48 +++++++++++++++++++++++++++++++-----------------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 4d6ae4e..31334fd 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -263,7 +263,8 @@ Set the compression I<method> when it is repacked. (persistent)
Available I<method> values are B<xz>, B<gzip> (alias B<gz>), B<bzip2> (alias
B<bz2>), and B<lzma>.
-Please note the repack of the upstream tarballs happen in several cases:
+Please note the repack of the upstream tarballs happen only if one of the
+following condition satisfied:
=over
@@ -272,6 +273,8 @@ CONFIGURATION VARIABLES>.
=item * B<--repack> is set in the commandline. See <COMMANDLINE OPTIONS>.
+=item * B<repack> is set in the watch line as B<opts=>I<...>.
+
=item * The upstream tarballs contain files listed under the B<Files-Excluded>
and B<Files-Excluded->I<component> stanza of F<debian/copyright>. See
mk-origtargz(1).
@@ -295,8 +298,8 @@ Set the pgp/gpg signature verification I<mode>.
=item B<mangle>
-Use B<pgpsigurlmangle=>I<rules> to generate the candidate upstream signature file
-URL string from the upstream tarball URL. (default)
+Use B<pgpsigurlmangle=>I<rules> to generate the candidate upstream signature
+file URL string from the upstream tarball URL. (default)
=item B<next>
@@ -366,13 +369,12 @@ Generate the version string I<< <oversion> >> of the source tarball I<<
=item B<downloadurlmangle=>I<rules>
-Normalize the candidate upstream tarball URL
-string
+Normalize the candidate upstream tarball URL string.
=item B<pgpsigurlmangle=>I<rules>
-Generate the candidate upstream signature file
-URL string from the upstream tarball URL.
+Generate the candidate upstream signature file URL string from the upstream
+tarball URL.
=back
@@ -548,18 +550,18 @@ directory. For example, the downloaded file may be:
Let's call this downloaded version B<2.04> in the above example generically as
I<< <uversion> >> in the following.
-If the B<pgpsignurlmangle> rule exists, the upstream signature file URL is
+If the B<pgpsigurlmangle> rule exists, the upstream signature file URL is
generated by applying this rule to the (downloadurlmangled) candidate upstream
tarball URL and the signature file is tried to be downloaded.
-If the B<pgpsignurlmangle> rule doesn't exist, B<uscan> tries to download the
-matching upstream signature file assuming they are available from the same URL
-with their filename being suffixed by the 4 common suffix B<asc>, B<gpg>,
-B<pgp>, and B<sig>.
+If the B<pgpsigurlmangle> rule doesn't exist, B<uscan> warns user if the
+matching upstream signature file is available from the same URL with their
+filename being suffixed by the 4 common suffix B<asc>, B<gpg>, B<pgp>, and
+B<sig>.
If the signature file is downloaded, the downloaded upstream tarball is checked
for its authenticity against the downloaded signature file using the keyring
-F<debian/upstream-signing-key.pgp>, or F<debian/upstream/signing-key.pgp>; or
+F<debian/upstream/signing-key.pgp> or
the armored keyring F<debian/upstream/signing-key.asc>. If its signature is not
valid, or not made by one of the listed keys, B<uscan> will report an error.
@@ -631,7 +633,7 @@ When writing the watch file, you should rely on the latest upstream source
announcement web page. You should not try to second guess the upstream archive
structure if possible. Here are the typical F<debian/watch> files.
-The existance and non-existance of a space before tailing B<\> (back slash) are
+The existence and non-existence of a space before tailing B<\> (back slash) are
significant.
=head2 HTTP site (basic)
@@ -1198,9 +1200,9 @@ variations.
=head2 Custom script
The optional I<script> parameter F<debian/watch> means to execute I<script>
-with options after processing this line. You can customize this by specifying
-F<debian/myuupdate> as I<script> and create executable file F<debian/myuupdate>
-with the following content.
+with options after processing this line if specified. You can customize this
+by specifying F<debian/myuupdate> as I<script> and create an executable file
+F<debian/myuupdate> with the following content.
#!/bin/sh -e
# called with --upstream-version <version>
@@ -1215,6 +1217,10 @@ perform a fully automatic upstream update of Debian binary packages.
Note that we don't call B<dupload> or B<dput> automatically, as the maintainer
should perform sanity checks on the software before uploading it to Debian.
+Also, for compatibility with other tools such as B<git-buildpackage>, it may not
+be wise to create this kind of custom scripts. In general, B<uupdate> is
+the best choice for the non-native package.
+
=head2 Directory name checking
Similarly to several other scripts in the B<devscripts> package, B<uscan>
@@ -1302,6 +1308,13 @@ B<uscan> invokes the standard B<uupdate> as "B<uupdate> B<--no-symlink
=item Version 4
+Although you can have multiple watch lines with different URLs to keep your eyes
+on a single tarball under the version 3, it is not allowed under the version 4.
+This is to ensure the proper function of B<uupdate>.
+
+If you have custom script in place of B<uupdate>, you may also encounter
+problems.
+
B<uscan> invokes the custom I<script> as "I<script> B<--upstream-version>
I<version>".
@@ -2225,6 +2238,7 @@ sub process_watchline ($$$$$$)
uscan_warn "$progname warning: pgpsigurlmangle option exists, but you must have gpgv installed to verify\n in $watchfile, skipping:\n $line\n";
return 1;
}
+ # upstream-signing-key.pgp is deprecated
$keyring = first { -r $_ } qw(debian/upstream/signing-key.pgp debian/upstream/signing-key.asc debian/upstream-signing-key.pgp);
if (!defined $keyring) {
uscan_warn "$progname warning: pgpsigurlmangle option exists, but the upstream keyring does not exist\n in $watchfile, skipping:\n $line\n";
--
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