Merge remote-tracking branch 'qubesos/master'

2015-09-16 17:08:46 +02:00 · 2015-09-16 17:08:46 +02:00 · 3df2363093
commit 3df2363093
parent 5796c78979 d08f0cf0a4
2 changed files with 0 additions and 11 deletions
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@ -1128,16 +1128,6 @@
    </packagelist>
  </group>

-  <group>
-    <id>debian-7</id>
-    <name>Debian 7 (wheezy) template</name>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq>qubes-template-debian-7</packagereq>
-    </packagelist>
-  </group>
-
  <group>
    <id>debian-8</id>
    <name>Debian 8 (jessie) template</name>
--- a/conf/qubes-kickstart.cfg
+++ b/conf/qubes-kickstart.cfg
@ -23,6 +23,5 @@ repo --name=dom0-updates --baseurl=file:///tmp/qubes-installer/yum/dom0-updates/
@qubes
@anaconda-tools
@qubes-dom0-debug
-@debian-7
@debian-8
 %end