Преглед изворни кода

dpkg-source(1): more explanations for dpkg-source --commit

Clarify the conditions under which it's possible to pass an explicit patch
file to dpkg-source --commit (for "3.0 (quilt)" source packages). This
option has a very narrow purpose: it's mainly to avoid having to
regenerate the patch which can be a costly operation for large packages
and thus assumes several things that one should not forget when using it.
Raphaël Hertzog пре 14 година
родитељ
комит
1703dda822
2 измењених фајлова са 8 додато и 2 уклоњено
  1. 2 0
      debian/changelog
  2. 6 2
      man/dpkg-source.1

+ 2 - 0
debian/changelog

@@ -68,6 +68,8 @@ dpkg (1.16.2) UNRELEASED; urgency=low
     Closes: #651993
     Closes: #651993
   * Fix dpkg-source --commit on "3.0 (quilt)" when an explicit patch file
   * Fix dpkg-source --commit on "3.0 (quilt)" when an explicit patch file
     is given with a relative filename. Closes: #652414
     is given with a relative filename. Closes: #652414
+  * Further clarify in dpkg-source(1) the conditions under which it's possible
+    to pass an explicit patch file to dpkg-source --commit.
 
 
   [ Jonathan Nieder ]
   [ Jonathan Nieder ]
   * Bump po4a version in Build-Depends to 0.41, since earlier versions do
   * Bump po4a version in Build-Depends to 0.41, since earlier versions do

+ 6 - 2
man/dpkg-source.1

@@ -483,11 +483,15 @@ Generates a patch corresponding to the local changes that are not managed
 by the quilt patch system and integrates it in the patch system under
 by the quilt patch system and integrates it in the patch system under
 the name \fIpatch-name\fP. If the name is missing, it will be asked
 the name \fIpatch-name\fP. If the name is missing, it will be asked
 interactively. If \fIpatch-file\fP is given, it is used as the patch
 interactively. If \fIpatch-file\fP is given, it is used as the patch
-corresponding to the local changes to integrate. This is mainly useful
-after a build failure that pre-generated this file. Once integrated, an
+corresponding to the local changes to integrate. Once integrated, an
 editor is launched so that you can edit the meta-information in the patch
 editor is launched so that you can edit the meta-information in the patch
 header.
 header.
 
 
+Passing \fIpatch-file\fP is mainly useful after a build failure that
+pre-generated this file, and on this ground the given file is removed
+after integration. Note also that the changes contained in the patch file
+must already be applied on the tree and that the files modified by the
+patch must not have supplementary unrecorded changes.
 .PP
 .PP
 .B Build options
 .B Build options
 .TP
 .TP