SF.net SVN: morphix: [2457] trunk/mmaker/templates

Revision: 2457
          http://svn.sourceforge.net/morphix/?rev=2457&view=rev
Author:   bmsleight
Date:     2007-01-01 08:28:19 -0800 (Mon, 01 Jan 2007)

Log Message:
-----------
Problem with xserver-xorg upstream - patch to templates. Also adding locales where not already in template.

Modified Paths:
--------------
    trunk/mmaker/templates/BareX.xml
    trunk/mmaker/templates/lightgui.xml
    trunk/mmaker/templates/morphing-morphix.xml
    trunk/mmaker/templates/morphix-game.xml
    trunk/mmaker/templates/morphix-gnome.xml
    trunk/mmaker/templates/morphix-icewm.xml
    trunk/mmaker/templates/morphix-kde.xml
    trunk/mmaker/templates/morphix-livekiosk.xml

Modified: trunk/mmaker/templates/BareX.xml
===================================================================
--- trunk/mmaker/templates/BareX.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/BareX.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -39,6 +39,8 @@
 
 <!-- Morphix init stuff -->
 <!-- perhaps start X with only an xterm? -->
+<packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+<packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
 <packagereq>morphix-init</packagereq>
 
 <!-- packages that are removed -->

Modified: trunk/mmaker/templates/lightgui.xml
===================================================================
--- trunk/mmaker/templates/lightgui.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/lightgui.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -126,8 +126,9 @@
    <packagereq>mkminiroot-morphix</packagereq>
    <packagereq>debootstrap</packagereq>
    <packagereq>morphix-mmaker</packagereq>
-
-<packagereq>morphix-init-light</packagereq>
+   <packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+   <packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+   <packagereq>morphix-init-light</packagereq>
 </packagelist>
 </group>
 </comps>

Modified: trunk/mmaker/templates/morphing-morphix.xml
===================================================================
--- trunk/mmaker/templates/morphing-morphix.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphing-morphix.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -64,6 +64,8 @@
 <packagereq>xterm</packagereq>
 <packagereq>xutils</packagereq>
 
+<packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+<packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
 <packagereq>morphix-init-icewm</packagereq>
 <packagereq>morphix-background</packagereq>
 <packagereq>morphing-tools</packagereq>

Modified: trunk/mmaker/templates/morphix-game.xml
===================================================================
--- trunk/mmaker/templates/morphix-game.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphix-game.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -33,6 +33,7 @@
 <packagereq>icepref</packagereq>
 <packagereq>iceconf</packagereq>
 <packagereq>less</packagereq>
+<packagereq>locales</packagereq>
 <packagereq>menu</packagereq>
 <packagereq>menu-xdg</packagereq>
 <packagereq>mkisofs</packagereq>
@@ -157,6 +158,8 @@
 <packagereq>xshipwars-server</packagereq>
 <packagereq>zsnes</packagereq>
 
+<packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+<packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
 <packagereq>morphix-init-icewm</packagereq>
 <packagereq>morphix-background</packagereq>
 </packagelist>

Modified: trunk/mmaker/templates/morphix-gnome.xml
===================================================================
--- trunk/mmaker/templates/morphix-gnome.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphix-gnome.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -232,7 +232,8 @@
    <packagereq>keybconf</packagereq>
    <packagereq>morphix-background</packagereq>
    <packagereq>morphing-tools</packagereq>
-
+   <packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+   <packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
    <packagereq>morphix-init-gnome</packagereq>
   </packagelist>
  </group>

Modified: trunk/mmaker/templates/morphix-icewm.xml
===================================================================
--- trunk/mmaker/templates/morphix-icewm.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphix-icewm.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -43,6 +43,7 @@
 <packagereq>icepref</packagereq>
 <packagereq>iceconf</packagereq>
 <packagereq>less</packagereq>
+<packagereq>locales</packagereq>
 <packagereq>linux-wlan-ng</packagereq>
 <packagereq>menu</packagereq>
 <packagereq>menu-xdg</packagereq>
@@ -77,6 +78,8 @@
 <packagereq>xbase-clients</packagereq>
 <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot -->
 <packagereq>xterm</packagereq>
+<packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+<packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
 <packagereq>morphix-init-icewm</packagereq>
 <packagereq>morphixinstaller</packagereq>
 <packagereq>morphix-background</packagereq>

Modified: trunk/mmaker/templates/morphix-kde.xml
===================================================================
--- trunk/mmaker/templates/morphix-kde.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphix-kde.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -147,7 +147,9 @@
    <packagereq>superkaramba</packagereq>
    <packagereq>noatun</packagereq>
    <packagereq>k3d</packagereq>
-
+   
+   <packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+   <packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
    <packagereq>morphix-init-kde</packagereq>
   </packagelist>
  </group>

Modified: trunk/mmaker/templates/morphix-livekiosk.xml
===================================================================
--- trunk/mmaker/templates/morphix-livekiosk.xml	2007-01-01 10:34:46 UTC (rev 2456)
+++ trunk/mmaker/templates/morphix-livekiosk.xml	2007-01-01 16:28:19 UTC (rev 2457)
@@ -49,6 +49,8 @@
 <packagereq>console-common</packagereq>
 
 <!-- from morphix.org -->
+<packagereq>xserver-xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
+<packagereq>xorg</packagereq>   <!--Include whilst problem upstream in sid with this depends-->
 <packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox  -->
 <packagereq>morphix-background</packagereq>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV