summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-03-01 13:59:02 +0100
committerTails developers <amnesia@boum.org>2012-03-01 13:59:02 +0100
commit69aac8175cba7929a1c9e89ee11bb5932d5aa8c7 (patch)
tree6011e52dba5cd025651dfc7e1ff0a9394c6739dd
parent69c017a299f3ea4bd824b54798240482544926ab (diff)
parenta79dd823244fc4d2b4129d7865a0495ebcbb0dc6 (diff)
Merge branch 'bugfix/build-with-iceweasel-10' into stable
-rw-r--r--config/chroot_apt/preferences44
1 files changed, 4 insertions, 40 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index d800249..c47912b 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -18,46 +18,6 @@ Package: iceweasel
Pin: origin mozilla.debian.net
Pin-Priority: 999
-Package: iceweasel-l10n-ar
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-de
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-es-es
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fa
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-fr
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-it
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-pt-pt
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-ru
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-zh-cn
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
-Package: iceweasel-l10n-vi
-Pin: release o=Debian,a=unstable
-Pin-Priority: 999
-
Package: libgnupg-interface-perl
Pin: origin backports.debian.org
Pin-Priority: 999
@@ -78,6 +38,10 @@ Package: libregexp-common-perl
Pin: release o=Debian,a=unstable
Pin-Priority: 999
+Package: libvpx0
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
Package: macchanger
Pin: release o=Debian,a=unstable
Pin-Priority: 999