From 19f610bba8a7b2e9dd942b09b955b4d7cc18e036 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Sat, 18 Dec 2010 00:58:10 +0000
Subject: Removed references to 2010.2 media and using correct path for update
 key.

---
 dvd_free32.xml | 27 ++-------------------------
 dvd_free64.xml | 27 ++-------------------------
 dvd_pwp32.xml  | 27 ++-------------------------
 dvd_pwp64.xml  | 23 -----------------------
 4 files changed, 6 insertions(+), 98 deletions(-)

diff --git a/dvd_free32.xml b/dvd_free32.xml
index 5c5e4df..ecf264b 100644
--- a/dvd_free32.xml
+++ b/dvd_free32.xml
@@ -103,35 +103,12 @@
 			</input>
 			<input name="lang">
 			</input>
-			<mediadir>updates</mediadir>
+			<mediadir>main</mediadir>
 			<destmedia>updates</destmedia>
 			<external name="2010.2">
 				<fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir>
 			</external>
-			<pubkey>media_info/pubkey</pubkey>
-			<release>yes</release>
-			<updates>no</updates>
-			<backport>no</backport>
-			<testing>no</testing>
-		</list>
-		<list name="2010.2" desc="2010.2 media">
-			<input name="base">
-				<file>lists/basesystem_mini</file>
-			</input>
-			<input name="kernel">
-			</input>
-			<input name="lang">
-			</input>
-			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>main2</mediadir>
-			<destmedia>main</destmedia>
-			<!--
-			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
-			-->
-			<external name="2010.2">
-				<fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir>
-			</external>
-			<pubkey>media_info/pubkey</pubkey>
+			<pubkey>updates/media_info/pubkey</pubkey>
 			<release>yes</release>
 			<updates>no</updates>
 			<backport>no</backport>
diff --git a/dvd_free64.xml b/dvd_free64.xml
index 3801312..881a656 100644
--- a/dvd_free64.xml
+++ b/dvd_free64.xml
@@ -96,29 +96,6 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-		<list name="2010.2" desc="2010.2 media">
-			<input name="base">
-				<file>lists/basesystem_mini</file>
-			</input>
-			<input name="kernel">
-			</input>
-			<input name="lang">
-			</input>
-			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>main2</mediadir>
-			<destmedia>main</destmedia>
-			<!--
-			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
-			-->
-			<external name="2010.2">
-				<fullpath_mediadir>/home/images/bcd/2010.1/x86_64/release</fullpath_mediadir>
-			</external>
-			<pubkey>media_info/pubkey</pubkey>
-			<release>yes</release>
-			<updates>no</updates>
-			<backport>no</backport>
-			<testing>no</testing>
-		</list>
 		<list name="updates" desc="updates media">
 			<input name="base">
 			</input>
@@ -126,12 +103,12 @@
 			</input>
 			<input name="lang">
 			</input>
-			<mediadir>updates</mediadir>
+			<mediadir>main</mediadir>
 			<destmedia>updates</destmedia>
 			<external name="2010.2">
 				<fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir>
 			</external>
-			<pubkey>media_info/pubkey</pubkey>
+			<pubkey>updates/media_info/pubkey</pubkey>
 			<release>yes</release>
 			<updates>no</updates>
 			<backport>no</backport>
diff --git a/dvd_pwp32.xml b/dvd_pwp32.xml
index 701162a..3a5ff9f 100644
--- a/dvd_pwp32.xml
+++ b/dvd_pwp32.xml
@@ -92,29 +92,6 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-		<list name="2010.2" desc="2010.2 media">
-			<input name="base">
-				<file>lists/basesystem_mini</file>
-			</input>
-			<input name="kernel">
-			</input>
-			<input name="lang">
-			</input>
-			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>main2</mediadir>
-			<destmedia>main</destmedia>
-			<!--
-			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
-			-->
-			<external name="2010.2">
-				<fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir>
-			</external>
-			<pubkey>media_info/pubkey</pubkey>
-			<release>yes</release>
-			<updates>no</updates>
-			<backport>no</backport>
-			<testing>no</testing>
-		</list>
 		<list name="updates" desc="updates media">
 			<input name="base">
 			</input>
@@ -122,12 +99,12 @@
 			</input>
 			<input name="lang">
 			</input>
-			<mediadir>updates</mediadir>
+			<mediadir>main</mediadir>
 			<destmedia>updates</destmedia>
 			<external name="2010.2">
 				<fullpath_mediadir>/home/bcd/2010.1/updates/release</fullpath_mediadir>
 			</external>
-			<pubkey>media_info/pubkey</pubkey>
+			<pubkey>updates/media_info/pubkey</pubkey>
 			<release>yes</release>
 			<updates>yes</updates>
 			<backport>no</backport>
diff --git a/dvd_pwp64.xml b/dvd_pwp64.xml
index b1707dc..351efb3 100644
--- a/dvd_pwp64.xml
+++ b/dvd_pwp64.xml
@@ -89,29 +89,6 @@
 			<backport>no</backport>
 			<testing>no</testing>
 		</list>
-		<list name="2010.2" desc="2010.2 media">
-			<input name="base">
-				<file>lists/basesystem_mini</file>
-			</input>
-			<input name="kernel">
-			</input>
-			<input name="lang">
-			</input>
-			<!-- will be taken in {repo}{version}{arch}/media -->
-			<mediadir>main2</mediadir>
-			<destmedia>main</destmedia>
-			<!--
-			<fullpath_mediadir>/home/plop/iso/final/t/i586/media/main</fullpath_mediadir>
-			-->
-			<external name="2010.2">
-				<fullpath_mediadir>/home/images/bcd/2010.1/i586/release</fullpath_mediadir>
-			</external>
-			<pubkey>media_info/pubkey</pubkey>
-			<release>yes</release>
-			<updates>no</updates>
-			<backport>no</backport>
-			<testing>no</testing>
-		</list>
 		<list name="updates" desc="updates media">
 			<input name="base">
 			</input>
-- 
cgit v1.2.1