From 929d17295cac5bae29fccebb5c0c5205d10b0826 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Thu, 9 Feb 2012 22:22:33 +0100
Subject: [PATCH] rationalisation du group non-free

Ignore-this: e9a45ab1a90ac158e15958fee47f10ab

darcs-hash:20120209212233-28565-6a8d334f9fe8ac8ec39754638ddec6f8aed3cef8.gz
---
 Metadata/groups.xml         | 6 ++++++
 Python/etc/apt/sources.list | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 2fa5ad9..44ab2be 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -377,6 +377,8 @@
   <Group name="etch" category="debian-version"/>
   <Group name="squeeze" category="debian-version"/>
 
+  <Group name="non-free" category="debian-version"/>
+
   <!-- +=================+ -->
   <!-- | Le groupe crans | -->
   <!-- +=================+ -->
@@ -514,6 +516,10 @@
        serveur, sans se soucier des programmes reellement utilises
        pour accomplir leur role. -->
 
+  <Group name="firmware-bnx2" comment="firmware pour interface réseau hp">
+    <Group name="non-free" />
+  </Group>
+
   <!-- *** Mail *** -->
 
   <Group name="mail-mx-main"
diff --git a/Python/etc/apt/sources.list b/Python/etc/apt/sources.list
index 074d6b3..eb12666 100644
--- a/Python/etc/apt/sources.list
+++ b/Python/etc/apt/sources.list
@@ -30,7 +30,7 @@ else:
     else:
         source("ftp://security.debian.org/debian-security %s/updates main" % distro)
 
-    if has("firmware-bnx2"):
+    if has("non-free"):
         source("%s/debian %s main contrib non-free" % (repo, distro))
     else:
         source("%s/debian %s main contrib" % (repo, distro))