From 0808200988a182be172f20818a9274dab0d40a7f Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 26 Dec 2011 10:39:45 -0800 Subject: [PATCH] Retire the separate MIME Policy document MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Merge its short contents into Policy 9.7 rather than maintaining a separate document. Wording: Ben Finney Seconded: Russ Allbery Seconded: Raphaël Hertzog Seconded: Andrew McMillan Closes: #89038 --- .gitignore | 1 - Makefile | 1 - README.org | 1 - debian-mime-policy.desc | 18 ----- debian/changelog | 6 ++ debian/rules | 6 +- mime-policy.sgml | 149 --------------------------------------- policy.sgml | 27 +++++-- upgrading-checklist.sgml | 4 ++ 9 files changed, 33 insertions(+), 180 deletions(-) delete mode 100644 debian-mime-policy.desc delete mode 100644 mime-policy.sgml diff --git a/.gitignore b/.gitignore index 5b2eb84..b07ee68 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /debconf_spec/debconf_specification.txt.gz /head.tmp /menu-policy.html/ -/mime-policy.html/ /perl-policy.html/ /policy.html/ /stamp-build diff --git a/Makefile b/Makefile index 9ab6801..1f3675c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ include debian/rules policy.sgml: version.ent menu-policy.sgml: version.ent -mime-policy.sgml: version.ent perl-policy.sgml: version.ent %.txt: %.org diff --git a/README.org b/README.org index 2be9c51..db4ed52 100644 --- a/README.org +++ b/README.org @@ -141,7 +141,6 @@ In addition to the main technical manual, the team currently also maintains: + [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/][Machine-readable debian/copyright format]] + [[http://www.debian.org/doc/packaging-manuals/menu-policy/][Debian Menu sub-policy]] + [[http://www.debian.org/doc/packaging-manuals/perl-policy/][Debian Perl Policy]] -+ [[http://www.debian.org/doc/packaging-manuals/mime-policy/][Debian MIME support sub-policy]] + [[http://www.debian.org/doc/packaging-manuals/debconf_specification.html][Debconf Specification]] + [[http://www.debian.org/doc/packaging-manuals/virtual-package-names-list.txt][Authoritative list of virtual package names ]] diff --git a/debian-mime-policy.desc b/debian-mime-policy.desc deleted file mode 100644 index 512e483..0000000 --- a/debian-mime-policy.desc +++ /dev/null @@ -1,18 +0,0 @@ -Document: debian-mime-policy -Title: Debian MIME Policy Manual -Author: The Debian Policy Mailing list -Abstract: This manual describes the policy requirements for the MIME - system in the Debian distribution, describing the rules - regulating the registration of programs that can handle MIME - content. -Section: Debian - -Format: debiandoc-sgml -Files: /usr/share/doc/debian-policy/mime-policy.sgml.gz - -Format: text -Files: /usr/share/doc/debian-policy/mime-policy.txt.gz - -Format: HTML -Index: /usr/share/doc/debian-policy/mime-policy.html/index.html -Files: /usr/share/doc/debian-policy/mime-policy.html/*.html diff --git a/debian/changelog b/debian/changelog index 7b4343f..b7b3df0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,12 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low Seconded: Cyril Brulebois Seconded: Raphaël Hertzog Closes: #23712 + * MIME Policy: Retire this document and merge it with Policy + Wording: Ben Finney + Seconded: Russ Allbery + Seconded: Raphaël Hertzog + Seconded: Andrew McMillan + Closes: #89038 * Consistently use "Debian source control file" for *.dsc files and "Source package control file" for debian/control files. Patch from Charles Plessy. (Closes: #626796) diff --git a/debian/rules b/debian/rules index 6a28033..c80e348 100755 --- a/debian/rules +++ b/debian/rules @@ -32,9 +32,9 @@ LIBDIR := $(TMPTOP)/usr/share/doc-base sanitycheck := debian/rules policy.sgml -SGML_FILES := policy menu-policy mime-policy perl-policy upgrading-checklist -DESC_FILES := copyright-format debian-policy debian-menu-policy debian-perl-policy \ - debian-mime-policy debconf-spec fhs +SGML_FILES := policy menu-policy perl-policy upgrading-checklist +DESC_FILES := copyright-format debian-policy debian-menu-policy \ + debian-perl-policy debconf-spec fhs # While we have two versions of the FHS installed in the source package, # we need to modify this to handle it. This is the easiest way to do it. diff --git a/mime-policy.sgml b/mime-policy.sgml deleted file mode 100644 index e05ee4a..0000000 --- a/mime-policy.sgml +++ /dev/null @@ -1,149 +0,0 @@ - - %versiondata; -]> - - - - - - The Debian MIME support sub-policy - - J.H.M. Dassen (Ray) - jdassen@debian.org - - - The Debian Policy mailing List - debian-policy@lists.debian.org - - version &version;, &date; - - - This manual describes the policy requirements for the MIME support - system used in the Debian distribution. This - document is part of the policy package for Debian. The policy - package itself is maintained by a group of maintainers that - have no editorial powers. At the moment, the list of - maintainers is: - - -

