[devscripts] 02/02: uscan, mk-origtargz: Document Files-Excluded

[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 80e1222a3f642b7ff18698e1b64f8fcfe9708a2c
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Feb 7 22:10:09 2016 +0900

    uscan, mk-origtargz: Document Files-Excluded
    
    Document Files-Excluded better.  Closes: #812119
---
 debian/changelog        | 10 ++++++----
 scripts/mk-origtargz.pl |  5 ++++-
 scripts/uscan.pl        | 10 +++++++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b50a0e..d80a725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,12 +49,14 @@ devscripts (2.16.1) UNRELEASED; urgency=medium
 
   [ Osamu Aoki ]
   * uscan:
-    - Fix regressions and glitches in the prioritizing mechanism of packages.
+    + 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
+    + 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)
+    + Write *.uscan.log only when requested by --log. (Closes: #809806)
+  * uscan, mk-origtargz:
+    + Document Files-Excluded better.  (Closes: #812119)
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index e275c13..f09c500 100644
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -43,7 +43,10 @@ B<dpkg-buildpackage>, based on the source package name and version in
 F<debian/changelog>. It can convert B<zip> to B<tar>, optionally change the
 compression scheme and remove files according to B<Files-Excluded> and
 B<Files-Excluded->I<component> in F<debian/copyright>. The resulting file is
-placed in F<debian/../..>.
+placed in F<debian/../..>. (In F<debian/copyright>, the B<Files-Excluded> and
+B<Files-Excluded->I<component> stanzas are a part of the first paragraph and
+there is a blank line before the following paragraphs which contain B<Files>
+and other stanzas.  See B<uscan>(1) "COPYRIGHT FILE EXAMPLE".)
 
 The archive type for B<zip> is detected by "B<file --dereference --brief
 --mime-type>" command.  So any B<zip> type archives such as B<jar> are treated
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 427ec65..475569b 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1112,7 +1112,11 @@ B<v20.5> is the newest tag, the above example downloads I<spkg>B<-20.5.tar.xz>.
 =head1 COPYRIGHT FILE EXAMPLES
 
 Here is an example for the F<debian/copyright> file which initiates automatic
-repackaging of the upstream tarball into I<< <spkg>_<oversion>.orig.tar.gz >>:
+repackaging of the upstream tarball into I<< <spkg>_<oversion>.orig.tar.gz >>
+(In F<debian/copyright>, the B<Files-Excluded> and
+B<Files-Excluded->I<component> stanzas are a part of the first paragraph and
+there is a blank line before the following paragraphs which contain B<Files>
+and other stanzas.):
 
   Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
   Files-Excluded: exclude-this
@@ -1121,6 +1125,8 @@ repackaging of the upstream tarball into I<< <spkg>_<oversion>.orig.tar.gz >>:
    .*
    */js/jquery.js
 
+   Files: *
+   Copyright: ...
    ...
 
 Here is another example for the F<debian/copyright> file which initiates
@@ -1140,6 +1146,8 @@ I<< <spkg>_<oversion>.orig-bar.tar.gz >>:
    .*
    */js/jquery.js
 
+   Files: *
+   Copyright: ...
    ...
 
 See mk-origtargz(1).

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