Make debian.org-recommended arch any so we can replace type-handling dependencies...

diff --git a/debian/changelog b/debian/changelog
index 24e4ee08cd20abf7c3bd066c6d8be39ec938ae7d..3553233a8a9a5408c3bf561b90851746730f8400 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian.org (50) UNRELEASED; urgency=low
+debian.org (50) unstable; urgency=low

 
   [ Cyril Brulebois ]
   * release.debian.org: Add python-{networkx,pygraphviz}.
 
   [ Cyril Brulebois ]
   * release.debian.org: Add python-{networkx,pygraphviz}.


@@ -48,6 +48,10 @@ debian.org (50) UNRELEASED; urgency=low
   [ Holger Levsen ]
   * Add debian.org-piuparts.debian.org metapackage.
 
   [ Holger Levsen ]
   * Add debian.org-piuparts.debian.org metapackage.
 

+  [ Peter Palfrader ]
+  * Make debian.org-recommended arch any so we can replace type-handling
+    dependencies with [$arch] restricted dependencies.
+

  -- Peter Palfrader <weasel@debian.org>  Thu, 31 Jan 2013 14:14:38 +0100
 
 debian.org (49) unstable; urgency=low
  -- Peter Palfrader <weasel@debian.org>  Thu, 31 Jan 2013 14:14:38 +0100
 
 debian.org (49) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 2e271ad5ad8b01541c250e636ef8d433e6ed0cb1..0d756cca6b672c5ce8c7fc619f7d283271e8ad42 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,10 +27,10 @@ Description: metapackage to pull in recommended, but not essential tools for lin
  every Linux debian.org host but are not essential.
 
 Package: debian.org-recommended
  every Linux debian.org host but are not essential.
 
 Package: debian.org-recommended

-Architecture: all
+Architecture: any

 Depends: debian.org,
        busybox-static,
 Depends: debian.org,
        busybox-static,

-       debian.org-recommended-linux | not+gnu-linux,
+       debian.org-recommended-linux [linux-any],

        molly-guard
        ,
        man-db
        molly-guard
        ,
        man-db


@@ -42,8 +42,8 @@ Depends: debian.org,
                cvs
        ,
        mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng,
                cvs
        ,
        mtr-tiny, tcpdump, tcptraceroute, ndisc6, bwm-ng,

-       traceroute | not+gnu-linux,
-       iputils-tracepath | not+gnu-linux,
+       traceroute [linux-any],
+       iputils-tracepath [linux-any],

        bind9-host, dnsutils, whois, unbound-host
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21
        bind9-host, dnsutils, whois, unbound-host
        ,
        emacs23-nox | emacs23 | emacs22-nox | emacs22 | emacs21-nox | emacs21


@@ -58,18 +58,15 @@ Depends: debian.org,
        ,
        dsa-nagios-checks
        ,
        ,
        dsa-nagios-checks
        ,

-       lshw | not+gnu-linux,
-       dmidecode | not+amd64,
-       dmidecode | not+i386,
-       dmidecode | not+ia64
+       lshw [linux-any],
+       dmidecode [amd64 i386 ia64]

        ,
        ipython
        ,
        ,
        ipython
        ,

-       mcelog | not+amd64 | not+gnu-linux,
-       mcelog | not+i386 | not+gnu-linux,
+       mcelog [amd64 i386]

        ,
        htop, psmisc,
        ,
        htop, psmisc,

-       lsof | not+gnu-linux
+       lsof [linux-any],

        ,
        ncdu,
        mc,
        ,
        ncdu,
        mc,