瀏覽代碼

dpkg-source(1): Document that patches are expected to apply w/o any fuzz

Closes: #666752

Based-on-patch-by: Luca Capello <gismo@debian.org>
Guillem Jover 14 年之前
父節點
當前提交
b91478e1cf
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 3 0
      debian/changelog
  2. 5 2
      man/dpkg-source.1

+ 3 - 0
debian/changelog

@@ -8,6 +8,9 @@ dpkg (1.16.3) UNRELEASED; urgency=low
     contain newlines. Closes: #21722
   * Print errors while reading the file list files on a new line instead
     of just after the progress percentage. Closes: #552517
+  * Document in dpkg-source(1) that patches for source format “3.0 (quilt)”
+    are expected to apply without any fuzz. Closes: #666752
+    Based on a patch by Luca Capello <gismo@debian.org>.
 
   [ Updated dpkg translations ]
   * French (Christian Perrier)

+ 5 - 2
man/dpkg-source.1

@@ -20,7 +20,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
-.TH dpkg\-source 1 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2012-04-03" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-source \- Debian source package (.dsc) manipulation tool
 .
@@ -449,7 +449,10 @@ explicit options used for patch application (stored on each line
 after the patch filename and one or more spaces), it does ignore those
 options and always expect patches that can be applied with the \fB\-p1\fP
 option of \fBpatch\fP. It will thus emit a warning when it encounters
-such options, and the build is likely to fail.
+such options, and the build is likely to fail. Note also that starting
+with \fBdpkg\-source\fP 1.15.5.3, patches are expected to apply without
+any fuzz, and they will cause an error otherwise; such patches can be
+fixed by refreshing them with quilt.
 .PP
 Similarly to quilt's default behaviour, the patches can remove files too.
 .PP