diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | doc/README.feature-removal-schedule | 9 | ||||
| -rw-r--r-- | man/dpkg-source.1 | 29 | ||||
| -rwxr-xr-x | scripts/dpkg-source.pl | 2 |
4 files changed, 43 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 74d3fed94..ba1a89ad1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,17 @@ -dpkg (1.15.6.2) experimental; urgency=low +dpkg (1.15.6.2) UNRELEASED; urgency=low + + [ Raphaël Hertzog ] + * Clarify the plan concerning dpkg-source, debian/source/format and + the default source format in dpkg-source(1). Add a warning + in dpkg-source to invite people to always create debian/source/format. + We deprecate the fallback to "1.0" (it's there for backwards compatibility + only) and debian/source/format is going to be mandatory at some point in + the future. Closes: #553928 [ Updated man page translations ] * German (Helge Kreutzmann). - -- Helge Kreutzmann <debian@helgefjell.de> Sun, 28 Mar 2010 17:37:20 +0200 + -- Raphaël Hertzog <hertzog@debian.org> Sun, 28 Mar 2010 16:46:04 +0200 dpkg (1.15.6.1) experimental; urgency=low diff --git a/doc/README.feature-removal-schedule b/doc/README.feature-removal-schedule index 57d562649..f7d0cc017 100644 --- a/doc/README.feature-removal-schedule +++ b/doc/README.feature-removal-schedule @@ -1,5 +1,14 @@ This is a list of features that are scheduled to be removed from dpkg. +What: fallback of dpkg-source to source format "1.0" without explicit debian/source/format +Status: deprecated +When: 1.17.x +Warning: program and lintian (missing-debian-source-format) +Why: + With the support of multiple source formats, the user should be explicit + about the desired source format. The fallback to "1.0" is there only for + backwards compatiblity but will be removed once all packages have the + debian/source/format file. This is unlikely to happen before 1.17.x. What: Source-Version (substvar) Status: obsolete diff --git a/man/dpkg-source.1 b/man/dpkg-source.1 index 86db209ba..3aed42d83 100644 --- a/man/dpkg-source.1 +++ b/man/dpkg-source.1 @@ -59,9 +59,10 @@ additional parameters might be accepted. found in this ordered list: the format indicated with the \fI\-\-format\fP command-line option, the format indicated in \fBdebian/source/format\fP, -"1.0". See section -\fBSOURCE PACKAGE FORMATS\fP for an extensive description of the various -source package formats. +"1.0". The fallback to "1.0" is deprecated and will be removed at some +point in the future, you should always document the desired source format +in \fBdebian/source/format\fP. See section \fBSOURCE PACKAGE FORMATS\fP +for an extensive description of the various source package formats. .TP .RI "\fB\-\-print\-format\fP " directory @@ -205,10 +206,10 @@ of the official Debian keyrings and \fI/usr/share/keyrings/debian-maintainers.gpg\fP). .SH SOURCE PACKAGE FORMATS -If you don't know what source format you should use, you should probably -pick either "3.0 (quilt)" or "3.0 (native)". They will become the default -formats in the near future. See http://wiki.debian.org/Projects/DebSrc3.0 -for information on the deployment of those formats within Debian. +If you don't know what source format to use, you should probably pick +either "3.0 (quilt)" or "3.0 (native)". See +http://wiki.debian.org/Projects/DebSrc3.0 for information on the +deployment of those formats within Debian. .SS Format: 1.0 A source package in this format consists either of a \fB.orig.tar.gz\fP @@ -529,6 +530,20 @@ don't have any non-ignored uncommitted changes. Then the VCS specific part of the source directory is copied over to a temporary directory. Before this temporary directory is packed in a tarball, various cleanup are done to save space. +.SH WARNINGS AND ERRORS +.SS no source format specified in debian/source/format +The file \fBdebian/source/format\fP should always exist and indicate the +desired source format. For backwards compatibility, format "1.0" is +assumed when the file doesn't exist but you should not rely on this: +at some point in the future dpkg-source will be modified to fail when that +file doesn't exist. + +The rationale is that format "1.0" is no longer the recommended format, +you should usually pick one of the newer formats ("3.0 (quilt)", "3.0 +(native)") but \fBdpkg-source\fP will not do this automatically for you. +If you want to continue using the old format, you should be explicit about +it and put "1.0" in \fBdebian/source/format\fP. + .SH FILE FORMATS .SS debian/source/format This file contains on a single line the format that should be used to diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index c2e37c9b8..d290e3eab 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -300,6 +300,8 @@ if ($options{'opmode'} =~ /^(-b|--print-format)$/) { chomp($build_format); close(FORMAT); } else { + warning(_g("no source format specified in %s, " . + "see dpkg-source(1)"), "debian/source/format"); $build_format = "1.0"; } } |