[devscripts] 01/03: Merge tag 'v2.16.1' into jessie-backports

James McCoy jamessan at debian.org
Fri Feb 19 02:48:27 UTC 2016


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

jamessan pushed a commit to branch jessie-backports
in repository devscripts.

commit 13032133403b9f0c4aa754c64c70b292990c522c
Merge: bfdfca5 43b2b52
Author: James McCoy <jamessan at debian.org>
Date:   Thu Feb 18 21:31:59 2016 -0500

    Merge tag 'v2.16.1' into jessie-backports
    
    tagging package devscripts version 2.16.1

 .gitignore                                |    2 +
 README                                    |   21 +-
 debian/changelog                          |  213 +-
 debian/control                            |   38 +-
 debian/links                              |    8 +-
 debian/manpages                           |    4 +-
 debian/rules                              |    1 +
 debian/tests/control                      |    2 +-
 lib/Devscripts/Debbugs.pm                 |   14 +-
 po4a/devscripts-po4a.conf                 |    4 +-
 po4a/po/de.po                             |    2 +-
 scripts/Makefile                          |   25 +-
 scripts/bts.bash_completion               |  310 +++
 scripts/bts.pl                            |   59 +-
 scripts/build-rdeps.pl                    |    2 +-
 scripts/chdist.bash_completion            |    3 +-
 scripts/chdist.pl                         |   36 +-
 scripts/checkbashisms.bash_completion     |   18 +
 scripts/checkbashisms.pl                  |   12 +-
 scripts/dcmd.sh                           |   18 +-
 scripts/dcut.bash_completion              |    3 +-
 scripts/dd-list.pl                        |   67 +-
 scripts/debchange.bash_completion         |    4 +-
 scripts/debcheckout.pl                    |    2 +-
 scripts/debcommit.pl                      |   62 +-
 scripts/debdiff.1                         |    3 +-
 scripts/debdiff.bash_completion           |   88 +
 scripts/debdiff.pl                        |    2 +
 scripts/debi.bash_completion              |   11 +
 scripts/debsign.1                         |    1 +
 scripts/debsign.bash_completion           |    3 +-
 scripts/debsign.sh                        |    2 +
 scripts/debsnap.pl                        |   14 +-
 scripts/debuild.1                         |    2 +-
 scripts/debuild.bash_completion           |   93 +
 scripts/debuild.pl                        |    6 +-
 scripts/dep3changelog.pl                  |    2 +-
 scripts/dget.pl                           |   21 +-
 scripts/dscextract.bash_completion        |   22 +
 scripts/dscverify.1                       |    1 +
 scripts/dscverify.bash_completion         |   20 +
 scripts/dscverify.pl                      |    4 +-
 scripts/licensecheck.bash_completion      |   33 +
 scripts/licensecheck.pl                   |  230 +-
 scripts/list-unreleased.bash_completion   |    1 +
 scripts/mk-build-deps.pl                  |    4 +-
 scripts/mk-origtargz.bash_completion      |   13 +-
 scripts/mk-origtargz.pl                   |  115 +-
 scripts/pkgnames.bash_completion          |   13 +-
 scripts/plotchangelog.bash_completion     |   23 +
 scripts/sadt                              |   49 +-
 scripts/suspicious-source                 |   48 +-
 scripts/uscan.1                           |  596 -----
 scripts/uscan.bash_completion             |   12 +-
 scripts/uscan.pl                          | 3816 +++++++++++++++++++++++------
 scripts/uupdate.1                         |   29 +-
 scripts/uupdate.bash_completion           |    6 +-
 scripts/uupdate.sh                        |  426 +++-
 scripts/what-patch.bash_completion        |    1 +
 scripts/who-permits-upload.pl             |    5 +-
 scripts/who-uploads.1                     |    2 +-
 scripts/who-uploads.sh                    |   14 +-
 scripts/wrap-and-sort                     |   10 +-
 test/Makefile                             |   42 +-
 test/bashisms/808271.sh                   |    9 +
 test/bashisms/808271.sh.out               |    4 +
 test/bashisms/printf.sh                   |    2 -
 test/bashisms/printf.sh.out               |    6 +-
 test/licensecheck/artistic-2-0-modules.pm |  239 ++
 test/licensecheck/artistic-2-0.txt        |  206 ++
 test/licensecheck/bug-559429              |   10 +
 test/licensecheck/freetype.c              |   16 +
 test/licensecheck/info-at-eof.h           |  388 +++
 test/licensecheck/lgpl-by-dist-zilla.pl   |   20 +
 test/licensecheck/llgpl.lisp              |   13 +
 test/licensecheck/multi-line-copyright.c  |   25 +
 test/test_checkbashisms                   |    4 +
 test/test_licensecheck                    |   32 +-
 test/test_licensecheck_SL                 |   83 +
 test/test_mk-origtargz                    |   21 +-
 test/test_package_lifecycle               |  300 +++
 test/test_uscan                           |    2 +-
 test/test_uscan_mangle                    |  843 +++++--
 test/uscan/PRIVATE_KEY.asc                |  106 +
 test/uscan/PUBLIC_KEY.asc                 |   52 +
 test/uscan/server-head.py                 |   22 +
 86 files changed, 7199 insertions(+), 1917 deletions(-)

