X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=351acd0504684322f80819ace1ffd4fea0b3edd6;hp=e90fad8fec4428bb85f96aa0bb36f31975987ff5;hb=d291c3aa43e7eca1303204812fe5323b6af9040d;hpb=a52b7e8c084a73282543e5e870ae8c68ed2abcb1

diff --git a/common.ent b/common.ent
index e90fad8..351acd0 100644
--- a/common.ent
+++ b/common.ent
@@ -10,20 +10,21 @@
 
 <!-- volatile information -->
 
-<!ENTITY number-of-pkgs "9000">
-<!ENTITY number-of-maintainers "900">
+<!ENTITY number-of-pkgs "15000">
+<!ENTITY number-of-maintainers "1000">
 
-<!ENTITY number-of-arches "12">
+<!ENTITY number-of-arches "11">
 
 <!-- standard information -->
 <!ENTITY fsf-addr "Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA">
-<!ENTITY file-GPL "<filename>/usr/share/common-licenses/GPL</filename>">
+<!ENTITY file-GPL "<filename>/usr/share/common-licenses/GPL-2</filename>">
 <!ENTITY debian-formal "Debian GNU/Linux">
 
 <!--
      URLs, Debian
   -->
+<!ENTITY master-host "master.debian.org">
 <!ENTITY www-debian-org "www.debian.org">
 <!ENTITY ftp-debian-org "ftp.debian.org">
 <!ENTITY lists-host "lists.debian.org">
@@ -33,8 +34,10 @@
 <!ENTITY bugs-host "bugs.debian.org">
 <!ENTITY pts-host "packages.qa.debian.org">
 <!ENTITY ftp-master-host "ftp-master.debian.org">
-<!ENTITY ftp-master-mirror "merkel.debian.org">
-<!ENTITY non-us-host "non-us.debian.org">
+<!ENTITY ftp-upload-host "ftp.upload.debian.org">
+<!ENTITY ftp-eu-upload-host "ftp.eu.upload.debian.org">
+<!ENTITY ssh-upload-host "ssh.upload.debian.org">
+<!ENTITY ftp-master-mirror "ries.debian.org">
 <!ENTITY upload-queue "/pub/UploadQueue/">
 
 <!ENTITY url-debian-policy "http://&www-debian-org;/doc/debian-policy/">
@@ -61,6 +64,8 @@
 <!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-release-wb "http://release.debian.org/wanna-build.txt">
+<!ENTITY url-wb-team "http://lists.debian.org/debian-project/2009/03/msg00096.html">
 <!ENTITY url-lintian "http://lintian.debian.org/">
 <!ENTITY url-debian-qa "http://qa.debian.org/">
 <!ENTITY url-debian-qa-orphaned "&url-debian-qa;orphaned.html">
@@ -75,27 +80,42 @@
 <!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-gpg-coord "http://wiki.debian.org/Keysigning">
 <!ENTITY url-debian-security-advisories "http://&www-debian-org;/security/">
 <!ENTITY url-tech-ctte "http://&www-debian-org;/devel/tech-ctte">
 <!ENTITY url-ddpo "http://qa.debian.org/developer.php">
+<!ENTITY url-dcg "http://people.debian.org/~enrico/dcg/">
+<!ENTITY url-rt "https://rt.debian.org/">
+<!ENTITY url-wiki-dm "http://wiki.debian.org/DebianMaintainer">
+<!ENTITY url-i18n-doc-check "http://svn.debian.org/wsvn/d-i/trunk/manual/scripts/doc-check?op=file">
+<!ENTITY url-i18n-l10n "http://people.debian.org/~jfs/debconf6/html/">
+<!ENTITY url-i18n-intro "http://&www-debian-org;/doc/manuals/intro-i18n/">
+<!ENTITY url-ddtp "http://ddtp.debian.net/">
+<!ENTITY url-l10n "http://&www-debian-org;/intl/l10n/">
+<!ENTITY url-dep3 "http://dep.debian.net/deps/dep3/">
 
 <!ENTITY url-incoming "http://incoming.debian.org/">
 <!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
+<!ENTITY url-low-threshold-nmu "http://wiki.debian.org/LowThresholdNmu">
+<!ENTITY url-orphaned-not-qa "http://qa.debian.org/orphaned.html">
+<!ENTITY url-dehs "http://dehs.alioth.debian.org/">
+<!ENTITY url-buildd-p-a-s "http://buildd.debian.org/quinn-diff/Packages-arch-specific">
+
 <!-- deprecated -->
 
-<!ENTITY url-mentors "http://people.debian.org/~mpalmer/debian-mentors_FAQ.html">
+<!ENTITY url-mentors "http://wiki.debian.org/DebianMentorsFaq">
 
 <!ENTITY url-rules-files "http://arch.debian.org/arch/private/srivasta/">
 
 <!ENTITY url-dmup "http://&www-debian-org;/devel/dmup">
 <!ENTITY url-worldmap "http://&www-debian-org;/devel/developers.loc">
 
