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

deb(5): Add media type information

Add current, just approved new media type and the previous now deprecated
ones for reference.
Guillem Jover лет назад: 12
Родитель
Сommit
5aa87f8bbd
2 измененных файлов с 10 добавлено и 2 удалено
  1. 1 0
      debian/changelog
  2. 9 2
      man/deb.5

+ 1 - 0
debian/changelog

@@ -35,6 +35,7 @@ dpkg (1.17.10) UNRELEASED; urgency=low
       Based on a patch by Bernhard R. Link <brlink@debian.org>.
       Based on a patch by Bernhard R. Link <brlink@debian.org>.
       Closes: #746973
       Closes: #746973
     - Document that dpkg-buildpackage(1) -j argument is optional.
     - Document that dpkg-buildpackage(1) -j argument is optional.
+    - Add current and deprecated media types to deb(5).
   * Add support for automatic parallel job selection in dpkg-buildpackage,
   * Add support for automatic parallel job selection in dpkg-buildpackage,
     matching currently active processors, when using -jauto. Closes: #748012
     matching currently active processors, when using -jauto. Closes: #748012
   * Perl modules:
   * Perl modules:

+ 9 - 2
man/deb.5

@@ -3,7 +3,7 @@
 .\" Copyright © 1995 Raul Miller
 .\" Copyright © 1995 Raul Miller
 .\" Copyright © 1996 Ian Jackson <ian@chiark.chu.cam.ac.uk>
 .\" Copyright © 1996 Ian Jackson <ian@chiark.chu.cam.ac.uk>
 .\" Copyright © 2000 Wichert Akkerman <wakkerma@debian.org>
 .\" Copyright © 2000 Wichert Akkerman <wakkerma@debian.org>
-.\" Copyright © 2006-2013 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2006-2014 Guillem Jover <guillem@debian.org>
 .\"
 .\"
 .\" This is free software; you can redistribute it and/or modify
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
 .\" it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .
-.TH deb 5 "2013-08-08" "Debian Project" "Debian"
+.TH deb 5 "2014-05-24" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb \- Debian binary package format
 deb \- Debian binary package format
 .SH SYNOPSIS
 .SH SYNOPSIS
@@ -107,6 +107,13 @@ inserted before
 .B data.tar
 .B data.tar
 with names starting with something other than underscores, or will
 with names starting with something other than underscores, or will
 (more likely) cause the major version number to be increased.
 (more likely) cause the major version number to be increased.
+.SH MEDIA TYPE
+.SS Current
+application/vnd.debian.binary-package
+.SS Deprecated
+application/x-debian-package
+.br
+application/x-deb
 .SH SEE ALSO
 .SH SEE ALSO
 .BR deb\-old (5),
 .BR deb\-old (5),
 .BR dpkg\-deb (1),
 .BR dpkg\-deb (1),