add syslog-ng (>= 3.1) to debian.org, add acpid (>= 2.0) to debian.org-recommended

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/debian/changelog b/debian/changelog
index e030d62d3093906d2fae4dafd72c4770bcfde665..683e86a917c4bbea41f24111d78253d49dad5133 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 debian.org (39) stable; urgency=low
 
 debian.org (39) stable; urgency=low
 

+  [ Joerg Jaspert ]

   * More updates for the ftpmaster package.
 
   * More updates for the ftpmaster package.
 

- -- Joerg Jaspert <joerg@debian.org>  Sun, 04 Jul 2010 14:44:12 +0200
+  [ Martin Zobel-Helas ]
+  * add syslog-ng (>= 3.1) to debian.org.
+  * add acpid (>= 2.0) to debian.org-recommended.
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Wed, 11 Aug 2010 14:10:07 +0200

 
 debian.org (38) stable; urgency=low
 
 
 debian.org (38) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 55ab3e8d7f75786145cfb36e50ece37532703b1d..36172aa91d1992b8072eeb093746038f00bc47f7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.1
 
 Package: debian.org
 Architecture: all
 
 Package: debian.org
 Architecture: all

-Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate
+Depends: userdir-ldap, zsh, tcsh, pdksh, ksh, csh, ntp, locales-all, exim4-daemon-heavy | postfix, sudo, libpam-pwdfile, vim, munin-node, gnupg, bzip2, cacert-spi | ca-certificates (>> 20080411), ed, cron, dialog, libterm-readline-gnu-perl, logrotate, syslog-ng (>= 3.1)

 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage
 Recommends: debian.org-recommended
 Conflicts: dchroot-dsa (<= 2:1)
 Description: DSA's host metapackage


@@ -21,6 +21,10 @@ Architecture: all
 Depends: debian.org,
        molly-guard
        ,
 Depends: debian.org,
        molly-guard
        ,

+       acpid (>= 2.0) | not+amd64,
+       acpid (>= 2.0) | not+i386,
+       acpid (>= 2.0) | not+ia64,
+       ,

        man-db
        ,
        vlan, ifenslave, bridge-utils
        man-db
        ,
        vlan, ifenslave, bridge-utils