summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-03-25 14:27:35 +0000
committerintrigeri <intrigeri@boum.org>2016-03-25 14:27:35 +0000
commitb87ea4d66f24ce6e2c00fc3307ba68260525a288 (patch)
tree8f8dd1ad5b1b3ed76b3e620f8ed28cff23fcf542 /config
parentb3ccf482b5e198ecd41c3e301834107380467d34 (diff)
parent68c62617d43d9e7dd0192f4dcc8ac5202faa494c (diff)
Merge branch 'feature/build-from-snapshots' into feature/5926-freezable-APT-repository
Diffstat (limited to 'config')
-rw-r--r--config/APT_snapshots.d/debian-security/serial2
-rw-r--r--config/APT_snapshots.d/debian/serial2
-rw-r--r--config/APT_snapshots.d/tails/serial1
-rw-r--r--config/APT_snapshots.d/torproject/serial2
-rw-r--r--config/chroot_apt/preferences68
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