[SCM] debian-live/config-webc branch, master, updated. 8c2aa7e076c4ebde1c0f9daa469e87e5cd54ce1a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8c2aa7e076c4ebde1c0f9daa469e87e5cd54ce1a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Dec 12 11:12:11 2010 +0100

    Because you need to pin repositories that are non automatic.

diff --git a/webconverger/config/chroot_apt/preferences b/webconverger/config/chroot_apt/preferences
new file mode 100644
index 0000000..5175ae7
--- /dev/null
+++ b/webconverger/config/chroot_apt/preferences
@@ -0,0 +1,3 @@
+Package: *
+Pin: release a=artax-backports
+Pin-Priority: 999
diff --git a/webconverger/config/chroot_sources/artax-backports.binary b/webconverger/config/chroot_sources/artax-backports.binary
new file mode 120000
index 0000000..33d469b
--- /dev/null
+++ b/webconverger/config/chroot_sources/artax-backports.binary
@@ -0,0 +1 @@
+artax-backports.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-backports.binary.gpg b/webconverger/config/chroot_sources/artax-backports.binary.gpg
new file mode 120000
index 0000000..b08c154
--- /dev/null
+++ b/webconverger/config/chroot_sources/artax-backports.binary.gpg
@@ -0,0 +1 @@
+artax-backports.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax.chroot b/webconverger/config/chroot_sources/artax-backports.chroot
similarity index 100%
rename from webconverger/config/chroot_sources/artax.chroot
rename to webconverger/config/chroot_sources/artax-backports.chroot
diff --git a/webconverger/config/chroot_sources/artax.chroot.gpg b/webconverger/config/chroot_sources/artax-backports.chroot.gpg
similarity index 100%
rename from webconverger/config/chroot_sources/artax.chroot.gpg
rename to webconverger/config/chroot_sources/artax-backports.chroot.gpg
diff --git a/webconverger/config/chroot_sources/artax.binary b/webconverger/config/chroot_sources/artax.binary
deleted file mode 120000
index 0b4c686..0000000
--- a/webconverger/config/chroot_sources/artax.binary
+++ /dev/null
@@ -1 +0,0 @@
-artax.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax.binary.gpg b/webconverger/config/chroot_sources/artax.binary.gpg
deleted file mode 120000
index 30c1af1..0000000
--- a/webconverger/config/chroot_sources/artax.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-artax.chroot.gpg
\ No newline at end of file

-- 
debian-live/config-webc