X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=pkgs.dbk;h=873c42c4e7d0678c609153727434f581e58401f8;hp=03a6919e5bbbe3305c540100a252aec66f86ebb3;hb=192df44824cca867c032346c74c654dfe40974f0;hpb=f9fbe52cef0055dc018fbc1d16f118e4283b7756
diff --git a/pkgs.dbk b/pkgs.dbk
index 03a6919..873c42c 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -290,9 +290,9 @@ There are several possible values for this field: stable,
unstable.
-Actually, there are two other possible distributions: stable-security
-and testing-security, but read
- for more information on those.
+Actually, there are other possible distributions:
+codename-security,
+but read for more information on those.
It is not possible to upload a package into several distributions at the same
@@ -443,8 +443,8 @@ parameter to put the package into one of the queues.
Security uploads
Do NOT upload a package to the security
-upload queue (oldstable-security, stable-security,
-etc.) without prior authorization from the security team. If the
+upload queue (on security-master.debian.org)
+without prior authorization from the security team. If the
package does not exactly meet the team's requirements, it will cause many
problems and delays in dealing with the unwanted upload. For details, please
see .
@@ -843,10 +843,9 @@ fixing them themselves, sending security advisories, and maintaining
When you become aware of a security-related bug in a Debian package, whether or
not you are the maintainer, collect pertinent information about the problem,
-and promptly contact the security team, preferably by filing a ticket in
-their Request Tracker.
-See .
-Alternatively you may email &email-security-team;.
+and promptly contact the security team by emailing &email-security-team;. If
+desired, email can be encrypted with the Debian Security Contact key, see
+ for details.
DO NOT UPLOAD any packages for
stable without contacting the team. Useful information
includes, for example:
@@ -1122,11 +1121,10 @@ Be sure to verify the following items:
Target the right distribution
-in your debian/changelog.
-For stable this is stable-security and
-for testing this is testing-security, and for the previous
-stable release, this is oldstable-security. Do not target
-distribution-proposed-updates or
+in your debian/changelog:
+codename-security
+(e.g. wheezy-security).
+Do not target distribution-proposed-updates or
stable!
@@ -1154,8 +1152,9 @@ later distributions. If in doubt, test it with dpkg
--compare-versions. Be careful not to re-use a version number that
you have already used for a previous upload, or one that conflicts with a
binNMU. The convention is to append
-+codename1, e.g.
-1:2.4.3-4+lenny1, of course increasing 1 for any subsequent
++debXu1 (where
+X is the major release number), e.g.
+1:2.4.3-4+deb7u1, of course increasing 1 for any subsequent
uploads.
@@ -1194,8 +1193,8 @@ have such a system yourself, you can use a debian.org machine (see
Uploading the fixed package
Do NOT upload a package to the security
-upload queue (oldstable-security, stable-security,
-etc.) without prior authorization from the security team. If the
+upload queue (on security-master.debian.org)
+without prior authorization from the security team. If the
package does not exactly meet the team's requirements, it will cause many
problems and delays in dealing with the unwanted upload.