Merge branch 'master' of ssh://db.debian.org/git/debian.org

diff --git a/.gitignore b/.gitignore
index 9a5879b77d5e00f8759e965569f6bcfbac2807c4..f87e819f3ff13872bec2df7314147401ae46dc16 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+debian/debian.org-backports.debian.org.debhelper.log
+debian/debian.org-backports.debian.org/
 debian/debian.org-bugs.debian.org-mx.debhelper.log
 debian/debian.org-bugs.debian.org-mx/
 debian/debian.org-bugs.debian.org.debhelper.log
@@ -10,6 +12,8 @@ debian/debian.org-ftpmaster.debian.org.debhelper.log
 debian/debian.org-ftpmaster.debian.org/
 debian/debian.org-manpages.debian.org.debhelper.log
 debian/debian.org-manpages.debian.org/
+debian/debian.org-nm.debian.org.debhelper.log
+debian/debian.org-nm.debian.org/
 debian/debian.org-packages.debian.org.debhelper.log
 debian/debian.org-packages.debian.org/
 debian/debian.org-patch-tracker.debian.org.debhelper.log
@@ -18,6 +22,8 @@ debian/debian.org-planet.debian.org.debhelper.log
 debian/debian.org-planet.debian.org/
 debian/debian.org-recommended.debhelper.log
 debian/debian.org-recommended/
+debian/debian.org-release.debian.org.debhelper.log
+debian/debian.org-release.debian.org/
 debian/debian.org-testing-security.debian.org.debhelper.log
 debian/debian.org-testing-security.debian.org/
 debian/debian.org-www-master.debian.org.debhelper.log

diff --git a/debian/changelog b/debian/changelog
index 72b7e110768c7767e7fd5713d00dbea5d3c67a30..b8780dcce7b2fd8491c500b1be7dc0aeef268b40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
-debian.org (3X) XXXXXX; urgency=low
+debian.org (41.1) stable; urgency=low
 
-  * unreleased
+  * -recommended:
+    - Fix typo/copy error.
+    - lshw isn't available on *bsd either.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 09 Sep 2010 17:12:43 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 10 Sep 2010 20:32:07 +0200
+
+debian.org (41) stable; urgency=low
+
+  * debian.org-buildd.debian.org: Fix the moreutils versioned dependency.
+  * Split -recommended-linux off of -recommended, so we can install
+    the latter on kfreebsd hosts.  Also keep a few tools in -recommended
+    that do not yet exist on freebsd but might eventually (have not+gnu-linux
+    as an alternative for them for now).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 10 Sep 2010 20:22:55 +0200
+
+debian.org (40) stable; urgency=low
+
+  * Remove acpid from debian.org-recommended.  >= 2.0 doesn't exist in
+    stable.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu, 09 Sep 2010 20:56:24 +0200
 
 debian.org (39) stable; urgency=low
 

diff --git a/debian/control b/debian/control
index 9cdcf96c2a2e91319c8a1cbbee7042f2d73d0017..7e7c6cec4bc3ba0d463ebc00b98eded654044918 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -16,25 +16,29 @@ Description: DSA's host metapackage
  debian.org host, and conflicts with packages that should never be
  installed.
 
+Package: debian.org-recommended-linux
+Architecture: all
+Depends: vlan, ifenslave, bridge-utils, iproute,
+       strace
+Description: metapackage to pull in recommended, but not essential tools for linux system
+ This package depends on packages that are recommended to  be installed on
+ every Linux debian.org host but are not essential.
+
 Package: debian.org-recommended
 Architecture: all
 Depends: debian.org,
+       debian.org-recommended-linux | not+gnu-linux,
        molly-guard
        ,
-       acpid (>= 2.0) | not+amd64,
-       acpid (>= 2.0) | not+i386,
-       acpid (>= 2.0) | not+ia64,
-       ,
        man-db
        ,
-       vlan, ifenslave, bridge-utils
-       ,
        subversion, rcs, git-core, bzr,
                git-svn,
                subversion-tools,
                mercurial,
        ,
-       mtr-tiny, tcpdump, iproute, traceroute, tcptraceroute, ndisc6,
+       mtr-tiny, tcpdump, tcptraceroute, ndisc6,
+       traceroute | not+gnu-linux,
        bind9-host, dnsutils, whois
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
@@ -49,15 +53,16 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
-       lshw,
+       lshw | not+gnu-linux,
        dmidecode | not+amd64,
        dmidecode | not+i386,
        dmidecode | not+ia64
        ,
-       mcelog | not+amd64,
-       mcelog | not+i386
+       mcelog | not+amd64 | not+gnu-linux,
+       mcelog | not+i386 | not+gnu-linux
        ,
-       htop, lsof, psmisc
+       htop, psmisc,
+       lsof | not+gnu-linux,
        ,
        mc,
                genisoimage,
@@ -80,8 +85,6 @@ Depends: debian.org,
        ,
        timeout | coreutils (>= 8.0-1)
        ,
-       strace
-       ,
        wget, curl, lftp, ftp,
        ,
        dput
@@ -252,7 +255,7 @@ Depends: edos-distcheck,
        r-cran-lattice,
        postgresql-8.4, postgresql-8.4-debversion,
        php5,
-       moreutils (>= 0.39)
+       moreutils (>= 0.39~)
 Description: metapackages for buildd.debian.org dependencies
  This package depends on everything that is needed for a buildd.debian.org.