From a81dc11cab0ab8d0d496568bfa0a8a398d1aac1e Mon Sep 17 00:00:00 2001 From: hertzog Date: Wed, 12 Oct 2011 07:50:39 +0000 Subject: [PATCH] Refresh some ftpmaster-related information. Closes: #643932 Thanks to Luca Falavigna for the patch. git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@8943 313b444b-1b9f-4f58-a734-7bb04f332e8d --- best-pkging-practices.dbk | 14 +++++++------- debian/changelog | 2 ++ pkgs.dbk | 38 +++++++++++++++++++------------------- resources.dbk | 26 +++++++++++++------------- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/best-pkging-practices.dbk b/best-pkging-practices.dbk index bd2270b..f7b5a7b 100644 --- a/best-pkging-practices.dbk +++ b/best-pkging-practices.dbk @@ -1680,7 +1680,7 @@ in order to ease deborphan's job.
-Best practices for <filename>.orig.tar.{gz,bz2,lzma}</filename> files +Best practices for <filename>.orig.tar.{gz,bz2,xz}</filename> files There are two kinds of original source tarballs: Pristine source and repackaged upstream source. @@ -1689,7 +1689,7 @@ upstream source. Pristine source The defining characteristic of a pristine source tarball is that the -.orig.tar.{gz,bz2,lzma} file is byte-for-byte identical to a tarball officially +.orig.tar.{gz,bz2,xz} file is byte-for-byte identical to a tarball officially distributed by the upstream author. We cannot prevent upstream authors from changing the tarball they distribute without also incrementing the version number, so there can be no guarantee that a pristine @@ -1699,7 +1699,7 @@ identical to something that upstream once did distribute. If a difference arises later (say, if upstream notices that he wasn't using maximal compression in his original distribution and then re-gzips it), that's just too bad. Since there is no good -way to upload a new .orig.tar.{gz,bz2,lzma} for the same version, there is not even any +way to upload a new .orig.tar.{gz,bz2,xz} for the same version, there is not even any point in treating this situation as a bug. This makes it possible to use checksums to easily verify that all changes between Debian's version and upstream's are contained in the Debian diff. Also, if the original @@ -1753,17 +1753,17 @@ gzipped tar at all, or if upstream's tarball contains non-DFSG-free material that you must remove before uploading. -In these cases the developer must construct a suitable .orig.tar.{gz,bz2,lzma} +In these cases the developer must construct a suitable .orig.tar.{gz,bz2,xz} file himself. We refer to such a tarball as a repackaged upstream source. Note that a repackaged upstream source is different from a Debian-native package. A repackaged source still comes with Debian-specific -changes in a separate .diff.gz or .debian.tar.{gz,bz2,lzma} +changes in a separate .diff.gz or .debian.tar.{gz,bz2,xz} and still has a version number composed of upstream-version and debian-version. There may be cases where it is desirable to repackage the source even though -upstream distributes a .tar.{gz,bz2,lzma} that could in principle be +upstream distributes a .tar.{gz,bz2,xz} that could in principle be used in its pristine form. The most obvious is if significant space savings can be achieved by recompressing the tar archive or by removing genuinely useless cruft from the upstream @@ -1771,7 +1771,7 @@ archive. Use your own discretion here, but be prepared to defend your decision if you repackage source that could have been pristine. -A repackaged .orig.tar.{gz,bz2,lzma} +A repackaged .orig.tar.{gz,bz2,xz} diff --git a/debian/changelog b/debian/changelog index e045715..0477be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ developers-reference (3.4.7) UNRELEASED; urgency=low Thanks to Luca Falavigna for the patch. * Refresh some release-specific information. Closes: #643931 Based on a patch by Luca Falavigna. + * Refresh some ftpmaster-related information. Closes: #643932 + Thanks to Luca Falavigna for the patch. -- Raphaël Hertzog Tue, 06 Sep 2011 09:19:21 +0200 diff --git a/pkgs.dbk b/pkgs.dbk index 4eab6a4..4982194 100644 --- a/pkgs.dbk +++ b/pkgs.dbk @@ -231,11 +231,11 @@ accompanied by another file that contains the changes made by Debian For the native packages, the source package includes a Debian source control file (.dsc) and the source tarball -(.tar.{gz,bz2,lzma}). A source package of a non-native package +(.tar.{gz,bz2,xz}). A source package of a non-native package includes a Debian source control file, the original source tarball -(.orig.tar.{gz,bz2,lzma}) and the Debian changes +(.orig.tar.{gz,bz2,xz}) and the Debian changes (.diff.gz for the source format “1.0” or -.debian.tar.{gz,bz2,lzma} for the source format “3.0 (quilt)”). +.debian.tar.{gz,bz2,xz} for the source format “3.0 (quilt)”). With source format “1.0”, whether a package is native or not was determined @@ -268,7 +268,7 @@ the archive. Please notice that, in non-native packages, permissions on files that are not -present in the *.orig.tar.{gz,bz2,lzma} will not be preserved, as diff does not store file +present in the *.orig.tar.{gz,bz2,xz} will not be preserved, as diff does not store file permissions in the patch. However when using source format “3.0 (quilt)”, permissions of files inside the debian directory are preserved since they are stored in a tar archive. @@ -470,11 +470,11 @@ not support delayed uploads. The Debian archive maintainers are responsible for handling package uploads. For the most part, uploads are automatically handled on a daily basis by the -archive maintenance tools, katie. Specifically, updates to -existing packages to the unstable distribution are handled -automatically. In other cases, notably new packages, placing the uploaded -package into the distribution is handled manually. When uploads are handled -manually, the change to the archive may take up to a month to occur. Please +archive maintenance tools, dak process-upload. Specifically, +updates to existing packages to the unstable distribution are +handled automatically. In other cases, notably new packages, placing the +uploaded package into the distribution is handled manually. When uploads are +handled manually, the change to the archive may take some time to occur. Please be patient. @@ -1171,7 +1171,7 @@ version, you may upload without upstream source (dpkg-buildpackage Be sure to use the exact same -*.orig.tar.{gz,bz2,lzma} as used in the +*.orig.tar.{gz,bz2,xz} as used in the normal archive, otherwise it is not possible to move the security fix into the main archives later. @@ -1257,7 +1257,7 @@ control information to place the package in the desired section, and re-upload the package (see the Debian Policy Manual for details). You must ensure that you include the -.orig.tar.{gz,bz2,lzma} in your upload (even if you are not uploading +.orig.tar.{gz,bz2,xz} in your upload (even if you are not uploading a new upstream version), or it will not appear in the new section together with the rest of the package. If your new section is valid, it will be moved automatically. If it does not, then contact the ftpmasters in order to @@ -1311,11 +1311,11 @@ automatically after the package has been removed from There is one exception when an explicit removal request is not necessary: If a -(source or binary) package is an orphan, it will be removed semi-automatically. -For a binary-package, this means if there is no longer any source package -producing this binary package; if the binary package is just no longer produced -on some architectures, a removal request is still necessary. For a -source-package, this means that all binary packages it refers to have been +(source or binary) package is no longer built from source, it will be removed +semi-automatically. For a binary-package, this means if there is no longer any +source package producing this binary package; if the binary package is just no +longer produced on some architectures, a removal request is still necessary. For +a source-package, this means that all binary packages it refers to have been taken over by another source package. @@ -1970,9 +1970,9 @@ might be helpful. While preparing the patch, you should better be aware of any package-specific -practices that the maintainer might be using. Taking them into account reduces -the burden of getting your changes integrated back in the normal package -workflow and thus increases the possibilities that that will happen. A good +practices that the maintainer might be using. Taking them into account +reduces the burden of integrating your changes into the normal package +workflow and thus increases the chances that integration will happen. A good place where to look for for possible package-specific practices is debian/README.source. diff --git a/resources.dbk b/resources.dbk index fbe53c7..8844be6 100644 --- a/resources.dbk +++ b/resources.dbk @@ -562,26 +562,26 @@ file: file or both an .orig.tar.gz and a .diff.gz file; with format “3.0 (quilt)”, it has a mandatory -.orig.tar.{gz,bz2,lzma} upstream tarball, -multiple optional .orig-component.tar.{gz,bz2,lzma} +.orig.tar.{gz,bz2,xz} upstream tarball, +multiple optional .orig-component.tar.{gz,bz2,xz} additional upstream tarballs and a mandatory -debian.tar.{gz,bz2,lzma} debian +debian.tar.{gz,bz2,xz} debian tarball; with format “3.0 (native)”, it has only -a single .tar.{gz,bz2,lzma} tarball. +a single .tar.{gz,bz2,xz} tarball. If a package is developed specially for Debian and is not distributed outside of Debian, there is just one -.tar.{gz,bz2,lzma} file which contains the sources of +.tar.{gz,bz2,xz} file which contains the sources of the program, it's called a “native” source package. If a package is distributed elsewhere too, the -.orig.tar.{gz,bz2,lzma} file stores the so-called +.orig.tar.{gz,bz2,xz} file stores the so-called upstream source code, that is the source code that's distributed by the upstream maintainer (often the author of the software). In this case, the .diff.gz -or the debian.tar.{gz,bz2,lzma} contains the changes +or the debian.tar.{gz,bz2,xz} contains the changes made by the Debian maintainer. @@ -738,7 +738,7 @@ with a few warnings in the description, but that isn't recommended because packages from unstable are expected to propagate to testing and thus to stable. You should not be afraid to use experimental since it does not -cause any pain to the ftpmasters, the experimental packages are automatically +cause any pain to the ftpmasters, the experimental packages are periodically removed once you upload the package in unstable with a higher version number. @@ -848,10 +848,10 @@ by a daemon called queued, signed *.changes-files are moved together with their corresponding files to the unchecked directory. This directory is not visible for most Developers, as ftp-master is restricted; it -is scanned every 15 minutes by the katie script, which -verifies the integrity of the uploaded packages and their cryptographic +is scanned every 15 minutes by the dak process-upload script, +which verifies the integrity of the uploaded packages and their cryptographic signatures. If the package is considered ready to be installed, it is moved -into the accepted directory. If this is the first upload +into the done directory. If this is the first upload of the package (or it has new binary packages), it is moved to the new directory, where it waits for approval by the ftpmasters. If the package contains files to be installed by hand it is moved @@ -1027,7 +1027,7 @@ report status changes. upload-source -The email notification from katie when an uploaded source +The email notification from dak when an uploaded source package is accepted. @@ -1036,7 +1036,7 @@ package is accepted. katie-other -Other warning and error emails from katie (such as an +Other warning and error emails from dak (such as an override disparity for the section and/or the priority field). -- 2.30.2