Julian Gilbey J.D.Gilbey@qmw.ac.uk

- - -

Manoj Srivastava srivasta@debian.org

- - - - - - - - Copyright ©1999 . - -

- This manual is free software; you may redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version - 2, or (at your option) any later version. -

- -

- This is distributed in the hope that it will be useful, but - without any warranty; without even the implied - warranty of merchantability or fitness for a particular - purpose. See the GNU General Public License for more - details. -

-

- A copy of the GNU General Public License is available as - /usr/share/common-licenses/GPL in the Debian - distribution or on the World Wide Web at . You can also obtain it by writing - to the Free Software Foundation, Inc., 51 Franklin St, Fifth - Floor, Boston, MA 02110-1301, USA. -

- - - - - - - About this document -

- This document is distributed as the mime-policy files - in the Debian package - . - It is also available from the Debian web mirrors at - . -

- - - - MIME support mechanism -

- If you need assistance implementing this sub-policy, please - please ask for it on the debian-devel mailing list. If you - have proposals for changes or additions to this sub-policy, - please bring it up on debian-policy. -

- - Background -

- MIME (Multipurpose Internet Mail Extensions, RFC 1521) is - a mechanism for encoding files and datastreams and providing - meta-information about them, in particular their type (e.g. audio - or video) and format (e.g. PNG, HTML, MP3). -

- -

- Registration of MIME type handlers allows programs like mail - user agents and web browsers to to invoke these handlers to - view, edit or display MIME types they don't support directly. -

- - - - - MIME support implementation -

- The mime-support package provides the - update-mime program which allows packages to - register programs that can show, compose, edit or print - MIME types. -

- -

- Packages containing such programs must register them - with update-mime as documented in . They should not depend - on, recommend, or suggest mime-support. Instead, - they should just put something like the following in the - postinst and postrm scripts: - - - if [ -x /usr/sbin/update-mime ]; then - update-mime - fi - -

- - - - - - - diff --git a/policy.sgml b/policy.sgml index 8ad0613..79281e9 100644 --- a/policy.sgml +++ b/policy.sgml @@ -258,7 +258,6 @@ - @@ -7301,7 +7300,7 @@ Reloading description configuration...done. MIME (Multipurpose Internet Mail Extensions, RFCs 2045-2049) is a mechanism for encoding files and data streams and providing meta-information about them, in particular their - type (e.g. audio or video) and format (e.g. PNG, HTML, + type (e.g. audio or video) and format (e.g. PNG, HTML, MP3).

@@ -7318,11 +7317,25 @@ Reloading description configuration...done.

- The MIME support policy can be found in the mime-policy - files in the debian-policy package. - It is also available from the Debian web mirrors at - . + The mime-support package provides the + update-mime program which allows packages to + register programs that can show, compose, edit or print + MIME types. +

+ +

+ Packages containing such programs must register them + with update-mime as documented in . They should not depend + on, recommend, or suggest mime-support. Instead, + they should just put something like the following in the + postinst and postrm scripts: + + + if [ -x /usr/sbin/update-mime ]; then + update-mime + fi +

diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml index 4f698a8..dc62283 100644 --- a/upgrading-checklist.sgml +++ b/upgrading-checklist.sgml @@ -73,6 +73,10 @@ Unreleased. Debian maintainers involved in the creation of the package (although note that the requirement to list copyright information is unchanged). +mime + Retire this separate document and merge its (short) contents into + Policy section 9.7. There are no changes to the requirements. + perl Packages may declare an interest in the perl-major-upgrade trigger to be notified of major upgrades of perl. -- 2.39.2