-<!ENTITY url-i18n-doc-check "http://cvs.debian.org/boot-floppies/documentation/doc-check?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">
-
 <!ENTITY url-eg-desc-upstream-info "http://&packages-host;/unstable/web/wml">
 
 <!ENTITY url-alioth "http://alioth.debian.org/">
+<!ENTITY url-alioth-pkg "http://wiki.debian.org/Alioth/PackagingProject">
+<!ENTITY url-alioth-wiki "http://wiki.debian.org/Alioth">
+<!ENTITY url-alioth-faq "http://wiki.debian.org/Alioth/FAQ">
 
 <!-- 
      URLs, non-debian
@@ -106,10 +126,14 @@
 <!ENTITY url-rfc2440 "http://www.rfc-editor.org/rfc/rfc2440.txt">
 <!ENTITY url-openprojects "http://www.freenode.net/">
 <!ENTITY url-oftc "http://www.oftc.net/oftc/">
+<!ENTITY url-l10n-tp "http://translationproject.org/">
+<!ENTITY url-l10n-gnome "http://live.gnome.org/TranslationProject">
+<!ENTITY url-l10n-kde "http://i18n.kde.org/">
 
 <!-- Debian email addresses -->
 <!ENTITY email-listmaster "<email>listmaster@&lists-host;</email>">
 <!ENTITY email-devel-ref "<email>developers-reference@&packages-host;</email>">
+<!ENTITY email-debian-account-manager "<email>da-manager@debian.org</email>">
 <!ENTITY email-debian-changes "<email>debian-changes@lists.debian.org</email>">
 <!ENTITY email-debian-devel "<email>debian-devel@&lists-host;</email>">
 <!ENTITY email-debian-devel-announce "<email>debian-devel-announce@&lists-host;</email>">
@@ -128,12 +152,12 @@
 <!ENTITY email-debian-security-announce "<email>debian-security-announce@&lists-host;</email>">
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
 <!ENTITY email-mia "<email>mia@qa.debian.org</email>">
-
-<!ENTITY email-debian-admin "<email>debian-admin@debian.org</email>">
+<!ENTITY email-keyring "<email>keyring@rt.debian.org</email>">
+<!ENTITY email-rt-dsa "<email>admin@rt.debian.org</email>">
 <!ENTITY email-ftpmaster "<email>ftpmaster@debian.org</email>">
-<!ENTITY email-override "<email>override-change@debian.org</email>">
 <!ENTITY email-bts-control "<email>control@&bugs-host;</email>">
 <!ENTITY email-security-team "<email>team@security.debian.org</email>">
+<!ENTITY email-nonfree-release "<email>nonfree@release.debian.org</email>">
 
 <!-- misc Debian info -->
 <!ENTITY file-bts-docs "<filename>/usr/share/doc/debian/bug-*</filename>">
@@ -141,6 +165,8 @@
 <!ENTITY file-ocaml-policy "<filename>/usr/share/doc/ocaml/ocaml_packaging_policy.gz</filename>">
 <!ENTITY file-lisp-controller "<filename>/usr/share/doc/common-lisp-controller/README.packaging</filename>">
 <!ENTITY file-debian-private-archive "~debian/archive/debian-private/">
+<!ENTITY file-debian-private-key "~debian/misc/irc-password">
+<!ENTITY file-debian-rt-password "~debian/misc/rt-password">
 <!ENTITY file-bpp-autotools "<filename>/usr/share/doc/autotools-dev/README.Debian.gz</filename>">
 
 <!ENTITY cron-bug-report '0 17 * * fri   echo "index maint <replaceable>address</replaceable>" | mail request@&bugs-host;'>
@@ -151,28 +177,28 @@
 <!ENTITY pgp-keyserv "<literal>subkeys.pgp.net</literal>">
 
 <!ENTITY sample-dist-dirtree "<screen>dists/stable/main/
+dists/stable/main/binary-amd64/
+dists/stable/main/binary-armel/
 dists/stable/main/binary-i386/
-dists/stable/main/binary-m68k/
-dists/stable/main/binary-alpha/
      ...
 dists/stable/main/source/
      ...
+dists/stable/main/disks-amd64/
+dists/stable/main/disks-armel/
 dists/stable/main/disks-i386/
-dists/stable/main/disks-m68k/
-dists/stable/main/disks-alpha/
      ...
 
 dists/stable/contrib/
+dists/stable/contrib/binary-amd64/
+dists/stable/contrib/binary-armel/
 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-amd64/
+dists/stable/non-free/binary-armel/
 dists/stable/non-free/binary-i386/
-dists/stable/non-free/binary-m68k/
-dists/stable/non-free/binary-alpha/
      ...
 dists/stable/non-free/source/
 
@@ -205,8 +231,8 @@ pool/main/liba/libalias-perl/
 pool/main/m/
 pool/main/m/mailx/
      ...
-pool/non-free/n/
-pool/non-free/n/netscape/
+pool/non-free/f/
+pool/non-free/f/firmware-nonfree/
      ...</screen>">
 
 <!ENTITY example-uu "<programlisting>uuencode-file: