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

[Kai Hendry]

The following commit has been merged in the master branch:
commit d267140adbbbe21047d3d1a15669f29884e2244e
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Jun 19 13:16:57 2011 +0200

    newer flash

diff --git a/webconverger/config/chroot_apt/preferences b/webconverger/config/chroot_apt/preferences
index a2fe7be..01f9ac3 100644
--- a/webconverger/config/chroot_apt/preferences
+++ b/webconverger/config/chroot_apt/preferences
@@ -1,3 +1,6 @@
 Package: *
 Pin: release n=artax-backports
 Pin-Priority: 999
+Package: *
+Pin: release n=artax
+Pin-Priority: 999
diff --git a/webconverger/config/chroot_sources/artax-restricted.binary b/webconverger/config/chroot_sources/artax-restricted.binary
new file mode 120000
index 0000000..373cb5e
--- /dev/null
+++ b/webconverger/config/chroot_sources/artax-restricted.binary
@@ -0,0 +1 @@
+artax-restricted.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-backports.binary.gpg b/webconverger/config/chroot_sources/artax-restricted.binary.gpg
similarity index 100%
copy from webconverger/config/chroot_sources/artax-backports.binary.gpg
copy to webconverger/config/chroot_sources/artax-restricted.binary.gpg
diff --git a/webconverger/config/chroot_sources/artax-restricted.chroot b/webconverger/config/chroot_sources/artax-restricted.chroot
new file mode 100644
index 0000000..c1347be
--- /dev/null
+++ b/webconverger/config/chroot_sources/artax-restricted.chroot
@@ -0,0 +1 @@
+deb http://archive.progress-technologies.net/progress/ artax main contrib non-free  restricted
diff --git a/webconverger/config/chroot_sources/artax-backports.binary.gpg b/webconverger/config/chroot_sources/artax-restricted.chroot.gpg
similarity index 100%
copy from webconverger/config/chroot_sources/artax-backports.binary.gpg
copy to webconverger/config/chroot_sources/artax-restricted.chroot.gpg

-- 
debian-live/config-webc