Match -si option description in dpkg-buildpackage to dpkg-genchanges

Closes: #493743

ChangeLog

@@ -1,3 +1,9 @@
+2008-08-15  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-buildpackage.pl (usage): Fix description of -si option.
+	* man/dpkg-buildpackage.1: Match description of -si option with the
+	one from dpkg-genchanges.1.
+
 2008-08-15  Raphael Hertzog  <hertzog@debian.org>
 
 	* Dpkg/Source/Package.pm (new): Call init_options() only if

debian/changelog

@@ -25,6 +25,8 @@ dpkg (1.14.21) UNRELEASED; urgency=low
     errors occurred while configuring or removing packages.
     Thanks to Ian Jackson <ian@davenant.greenend.org.uk>. Closes: #483655
   * Move lzma from dpkg Suggests to Pre-Depends. Closes: #456332
+  * Match description of -si option in dpkg-buildpackage to the one in
+    dpkg-genchanges. Closes: #493743
 
   [ Updated scripts translations ]
   * Russian (Yuri Kozlov). Closes: #490076

man/dpkg-buildpackage.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2008-03-14" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2008-08-15" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
@@ -30,11 +30,10 @@ included in the upload if any source is being generated (i.e.
 haven't been used).
 .TP
 .B \-si
-By default, or if specified, the original source will be included if the
-version number ends in
-.BR \-0 " or " \-1 ,
-i.e. if the Debian revision part of the version number is
-.BR 0 " or " 1 .
+By default, or if specified, the original source will be included only if
+the upstream version number (the version without epoch and without Debian
+revision) differs from the upstream version number of the previous
+changelog entry.
 .TP
 .B \-sa
 Forces the inclusion of the original source.

scripts/dpkg-buildpackage.pl

@@ -59,7 +59,7 @@ Options:
   -m<maint>      maintainer for package is <maint>.    }
   -e<maint>      maintainer for release is <maint>.    } only passed
   -C<descfile>   changes are described in <descfile>.  } to dpkg-genchanges
-  -si (default)  src includes orig for rev. 0 or 1.    }
+  -si (default)  src includes orig if new upstream.    }
   -sa            uploaded src always includes orig.    }
   -sd            uploaded src is diff and .dsc only.   }
   -sn            force Debian native source format.      }