diff --cc debian/changelog
index 98acd04,5ebb155..213e0ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,210 +1,216 @@@
+ devscripts (2.16.1) unstable; urgency=medium
+ 
+   [ Antonio Terceiro ]
+   * uscan:
+     - fix regression in uscan when --destdir is set (Closes: #809662)
+       Patch by Alex Mestiashvili <mailatgoogl at gmail.com>
+     - fix crash when --rename is passed  (Closes: #812417)
+     - when scanning for directories called 'debian', ignore the ones that
+       don't have a file called 'watch'. This removes several annoying warnings
+       when uscan is run on a package that has several directories called
+       'debian' in its upstream source.
+     - fix English phrases when logging download-related actions
+   * mk-build-deps:
+     - When installing, pass `-o Debug::pkgProblemResolver=yes` to `apt-get
+       install` so that when build dependencies can't be satisfied, you know why.
+       Otherwise it would just tell you that the *-build-deps package needs to
+       be removed and you will never know why.
+   * debian/control:
+     - change Vcs-Git: to a https:// URL
+ 
+   [ James McCoy ]
+   * checkbashisms:
+     + Recognize dash as a valid shell.
+     + Check scripts which use “#!/path/to/env $interpreter”
+     + Allow %b as a printf conversion specifier.  Thanks to Mike Frysinger for
+       the patch.  (Closes: #804735)
+   * debian/tests/control: Add gcc as a dependency for dpkg-architecture.
+   * chdist:
+     + Symlink, rather than copy, the archive keyrings into the chdist tree so
+       they don't get stale.  (Closes: #783497)
+   * test_package_lifecycle: Ignore listing of dh_* commands in debuild output.
+     The specific commands aren't interesting, so much as the steps that the
+     build goes through.  Fixes FTBFS due to new dh_update_autotools_config
+     command.  (Closes: #812661)
+   * dd-list:
+     + Use apt interfaces to find sources files and extract their contents,
+       instead of globbing and directly reading files.
+   * dcmd:
+     + Support .buildinfo files.  Thanks to Johannes Schauer for the patch.
+       (Closes: #774554)
+   * debsnap:
+     + Remove use of JSON module in favor of the core Perl JSON::PP module.
+       Thanks to RjY and Jakub Wilk.  (Closes: #803315)
+   * dep3changelog:
+     + Recognize https URLs for Bug-Debian.  (Closes: #750024)
+ 
+   [ Christoph Berg ]
+   * debcheckout: Add auth mapping for https://github.com.
+ 
+   [ Osamu Aoki ]
+   * uscan:
+     + Fix regressions and glitches in the prioritizing mechanism of packages.
+       (Closes: #809604)
+     + Fix regressions of the verbosety. (Closes: #809541, #809554)
+     + Keep the original compressed file when decompressing it for the
+       signature verification. (Closes: #812860)
+     + Write *.uscan.log only when requested by --log. (Closes: #809806)
+     + Fix syntax of GitHub watch file example.  (Closes: #814447)
+   * uscan, mk-origtargz:
+     + Document Files-Excluded better.  (Closes: #812119)
+ 
+   [ Dominique Dumont ]
+   * licensecheck:
+     + detect LGPL license in Perl files handled by Dist::Zilla
+ 
+  -- James McCoy <jamessan at debian.org>  Thu, 11 Feb 2016 21:07:17 -0500
+ 
+ devscripts (2.15.10) unstable; urgency=low
+ 
+   [ Benjamin Drung ]
+   * test_uscan: Fix failure in testFileExclusion due to wrong tarfile name
+     test on Ubuntu.
+ 
+   [ Nicholas Bamber ]
+   * Fixed issues with current bash completion (Closes: #804492)
+     + Reorganised scripts/Makefile so that bash completion scripts
+       are installed matching their command names - an exception being the
+       generic pkgnames.bash_completion.
+     + Where necessary added links to bash completion scripts
+       to debian/links to reuse bash completion code
+     + Removed deprecated "have" mechanism from bash completion scripts.
+     + Removed undefined "$filenames" from chdist.bash_completion
+     + Split debi.bash_completion off from pkgnames.bash_completion
+       and added links for both debi/debc and corrected complete commands
+   * Added custom bash completion support for bts (Closes: #499886)
+     + Added --soap-timeout option to bts
+     + Added listcachedbugs command to bts
+     + Split out bts bash completion handling into its own script
+   * Added custom bash completion support for debuild, checkbashisms,
+     list-unreleased, dscverify, dscextract, what-patch, plotchangelog,
+     debdiff and licensecheck
+   * Updated custom bash completion handling for mk-origtargz
+   * Added debcheckout to those commands with package names bash completion
+   * licensecheck:
+     + Tweaked parselicense to capture 'and or' as well as
+       'and/or' in GPL licenses (Closes: #559429)
+     + Added test for licensecheck versus Software::License
+     + Resolved failure to find license from Software::License generated
+       files from Artistic and Mozilla licenses
+   * Added test for life cycle of package:
+     + debuild, dscverify, dscextract, list-unreleased, debdiff
+   * Rearranged cleanup of tests to use oneTimeSetUp/oneTimeTearDown
+   * Streamlined structure of test/Makefile
+   * Updated .gitignore
+ 
+   [ Dominique Dumont ]
+   * licensecheck:
+     + no longer attempts to find encoding or select files to parse
+       using 'file' commands. By default, files are selected using file
+       extension instead of MIME types provided by "file" command.  The
+       list of file extensions is more boring to maintain but also more
+       predictable.  (Closes: #803724)
+     + added --encoding option. By default, input files are handled as utf-8
+       Information is printed on STDOUT as utf-8.
+     + --text option is deprecated
+     + added freetype license
+     + remove 'by' from copyright owners
+     + remove whitespace from end of multi-line copyright statements
+     + parse multi-line copyright blocks (Closes: #519080)
+     + parse .lisp file (part of #806424)
+     + added LLGPL license (part of #806424)
+     + licensecheck: show skipped file with --skipped (Closes: #806424)
+     + also parse last 5kb of a file
+     + parse source file without suffix (e.g script, README)
+     + parse .css or .less file
+     + parse perl6 files (.pl6 .pm6 .pod6 ...)
+     + parse markdown files (.md or .markdown)
+     * tweaked to parse Artistic 2.0 license file
+     * improved detection of artistic 2.0 licenses
+ 
+   [ Osamu Aoki ]
+   * uscan:
+     + Start uupdate with --verbose as needed.  (Closes: #350454)
+     + Add test_uscan_mangle for testing the mangling rules and pgp signature.
+     + Add --download-debversion.  (Closes: #755754)
+     + Add pagemangle.  (Closes: #395439, #451051, #538717, #705989, #773390)
+     + Add oversionmangle as a part of multiple upstream tarball support.
+       (Closes: #458777)
+     + Add dirversionmangle with $download-version consideration with detailed
+       and sorted reporting of all available URLs.
+       (Closes: #363346, #375138, #472065, #516704, #557768, #734748)
+     + Add the multiple upstream tarball support and extend the OpenPGP support
+       with new watch line options: component, compression, repack, pgpmode,
+       versionmode, decompress.  (Closes: #526443, #531321, #549178, #731725,
+       #738977, #778723, #800704)
+     + Updated manpage contents and build it from POD.  (Closes: #409094,
+       #415680, #573631, #648632, #733272, #775526, #790629, #796293, #797787)
+     + Improve FTP listing handling. (Closes: #696492)
+     + Add the --overwrite-download, --skip-signature, and similar options
+       to reorganize behavior around existing downloaded files.
+       (Closes: #532182, #740366, #801165)
+     + Update filenamemangle to support the version pattern matching in any
+       position of the URL and remove .download hack which breaks 
+       mk-origtargz. (Closes: #526450, #803948, #804239)
+     + Reorganize the reporting by uscan and adjust its text strings.
+       (Closes: #582958)
+     + Add download compression ordering support to prefer xz over gz.
+       (Closes: #763071)
+     + Add generalized search regex with some special strings @PACKAGE@,
+       @ANY_VERSION@, @ARCHIVE_EXT@, and @SIGNATURE_EXT at .
+       (Closes: #517637, #539780)
+     + Add direct git repository support. (Closes: #663357)
+     + Add unzipopt support.
+   * uupdate:
+     + Prevent failure when upstream version is 0.  (Closes: #798175)
+     + Work around missing debian.tar.gz for "3.0 (quilt)".  (Closes: 798133)
+     + Add multiple upstream tarball support and resolve minor bugs by using
+       dpkg-source as the backend.  (Closes: #278797, #544638, #570221, 
+       #752364, #797045)
+   * mk-origtargz:
+     + Support component name for the multiple upstream tarball support.
+     + Fix Files-Excluded for duplicate entries. (Closes: #762263)
+     + Add --unzipopt option. (Closes: #737843)
+     + Add xpi files support. (Closes: #751984)
+   * debian/control, dscverify, who-permits-upload, uscan:
+     + Add gnupg2/gpgv2 as an alternative option to gnupg/gpgv. (Closes: #788414)
+ 
+   [ James McCoy ]
+   * debuild:
+     + Use _all as the .changes arch for -A builds.  (Closes: #806262)
+   * dget:
+     + Remove unnecessary requirement that “apt-cache policy $pkg” shows a
+       priority of 0 for the Candidate version.  (Closes: #807064)
+     + Fix parsing of sources.list lines with options.  (Closes: #674812)
+   * Add apt to Recommends, since various scripts use tools from apt.  (Closes:
+     #807065)
+   * Export LC_ALL=C in test_mk-origtargz so the test doesn't fail in non-English
+     locales.
+   * chdist:
+     + Make the apt-file support compatible with 3.x apt-file.
+   * debcommit:
+     + When a VCS requires a mangled package version for the tag name, still
+       use the actual package version in the tag message.  (Closes: #802503)
+   * bts:
+     + Fix creation of cache dir when $XDG_CACHE_HOME doesn't exist yet.
+       (Closes: #808394)
+   * checkbashisms:
+     + Improve detection of bashisms when a ! is included after an
+       if/while/elif conditional.  (Closes: #808271)
+ 
+   [ Daniel Kahn Gillmor ]
+   * debuild:
+     + pass through DBUS_SESSION_BUS_ADDRESS so that gpg-agent can make
+       pinentry-gnome3 work (Closes: #805501)
+ 
+  -- James McCoy <jamessan at debian.org>  Wed, 30 Dec 2015 20:44:35 -0500
+ 
 +devscripts (2.15.9~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- James McCoy <jamessan at debian.org>  Fri, 13 Nov 2015 21:52:24 -0500
 +
  devscripts (2.15.9) unstable; urgency=medium
  
    [ Joachim Breitner ]
diff --cc scripts/licensecheck.pl
index 3d1ff2e,161505a..6d61488
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@@ -74,12 -80,17 +80,21 @@@ recursively
  Specify a pattern against which filenames will be matched in order to
  decide which files to check the license of.
  
 -The default includes common source files.
 +=item B<-t>, B<--text>
 +
 +By default, all files are parsed, including binary files. This option
 +limits the parsed files to mime type C<text/*> and C<application/xml>.
 +The mime type is given by C<file> command.
  
+ =item B<-s>, B<--skipped>
+ 
+ Specify whether to show skipped files, i.e. files found which do not
+ match the check regexp (see C<--check> option). Default is to not show
+ skipped files.
+ 
+ Note that ignored files (like C<.git> or C<.svn>) are not shown even when
+ this option is used.
+ 
  =item B<--copyright>
  
  Also display copyright text found within the file
@@@ -485,9 -573,11 +587,11 @@@ Valid options are
     --lines, -l            Specify how many lines of the file header
                              should be parsed for license information
                              (Default: $def_lines)
+    --tail                 Specify how many bytes to parse at end of file
+                             (Default: $def_tail)
     --check, -c            Specify a pattern indicating which files should
                               be checked
 -                             (Default: '$default_check_regex')
 +                             (Default: All text and xml files)
     --machine, -m          Display in a machine readable way (good for awk)
     --recursive, -r        Add the contents of directories recursively
     --copyright            Also display the file's copyright
diff --cc scripts/uscan.pl
index 89ee442,d78ec94..1d52cd7
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@@ -932,18 -2700,16 +2700,17 @@@ sub process_watchline ($$$$$$
  	$lastversion = $opt_download_debversion;
  	$lastversion =~ s/-[^-]+$//;  # revision
  	$lastversion =~ s/^\d+://;    # epoch
- 	print STDERR "$progname debug: specified debversion to download: $lastversion\n" if $debug;
+ 	uscan_verbose "specified --download-debversion to set the last version: $lastversion\n";
      } else {
- 	print STDERR "$progname debug: last pristine tarball version: $lastversion\n" if $debug;
+ 	uscan_verbose "Last orig.tar.* tarball version (from debian/changelog): $lastversion\n";
      }
+ 
      # And mangle it if requested
-     print STDERR "$progname debug: last pristine tarball version: $lastversion\n" if $debug;
-     my $mangled_lastversion;
-     $mangled_lastversion = $lastversion;
+     my $mangled_lastversion = $lastversion;
      foreach my $pat (@{$options{'dversionmangle'}}) {
 +	print STDERR "$progname debug: dversionmangle rule $pat\n" if $debug;
  	if (! safe_replace(\$mangled_lastversion, $pat)) {
- 	    uscan_warn "$progname: In $watchfile, potentially"
+ 	    uscan_warn "In $watchfile, potentially"
  	      . " unsafe or malformed dversionmangle"
  	      . " pattern:\n  '$pat'"
  	      . " found. Skipping watchline\n"
@@@ -1066,13 -2956,17 +2957,18 @@@
  		    } else {
  			# need the map { ... } here to handle cases of (...)?
  			# which may match but then return undef values
- 			my $mangled_version =
- 			    join(".", map { $_ if defined($_) }
- 			 	$href =~ m&^$_pattern$&);
+ 			if ($versionless) {
+ 			    # exception, otherwise $mangled_version = 1
+ 			    $mangled_version = '';
+ 			} else {
+ 			    $mangled_version =
+ 				join(".", map { $_ if defined($_) }
+ 				    $href =~ m&^$_pattern$&);
+ 			}
  			foreach my $pat (@{$options{'uversionmangle'}}) {
 +			    print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
  			    if (! safe_replace(\$mangled_version, $pat)) {
- 				uscan_warn "$progname: In $watchfile, potentially"
+ 				uscan_warn "In $watchfile, potentially"
  			 	 . " unsafe or malformed uversionmangle"
  				  . " pattern:\n  '$pat'"
  				  . " found. Skipping watchline\n"
@@@ -1151,9 -3051,8 +3053,9 @@@
  		my $file = $1;
  		my $mangled_version = join(".", $file =~ m/^$pattern$/);
  		foreach my $pat (@{$options{'uversionmangle'}}) {
 +		    print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
  		    if (! safe_replace(\$mangled_version, $pat)) {
- 			uscan_warn "$progname: In $watchfile, potentially"
+ 			uscan_warn "In $watchfile, potentially"
  			  . " unsafe or malformed uversionmangle"
  			  . " pattern:\n  '$pat'"
  			  . " found. Skipping watchline\n"
@@@ -1171,9 -3082,8 +3085,9 @@@
  		    my $file = $1;
  		    my $mangled_version = join(".", $file =~ m/^$filepattern$/);
  		    foreach my $pat (@{$options{'uversionmangle'}}) {
 +			print STDERR "$progname debug: uversionmangle rule $pat\n" if $debug;
  			if (! safe_replace(\$mangled_version, $pat)) {
- 			    uscan_warn "$progname: In $watchfile, potentially"
+ 			    uscan_warn "In $watchfile, potentially"
  			      . " unsafe or malformed uversionmangle"
  			      . " pattern:\n  '$pat'"
  			      . " found. Skipping watchline\n"
@@@ -1230,39 -3159,13 +3163,15 @@@ EO
  	    return 1;
  	}
      }
 +    print STDERR "$progname debug: new version $newversion\n" if $debug;
 +    print STDERR "$progname debug: new filename $newfile\n" if $debug;
  
-     my $newfile_base=basename($newfile);
-     if (exists $options{'filenamemangle'}) {
-         $newfile_base=$newfile;
-     }
-     foreach my $pat (@{$options{'filenamemangle'}}) {
- 	print STDERR "$progname debug: filenamemangle rule $pat\n" if $debug;
- 	if (! safe_replace(\$newfile_base, $pat)) {
- 	    uscan_warn "$progname: In $watchfile, potentially"
- 	      . " unsafe or malformed filenamemangle"
- 	      . " pattern:\n  '$pat'"
- 	      . " found. Skipping watchline\n"
- 	      . "  $line\n";
- 		return 1;
- 	}
-     }
-     # Remove HTTP header trash
-     if ($site =~ m%^https?://%) {
-         $newfile_base =~ s/\?.*$//;
- 	# just in case this leaves us with nothing
- 	if ($newfile_base eq '') {
- 	    $newfile_base = "$pkg-$newversion.download";
- 	}
-     }
-     print STDERR "$progname debug: filenamemangled new filename $newfile_base\n" if $debug;
- 
-     # So what have we got to report now?
+     # Determin download URL for tarball or signature
      my $upstream_url;
-     my $pgpsig_url;
      # Upstream URL?  Copying code from below - ugh.
-     if ($site =~ m%^https?://%) {
+     if ($options{'mode'} eq 'git') {
+ 	$upstream_url = "$base $newfile";
+     } elsif ($site =~ m%^https?://%) {
  	# absolute URL?
  	if ($newfile =~ m%^\w+://%) {
  	    $upstream_url = $newfile;
@@@ -1322,11 -3218,11 +3224,12 @@@
  
  	# mangle if necessary
  	$upstream_url =~ s/&/&/g;
+ 	uscan_verbose "Matching target for downloadurlmangle: $upstream_url\n";
  	if (exists $options{'downloadurlmangle'}) {
  	    foreach my $pat (@{$options{'downloadurlmangle'}}) {
 +		print STDERR "$progname debug: downloadurlmangle rule $pat\n" if $debug;
  		if (! safe_replace(\$upstream_url, $pat)) {
- 		    uscan_warn "$progname: In $watchfile, potentially"
+ 		    uscan_warn "In $watchfile, potentially"
  		      . " unsafe or malformed downloadurlmangle"
  		      . " pattern:\n  '$pat'"
  		      . " found. Skipping watchline\n"
diff --cc scripts/uupdate.1
index e795d4d,d7cfb0d..fe189eb
--- a/scripts/uupdate.1
+++ b/scripts/uupdate.1
@@@ -72,16 -81,23 +81,26 @@@ Simply create a symlink when moving a n
  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.
+ a symlink, if \fI<package>_<version>.orig.tar.gz\fR is missing.  
+ Otherwise, do nothing.
  .TP
- \fB\-\-no-conf\fR, \fB\-\-noconf\fR
- Do not read any configuration files.  This can only be used as the
- first option given on the command-line.
+ .B \-\-find, \fB\-f\fR
+ Find all upstream tarballs in \fI../\fR which match
+ \fI<pkg>_<version>.orig.tar.{gz|bz2|lzma|xz}\fR or
+ \fI<pkg>_<version>.orig\-<component>.tar.{gz|bz2|lzma|xz}\fR ;
+ \fB\-\-upstream\-version\fR required; pristine source required;
+ not valid for \fB\-\-patch\fR;
+ This option uses \fBdpkg\-source\fR as the backend to enable support for the
+ multiple upstream tarballs and to resolve minor bugs reported previously.  The
+ use of this option is highly recommended.
+ .TP
+ .B \-\-verbose
+ Give verbose output.
  .TP
  .BR \-\-help ", " \-h
  Display a help message and exit successfully.
diff --cc test/test_licensecheck
index 9c8fb33,67e97aa..19700aa
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@@ -62,10 -67,12 +67,16 @@@ testMultiLineDeclaration() 
      license2 "-m --copyright" "bsd-regents.c" "BSD (3 clause)	1987, 1993, 1994 The Regents of the University of California. All rights reserved."
      # or 3 lines
      license2 "-m --copyright" "texinfo.tex" "GPL (v3 or later)	1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc."
+     # BTS #519080
+     license2 "-m --copyright" "multi-line-copyright.c" "Public domain GPL (v3)	2008 Aaron Plattner, NVIDIA Corporation / 2005 Lars Knoll & Zack Rusin, Trolltech / 2000 Keith Packard, member of The XFree86 Project, Inc"
+ }
+ 
+ testDuplicatedCopyright() {
+     license2 "-m --copyright" "duplicated-copyright.rb" "Apache (v2.0)	2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs"
 +}
 +
 +testDuplicatedCopyright() {
 +    license2 "-m --copyright" "duplicated-copyright.rb" "Apache (v2.0)	2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs"
  }
  
  testLGPL() {

-- 
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