From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 2 Mar 2013 15:24:08 +0000 (+0100)
Subject: Make debian.org-recommended arch any so we can replace type-handling dependencies... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f6305146a641052a862eefe5d0f1474b94ef15ad;p=dsa-metapackages.git

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

diff --git a/debian/changelog b/debian/changelog
index 24e4ee0..3553233 100644
--- 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}.
@@ -48,6 +48,10 @@ debian.org (50) UNRELEASED; urgency=low
   [ 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
diff --git a/debian/control b/debian/control
index 2e271ad..0d756cc 100644
--- 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
-Architecture: all
+Architecture: any
 Depends: debian.org,
 	busybox-static,
-	debian.org-recommended-linux | not+gnu-linux,
+	debian.org-recommended-linux [linux-any],
 	molly-guard
 	,
 	man-db
@@ -42,8 +42,8 @@ Depends: debian.org,
 		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
@@ -58,18 +58,15 @@ Depends: debian.org,
 	,
 	dsa-nagios-checks
 	,
-	lshw | not+gnu-linux,
-	dmidecode | not+amd64,
-	dmidecode | not+i386,
-	dmidecode | not+ia64
+	lshw [linux-any],
+	dmidecode [amd64 i386 ia64]
 	,
 	ipython
 	,
-	mcelog | not+amd64 | not+gnu-linux,
-	mcelog | not+i386 | not+gnu-linux,
+	mcelog [amd64 i386]
 	,
 	htop, psmisc,
-	lsof | not+gnu-linux
+	lsof [linux-any],
 	,
 	ncdu,
 	mc,