X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=88c47e041a1e25de361eef8b97d5a6ed6a9cf935;hp=d71b6bf577bd3ce2516bf0eb54c8c9d760305cd3;hb=fc3fa15399366fcaaee863a1775d3121c510a56d;hpb=4f34e38836226cc26ce45af08006c771a3dc28d1

diff --git a/common.ent b/common.ent
index d71b6bf..88c47e0 100644
--- a/common.ent
+++ b/common.ent
@@ -9,8 +9,8 @@
 
 <!-- volatile information -->
 
-<!entity number-of-pkgs "4500">
-<!entity number-of-maintainers "500">
+<!entity number-of-pkgs "5500">
+<!entity number-of-maintainers "600">
 
 <!-- standard information -->
 <!entity fsf-addr "Free Software Foundation,
@@ -26,33 +26,37 @@
 <!entity www-host "&www-debian-org;">
 <!entity lists-host "lists.debian.org">
 <!entity archive-host "archive.debian.org">
+<!entity keyserver-host "keyring.debian.org">
 
 <!entity url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
-<!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/">
+<!-- deprecate, this is dead
+  <!entity url-pkg-manual "http://&www-debian-org;/doc/packaging-manuals/packaging.html/"> -->
 <!entity url-social-contract "http://&www-debian-org;/social_contract">
 <!entity url-dfsg "&url-social-contract;#guidelines">
 <!entity url-debian-lists-subscribe "http://&www-debian-org;/MailingLists/subscribe">
 <!entity url-debian-lists "ftp://&ftp-debian-org;/debian/doc/mailing-lists.txt">
-<!entity url-debian-list-archives "http://&www-debian-org;/Lists-Archives/">
-<!entity url-debian-contacts "http://&www-debian-org;/devel/maintainer_contacts">
+<!entity url-lists-archives "http://&lists-host;/">
 <!entity url-bts "http://&www-debian-org;/Bugs/">
 <!entity url-bts-control "&url-bts;server-control.html">
 <!entity url-debian-mirrors "http://&www-debian-org;/distrib/ftplist">
 <!entity url-debian-mirroring "http://&www-debian-org;/mirror/">
 <!entity url-debian-ports "http://&www-debian-org;/ports/">
-<!entity url-wnpp "http://&www-debian-org;/doc/prospective-packages.html">
-<!entity url-cvsweb "http://cvs.debian.org/cgi-bin/cvsweb">
+<!entity url-wnpp "http://&www-debian-org;/devel/wnpp/">
+<!entity url-cvsweb "http://cvs.debian.org/">
 <!entity url-devel-machines "http://db.debian.org/machines.cgi">
 <!entity url-buildd "http://buildd.debian.org/">
-<!entity url-lintian "http://www.debian.org/lintian/">
+<!entity url-lintian "http://lintian.debian.org/">
 <!entity url-debian-qa "http://qa.debian.org/">
 <!entity url-debian-db "https://db.debian.org/">
 <!entity url-debian-db-doc "http://db.debian.org/doc-general.html">
+<!entity url-newmaint "http://&www-debian-org;/devel/join/newmaint">
+<!entity url-newmaint-checklist "http://&www-debian-org;/devel/join/nm-checklist">
+<!entity url-newmaint-db "http://nm.debian.org/">
 
 <!entity url-debian-keyring "ftp://&ftp-debian-org;/debian/doc/debian-keyring.tar.gz">
 <!entity url-readme-non-us "ftp://&ftp-debian-org;/debian/README.non-US">
 
-<!entity master-upload-dir "/home/Debian/ftp/private/project/Incoming/">
+<!entity us-upload-dir "/org/ftp.debian.org/incoming/">
 <!entity non-us-upload-dir "/org/non-us.debian.org/incoming/">
 <!entity url-chiark-readme "ftp://ftp.chiark.greenend.org.uk/pub/debian/private/project/README.how-to-upload">
 <!entity url-upload-erlangen "ftp://ftp.uni-erlangen.de/pub/Linux/debian/UploadQueue/">
@@ -60,12 +64,14 @@
 <!entity url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">
 
 <!-- 
