X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=blobdiff_plain;f=common.ent;h=5687224159c3191d8fa7eb2ec7bf18ae8bdea91f;hp=c33b9cf5fef27179e7f7a6bdeab846762f2dc726;hb=ded22d4e923a6229cfe418445ae406114fe44853;hpb=81c0e6409c7dfef4af519821a76dbfadb7dd4758

diff --git a/common.ent b/common.ent
index c33b9cf..5687224 100644
--- a/common.ent
+++ b/common.ent
@@ -10,15 +10,15 @@
 
 <!-- volatile information -->
 
-<!ENTITY number-of-pkgs "12000">
+<!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">
 
 <!--
@@ -37,7 +37,7 @@
 <!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 "merkel.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/">
@@ -92,6 +92,7 @@
 <!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">
@@ -102,7 +103,7 @@
 
 <!-- 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/">
 
@@ -132,6 +133,7 @@
 <!-- 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>">
@@ -155,6 +157,7 @@
 <!ENTITY email-ftpmaster "<email>ftpmaster@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>">