Просмотр исходного кода

deb-control(5): Add missing mentions of the Breaks field

Alongside the other fields sharing the same syntax.

Closes: #590472
Osamu Aoki лет назад: 16
Родитель
Сommit
6d181ade5c
2 измененных файлов с 9 добавлено и 2 удалено
  1. 3 0
      debian/changelog
  2. 6 2
      man/deb-control.5

+ 3 - 0
debian/changelog

@@ -101,6 +101,9 @@ dpkg (1.15.8) UNRELEASED; urgency=low
     Russell Coker <russell@coker.com.au>. Closes: #587949
   * Add -F option to dpkg-buildpackage to be able to explicitly specify a
     normal full build and combine it with -nc. Closes: #547993
+  * Add missing mentions of the Breaks field alongside the other fields
+    sharing the same syntax in deb-control(5).
+    Thanks to Osamu Aoki <osamu@debian.org>. Closes: #590472
 
   [ Updated programs translations ]
   * Catalan (Guillem Jover).

+ 6 - 2
man/deb-control.5

@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2007-10-08" "Debian Project" "Debian"
+.TH deb\-control 5 "2010-07-29" "Debian Project" "Debian"
 .SH NAME
 deb\-control \- Debian packages' master control file format
 .
@@ -185,15 +185,19 @@ server from having to know the package names for all of them, and using
 `|' to separate the list.
 .LP
 The syntax of
+.BR Breaks ,
 .BR Conflicts ,
 .B Replaces
 and
 .B Provides
 is a list of package names, separated by commas (and optional whitespace).
 In the
+.B Breaks
+and
 .B Conflicts
-field, the comma should be read as `OR'. An optional version can also be
+fields, the comma should be read as `OR'. An optional version can also be
 given with the same syntax as above for the
+.BR Breaks ,
 .B Conflicts
 and
 .B Replaces