From 48b6bc5e5ec4abfb0b14279293dd228ccf7c121c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sun, 27 Jul 2014 06:11:43 +0200
Subject: [PATCH] debian: add updates repo definition and key

---
 Makefile                       |   5 +++++
 debian/rules                   |   2 +-
 misc/qubes-archive-keyring.gpg | Bin 0 -> 1137 bytes
 misc/qubes-r2.list.in          |  11 +++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 misc/qubes-archive-keyring.gpg
 create mode 100644 misc/qubes-r2.list.in

diff --git a/Makefile b/Makefile
index 2e30ff9..b318c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -169,4 +169,9 @@ install-common:
 	install -d $(DESTDIR)/var/run/qubes
 	install -d $(DESTDIR)/home_volatile/user
 
+install-deb:
+	mkdir -p $(DESTDIR)/etc/apt/sources.list.d
+	sed -e "s/@DIST@/`cat /etc/debian_version | cut -d/ -f 1`/" misc/qubes-r2.list.in > $(DESTDIR)/etc/apt/sources.list.d/qubes-r2.list
+	install -D -m 644 misc/qubes-archive-keyring.gpg $(DESTDIR)/etc/apt/trusted.gpg.d/qubes-archive-keyring.gpg
+
 install-vm: install-rh install-common
diff --git a/debian/rules b/debian/rules
index b9fd0e7..9ce9ce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,6 @@ override_dh_auto_build:
 	make all
 
 override_dh_auto_install:
-	make install-common
+	make install-common install-deb
 	make -C qrexec install
 
diff --git a/misc/qubes-archive-keyring.gpg b/misc/qubes-archive-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..f8e60d27cae6263c1a685a55cfb49c50b4c1b868
GIT binary patch
literal 1137
zcmV-%1djWe0u2OH)Lq{J5CG-5zEh9wKHfx&{HsY!P}p-cSQ>MA<7>&zS{@^h;yHg?
zc<iN~x^T4H-Z$4iA4j*EVT;_S|4ki{HgTTm?gNhneRlsm&8gK7#Uy_GNb99jzMo<L
z*K6d1QTW1i^j(VjukJ@eC?p!cETO1SvIgB27La+y1BDRL!Qz)qVdy9qTpblc3AgT_
zwL6Ow?+8Q4Er$jl+z#DsX(rl0M42veYnr&FBIM3Lp73!<W9-O6CotM3E5%QP;=O8N
zX#B;9=H@3Z#)~W0DByx$gu;6bZ845q3`AfEP){@JiaWm(+%e%k%3$*TdNr5wu`-o^
zmQ%%2n4)8B|J5$K4pJs3MBQP5=eelgk80~Rup&FqqR!wyTMv_wG@fNn)V}Ef<$hEc
z)7Nih#p{?GMCjtogN5PGSD=$LQ6k4+e+&X*T367YSMZ9la(HxLMTzHmSS4NDOP`ai
zWJgW$i0djS;-^F%8@R14&QSSc9oI?DS%Parh`>xbfA~D0z{vD8Q!9&TG$}^fZvM|L
zPzM|j6E&~riI={2g%;l{_%c1l=`iJqDV-)*{>2B>Uf@ns_(t4EgxDRmnPMC7Nj{0u
zSELs-ht}?_?0ZA^AAVW>0Ht4t*I!&3N9q#LsD>PK11jf|X;Q>B@6sLu7frc?`Wyds
zq9$Uv1cOw$-FE;H0RRECBvEx@Wpf};Qy@fTVrgM+AW&grYhh<)b0AY`XKrb3XCO;u
zd5Hoz1QP)Q03rnfQ`BAG0viJc3ke7Z0|EvW2m%QT3j`Jd0|5da0Rk6*0162ZURW5b
zNBxre5MK}gqd2`jDFO0zqKwpo;RPY@u)?>zVe$F#3bSe2iI|=YR&0h8iV-_j&|0s`
zQmmw~ctx?t>`bZmCWyJ`($n8_PvT~5ZJ?q^d(qY4%y`m$ZVi`PmEu(o2hZ`2TH8;o
zqBjQV(2L1^*_7P*G7+v7`$hBdW25R2hX}c|D(2`dqu5fi%G0@Zpe?jBu(!FNI`V8{
zwZBa*2kBi)NX4J=(z}ib0_{TNH0NIHzMoO40{%ZjB{GZZ#D}kZu6cB5&XIwLC38OG
z#OuoQrg-|75o1h<T7u*Ki?*y`manIx%g~1nlTod`F#s#Mmyl74bMnVhij^aD@?OE9
z{4op$ER0jjz>g~)#9?z1;r%YfDw~^Su?sWg<GN`<(0?&m`dyZ3Q?w%7>{pKvcDt+-
zD+6_d6(!c>${!8Y4f-o*w+_H?8+TNr7}m+44)ttzI=~6VYP>t^=!Jz8w8kSRj3uJm
z_l%zip~g&bjxNk&GW$iQ>L_Um&~$}4yL6tZR4H!W--{~iBUEICu|yd4V_H9V=w9=~
zK2Hcn^K6szy<4-D41>-S$K6{g0_(SfgE)4Wlyab|nt_;tx(2nP7rCKwzAmdRC-=dS
z_FZF8j%wv%<F=d+1uRtz9{s{{4-@NUqGqf)m$>~t2zqjCXT&`tIKm*GkW^~A5ArEi
Dfp#Of

literal 0
HcmV?d00001

diff --git a/misc/qubes-r2.list.in b/misc/qubes-r2.list.in
new file mode 100644
index 0000000..77a444f
--- /dev/null
+++ b/misc/qubes-r2.list.in
@@ -0,0 +1,11 @@
+# Main qubes updates repository
+deb http://deb.qubes-os.org/r2/vm @DIST@ main
+deb-src http://deb.qubes-os.org/r2/vm @DIST@ main
+
+# Qubes updates candidates repository
+#deb http://deb.qubes-os.org/r2/vm @DIST@-testing main
+#deb-src http://deb.qubes-os.org/r2/vm @DIST@-testing main
+
+# Qubes experimental/unstable repository
+#deb http://deb.qubes-os.org/r2/vm @DIST@-unstable main
+#deb-src http://deb.qubes-os.org/r2/vm @DIST@-unstable main