Merged pseudopackages branch

diff --git a/ChangeLog b/ChangeLog
index d65764e0330a7af0e380b3ac61e28c780602ce26..12ad5189ad600a19c104f16ad7a06a3d7f865ff6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-02  Joerg Jaspert  <joerg@debian.org>
 
+       * config/debian/pseudo-packages*: Removed listarchives, closes #468667
+       added wiki.debian.org (currently pointing to debian-www), closes #194206
+       added security-tracker, closes #436152
+       added release.debian.org, closes #451005
+
        * config/debian/cron.buildd: Cleanup unreachable code. (If someone
        still wants it - its in revision control...)
 

diff --git a/config/debian/pseudo-packages.description b/config/debian/pseudo-packages.description
index fd201c80a9a2b0b487f7833de736de1d77f036f8..ab08f8f45f6b921fa773c47c3b972b0dca5e4bc6 100644 (file)
--- a/config/debian/pseudo-packages.description
+++ b/config/debian/pseudo-packages.description
@@ -5,7 +5,6 @@ press                   Press release issues
 kernel                 Problems with the Linux kernel, or that shipped with Debian
 project                        Problems related to project administration
 general                        General problems (e.g. "many manpages are mode 755")
-listarchives           Problems with the WWW mailing list archives
 nm.debian.org          New Maintainer process and nm.debian.org webpages
 qa.debian.org          The Quality Assurance group
 ftp.debian.org         Problems with the FTP site
@@ -20,3 +19,6 @@ security.debian.org   The Debian Security Team
 installation-reports   Reports of installation problems with stable & testing
 upgrade-reports                Reports of upgrade problems for stable & testing
 release-notes          Problems with the Release Notes
+wiki.debian.org                Problems with the Debian wiki
+security-tracker       The Debian Security Bug Tracker
+release.debian.org     Requests regarding Debian releases and release team tools

diff --git a/config/debian/pseudo-packages.maintainers b/config/debian/pseudo-packages.maintainers
index 10ded94fac7fddce2ca534921fe63f93c4a9dce4..37401fec3bdb3c354f67f007f2a42e25090133e2 100644 (file)
--- a/config/debian/pseudo-packages.maintainers
+++ b/config/debian/pseudo-packages.maintainers
@@ -7,7 +7,6 @@ nm.debian.org           New Maintainer Front-Desk <new-maintainer@debian.org>
 qa.debian.org          debian-qa@lists.debian.org
 www.debian.org         Debian WWW Team <debian-www@lists.debian.org>
 mirrors                        Debian Mirrors Team <mirrors@debian.org>
-listarchives           Debian List Archive Team <listarchives@debian.org>
 project                        debian-project@lists.debian.org
 general                        debian-devel@lists.debian.org
 kernel                 Debian Kernel Team <debian-kernel@lists.debian.org>
@@ -20,3 +19,6 @@ security.debian.org     Debian Security Team <team@security.debian.org>
 installation-reports    Debian Install Team <debian-boot@lists.debian.org>
 upgrade-reports         Debian Testing Group <debian-testing@lists.debian.org>
 release-notes           Debian Documentation Team <debian-doc@lists.debian.org>
+wiki.debian.org         Debian WWW Team <debian-www@lists.debian.org>
+security-tracker        Debian Security Tracker Team <debian-security-tracker@lists.debian.org>
+release.debian.org      Debian Release Team <debian-release@lists.debian.org>