X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=2d4e4cd287e869fc4f8386eccd764f1b0931c7fe;hp=1041c6fc43a1e40bb4c343f3258f32c20dc2168f;hb=cdfe8d781e504566f443d9b05487e32f44f769bf;hpb=6f039f33e2bdb176791f6dca4aaad5eceb9add8b

diff --git a/common.ent b/common.ent
index 1041c6f..2d4e4cd 100644
--- a/common.ent
+++ b/common.ent
@@ -9,13 +9,16 @@
 
 <!-- volatile information -->
 
-<!entity number-of-pkgs "4500">
-<!entity number-of-maintainers "500">
+<!entity number-of-pkgs "9000">
+<!entity number-of-maintainers "800">
+
+<!entity number-of-arches "12">
 
 <!-- standard information -->
 <!entity fsf-addr "Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
 <!entity file-GPL "<file>/usr/share/common-licenses/GPL</file>">
+<!entity debian-formal "Debian GNU/Linux">
 
 <!--
      URLs, Debian
@@ -26,46 +29,73 @@
 <!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 packages-host "packages.debian.org">
+<!entity bugs-host "bugs.debian.org">
+<!entity pts-host "packages.qa.debian.org">
+<!entity ftp-master-host "ftp-master.debian.org">
+<!entity non-us-host "non-us.debian.org">
+<!entity master-host "master.debian.org">
+<!entity upload-queue "<ftppath>/pub/UploadQueue/</ftppath>">
 
 <!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;/devel/wnpp/">
+<!entity url-devel-docs "http://&www-debian-org;/devel/">
+<!entity url-vote "http://&www-debian-org;/vote/">
 <!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-newmaint-advocate "http://&www-debian-org;/devel/join/nm-advocate">
+<!entity url-newmaint-amchecklist "http://&www-debian-org;/devel/join/nm-amchecklist">
+<!entity url-newmaint-apply "http://nm.debian.org/newnm.php">
+<!entity url-newmaint-id "http://&www-debian-org;/devel/join/nm-step2">
+<!entity url-newmaint-guide "http://&www-debian-org;/doc/maint-guide/">
+<!entity url-gpg-coord "http://nm.debian.org/gpg.php">
 
 <!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 non-us-upload-dir "/org/non-us.debian.org/incoming/">
+<!entity url-testing-maint "http://ftp-master.debian.org/testing/">
+<!entity url-testing-faq "http://people.debian.org/~jules/testingfaq.html">
+<!entity url-incoming "http://incoming.debian.org">
+
+<!entity us-upload-dir "<file>/org/ftp.debian.org/incoming/</file>">
+<!entity non-us-upload-dir "<file>/org/non-us.debian.org/incoming/</file>">
 <!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/">
 <!entity url-upload-samosa "ftp://samosa.debian.org/pub/UploadQueue/">
 <!entity url-upload-jp "ftp://master.debian.or.jp/pub/Incoming/upload/">
 
+<!entity url-sponsors "http://www.internatif.org/bortzmeyer/debian/sponsor/">
+
 <!-- 
-     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 +108,8 @@
 <!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 orphan-address "&lt;packages@qa.debian.org&gt;">
 <!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>">
@@ -92,9 +123,11 @@
 <!entity email-bts-control "<email>control@bugs.debian.org</email>">
 
 <!-- misc Debian info -->
-<!entity file-mail-lists "<file>/usr/doc/debian/mailing-lists.txt</file>">
-<!entity file-bts-mailing "<file>/usr/doc/debian/bug-log-mailserver.txt</file>">
-<!entity file-bts-info "<file>/usr/doc/debian/bug-maint-info.txt</file>">
+<!entity file-mail-lists "<file>/usr/share/doc/debian/mailing-lists.txt</file>">
+<!entity file-bts-mailing "<file>/usr/share/doc/debian/bug-log-mailserver.txt</file>">
+<!entity file-bts-info "<file>/usr/share/doc/debian/bug-maint-info.txt</file>">
+<!entity file-bts-docs "<file>/usr/share/doc/debian/bug-*</file>">
+<!entity cron-bug-report '0 17 * * fri   echo "index maint <var>address</var>" | mail request@bugs.debian.org'>
 
 <!entity control-file-fields "<list compact>
 	      <item><tt>Format</tt>
@@ -112,47 +145,68 @@
 	    </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 file-keyservs "<file>/usr/share/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/
-     ...
-main/binary-i386/
-main/binary-i386/admin/
-main/binary-i386/base/
-     ...
-main/binary-m68k
-main/binary-m68k/admin/
-main/binary-m68k/base/
-     ...
-main/source/
-main/source/admin/
-main/source/base/
-     ...
-main/disks-i386/
-main/disks-m68k/
-     ...
-
-contrib/
-contrib/binary-all/
-contrib/binary-i386/
-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/main/
+dists/stable/main/binary-i386/
+dists/stable/main/binary-m68k/
+dists/stable/main/binary-alpha/
+     ...
+dists/stable/main/source/
+     ...
+dists/stable/main/disks-i386/
+dists/stable/main/disks-m68k/
+dists/stable/main/disks-alpha/
+     ...
 
+dists/stable/contrib/
+dists/stable/contrib/binary-i386/
+dists/stable/contrib/binary-m68k/
+dists/stable/contrib/binary-alpha/
+     ...
+dists/stable/contrib/source/
+
+dists/stable/non-free/
+dists/stable/non-free/binary-i386/
+dists/stable/non-free/binary-m68k/
+dists/stable/non-free/binary-alpha/
+     ...
+dists/stable/non-free/source/
+
+dists/testing/
+dists/testing/main/
+     ...
+dists/testing/contrib/
+     ...
+dists/testing/non-free/
+     ...
+
+dists/unstable
+dists/unstable/main/
+     ...
+dists/unstable/contrib/
+     ...
+dists/unstable/non-free/
+     ...
+
+pool/
+pool/main/a/
+pool/main/a/apt/
+     ...
+pool/main/b/
+pool/main/b/bash/
+     ...
+pool/main/liba/
+pool/main/liba/libalias-perl/
+     ...
+pool/main/m/
+pool/main/m/mailx/
+     ...
+pool/non-free/n/
+pool/non-free/n/netscape/
+     ...
+</example>">