-     URLs, non-debbin
+     URLs, non-debian
   -->
 <!entity url-gnu-manifesto "http://www.gnu.org/gnu/manifesto.html">
 <!entity url-gpl "http://www.gnu.org/copyleft/gpl.html">
 <!entity url-pgp-faq "http://www.cam.ac.uk.pgp.net/pgpnet/pgp-faq/">
 <!entity url-rfc2440 "http://www.gnupg.org/rfc2440.html">
+<!entity url-u.s.-export "http://www.bxa.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html">
+<!entity url-notification-of-export "http://www.bxa.doc.gov/Encryption/">
 
 <!-- Debian email addresses -->
 <!entity email-listmaster "<email>listmaster@&lists-host;</email>">
@@ -78,7 +84,7 @@
 <!entity email-debian-mentors "<email>debian-mentors@&lists-host;</email>">
 <!entity email-debian-private "<email>debian-private@&lists-host;</email>">
 <!entity email-debian-policy "<email>debian-policy@&lists-host;</email>">
-<!entity email-debian-user "<email>debian-policy@&lists-host;</email>">
+<!entity email-debian-user "<email>debian-user@&lists-host;</email>">
 <!entity email-debian-qa "<email>debian-qa@&lists-host;</email>">
 <!entity email-debian-release "<email>debian-release@&lists-host;</email>">
 <!entity email-debian-email "<email>debian-email@&lists-host;</email>">
@@ -112,47 +118,66 @@
 	    </list>">
 
 <!--
-     misc, non-debbin
+     misc, non-debian
   -->
 <!entity pgp-keyserv "<tt>pgp5.ai.mit.edu</tt>">
 <!entity file-keyservs "<file>/usr/doc/pgp/keyserv.doc</file>">
 
 <!entity sample-dist-dirtree "<example>
-main/
-main/binary-all/
-main/binary-all/admin/
-main/binary-all/base/
-main/binary-all/comm/
-main/binary-all/devel/
+dists/stable/main/
+dists/stable/main/binary-all/
+dists/stable/main/binary-all/admin/
+dists/stable/main/binary-all/base/
+dists/stable/main/binary-all/comm/
+dists/stable/main/binary-all/devel/
      ...
-main/binary-i386/
-main/binary-i386/admin/
-main/binary-i386/base/
+dists/stable/main/binary-i386/
+dists/stable/main/binary-i386/admin/
+dists/stable/main/binary-i386/base/
      ...
-main/binary-m68k
-main/binary-m68k/admin/
-main/binary-m68k/base/
+dists/stable/main/binary-m68k/
+dists/stable/main/binary-m68k/admin/
+dists/stable/main/binary-m68k/base/
      ...
-main/source/
-main/source/admin/
-main/source/base/
+dists/stable/main/source/
+dists/stable/main/source/admin/
+dists/stable/main/source/base/
      ...
-main/disks-i386/
-main/disks-m68k/
+dists/stable/main/disks-i386/
+dists/stable/main/disks-m68k/
      ...
 
-contrib/
-contrib/binary-all/
-contrib/binary-i386/
-contrib/binary-m68k/
+dists/stable/contrib/
+dists/stable/contrib/binary-all/
+dists/stable/contrib/binary-i386/
+dists/stable/contrib/binary-m68k/
      ...
-contrib/source/
-
-non-free/
-non-free/binary-all/
-non-free/binary-i386/
-non-free/binary-m68k/
-         ...
-non-free/source/
-</example>">
+dists/stable/contrib/source/
+
+dists/stable/non-free/
+dists/stable/non-free/binary-all/
+dists/stable/non-free/binary-i386/
+dists/stable/non-free/binary-m68k/
+     ...
+dists/stable/non-free/source/
+
+dists/testing
+[everything like in stable]
+
+dists/unstable
+[ditto]
 
+pool/
+pool/a/
+pool/a/apt/
+     ...
+pool/b/
+pool/b/bash/
+     ...
+pool/liba/
+pool/liba/libalias-perl/
+     ...
+pool/m/
+pool/m/mailx/
+     ...
+</example>">