Merge branch 'feature/build-from-snapshots' into feature/5926-freezable-APT-repository

5 files changed, 9 insertions, 66 deletions

diff --git a/config/APT_snapshots.d/debian-security/serial b/config/APT_snapshots.d/debian-security/serial
index e95b32e..a0f9a4b 100644
--- a/config/APT_snapshots.d/debian-security/serial
+++ b/config/APT_snapshots.d/debian-security/serial
@@ -1 +1 @@
-2015102601
+latest
diff --git a/config/APT_snapshots.d/debian/serial b/config/APT_snapshots.d/debian/serial
index e95b32e..a0f9a4b 100644
--- a/config/APT_snapshots.d/debian/serial
+++ b/config/APT_snapshots.d/debian/serial
@@ -1 +1 @@
-2015102601
+latest
diff --git a/config/APT_snapshots.d/tails/serial b/config/APT_snapshots.d/tails/serial
deleted file mode 100644
index e95b32e..0000000
--- a/config/APT_snapshots.d/tails/serial
+++ /dev/null
@@ -1 +0,0 @@
-2015102601
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index e95b32e..a0f9a4b 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2015102601
+latest
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index e7ba534..452ca09 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -70,68 +70,8 @@ Package: libnet-dbus-perl
 Pin: release o=Debian Backports,n=jessie-backports
 Pin-Priority: 999
 
-Package: linux-base
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-compiler-gcc-4.8-x86
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-586
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-686-pae
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-amd64
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-3.16.0-4-common
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-3.16.0-4-586
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-3.16.0-4-686-pae
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-headers-3.16.0-4-amd64
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-586
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-686-pae
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-amd64
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-3.16.0-4-586
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-3.16.0-4-686-pae
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-image-3.16.0-4-amd64
-Pin: release o=Debian,n=jessie
-Pin-Priority: 999
-
-Package: linux-kbuild-3.16
-Pin: release o=Debian,n=jessie
+Package: monkeysphere
+Pin: release o=Debian,n=stretch
 Pin-Priority: 999
 
 Package: monkeysphere
@@ -176,6 +116,10 @@ Pin: release o=Debian,n=jessie-updates
 Pin-Priority: 990
 
 Package: *
+Pin: release o=Debian,n=jessie/updates
+Pin-Priority: 990
+
+Package: *
 Pin: release o=Debian,n=jessie
 Pin-Priority: 990