[Morphix-cvs] SF.net SVN: morphix: [2492] trunk/mmaker/templates

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2492
          http://svn.sourceforge.net/morphix/?rev=2492&view=rev
Author:   paul_c
Date:     2007-05-22 04:00:27 -0700 (Tue, 22 May 2007)

Log Message:
-----------
Migrate templates from sarge to etch now that the latter has beem tagged as stable.

 Some packages have been deprecated and/or replaced..

    * udev replaces hotplug (the two will conflict)
    * gpdf no longer exists - Use evince.
    * pump, dhcp-client, and dhcp3-client all conflict - pump is smaller
        but dhcp3-client is the default, so use one for base, the other for main.

Modified Paths:
--------------
    trunk/mmaker/templates/BareX.xml
    trunk/mmaker/templates/basemod-2.6.17.xml
    trunk/mmaker/templates/gnomey.xml
    trunk/mmaker/templates/lightgui.xml
    trunk/mmaker/templates/morphix-gnome-nl.xml
    trunk/mmaker/templates/morphix-gnome.xml
    trunk/mmaker/templates/morphix-server.xml

Modified: trunk/mmaker/templates/BareX.xml
===================================================================

--- trunk/mmaker/templates/BareX.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/BareX.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -5,21 +5,22 @@
   <name>Morphix BareX</name>
   <repositorylist>
    <repository type="debian">ftp://ftp.debian.org/debian</repository>
+   <repository type="debian" suite="etch/updates">http://security.debian.org/</repository>
    <repository type="plain">http://www.morphix.org/debian</repository>
   </repositorylist>
   <description>Morphix BareX mainmodule</description>
   <type>mainmod</type>
-  <suite>sarge</suite>
+  <suite>etch</suite>
   <packagelist>
 <!-- remove exim4 exim4-base exim4-config mailx ? -->
 <packagereq>bzip2</packagereq>
 <packagereq>cloop-utils</packagereq>
-<packagereq>dhcp-client</packagereq>
+<packagereq>dhcp3-client</packagereq>
 <packagereq>euro-support</packagereq>
 <packagereq>ftp</packagereq>
 <packagereq>grub</packagereq>
 <packagereq>hdparm</packagereq>
-<packagereq>hotplug</packagereq>
+<packagereq>udev</packagereq>
 <packagereq>less</packagereq>
 <packagereq>linux-wlan-ng</packagereq>
 <packagereq>locales</packagereq><!-- necessary for multiple locales, 10MB unpacked-->

Modified: trunk/mmaker/templates/basemod-2.6.17.xml
===================================================================
--- trunk/mmaker/templates/basemod-2.6.17.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/basemod-2.6.17.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -5,7 +5,9 @@
   <name>Morphix Base Default</name>
   <repositorylist>
   <repository type="debian">ftp://ftp.debian.org/debian</repository>
-<!--   <repository type="debian">ftp://127.0.0.1/debian</repository>-->
+  <repository type="debian" suite="etch/updates">http://security.debian.org/</repository>
+<!--   <repository type="debian">http://127.0.0.1/debian</repository>-->
+
    <repository type="plain">http://www.morphix.org/debian</repository>
 <!--   <repository type="plain">http://developer.linuxtag.net/knoppix</repository> -->
   </repositorylist>
@@ -24,7 +26,6 @@
    <packagereq>eject</packagereq>
    <packagereq>netbase</packagereq>
    <packagereq>pump</packagereq>
-   <packagereq>dhcp3-client</packagereq>
    <packagereq>usleep-knoppix</packagereq>
    <packagereq>sysvinit-morphix</packagereq> <!-- for knoppix-style init -->
    

Modified: trunk/mmaker/templates/gnomey.xml
===================================================================
--- trunk/mmaker/templates/gnomey.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/gnomey.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -30,7 +30,7 @@
 <packagereq>grub</packagereq>
 <packagereq>gs</packagereq>
 <packagereq>hdparm</packagereq>
-<packagereq>hotplug</packagereq>
+<packagereq>udev</packagereq>
 <packagereq>koules</packagereq>
 <packagereq>j2re1.4</packagereq>
 <packagereq>linux-wlan-ng</packagereq>
@@ -42,7 +42,6 @@
 <packagereq>ntpdate</packagereq>
 <packagereq>pcmcia-cs</packagereq>
 <packagereq>reiserfsprogs</packagereq>
-<packagereq>udev</packagereq>
 
 
 
@@ -116,7 +115,7 @@
      <packagereq>gedit</packagereq>
      <packagereq>gimp</packagereq>
      <packagereq>gnumeric</packagereq>
-     <packagereq>gpdf</packagereq>
+     <packagereq>evince</packagereq>
      <packagereq>gthumb</packagereq>    
 
 <!-- Audio/Video -->

Modified: trunk/mmaker/templates/lightgui.xml
===================================================================
--- trunk/mmaker/templates/lightgui.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/lightgui.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -23,7 +23,7 @@
 <packagereq>beep-media-player</packagereq>
 <packagereq>cdrecord</packagereq>
 <packagereq>cloop-utils</packagereq>
-<packagereq>dhcp-client</packagereq>
+<packagereq>dhcp3-client</packagereq>
 <packagereq>gaim</packagereq>
 <packagereq>leafpad</packagereq>
 <packagereq>dialog</packagereq>
@@ -53,7 +53,6 @@
 <packagereq>mtools</packagereq>
 <packagereq>pcmcia-cs</packagereq>
 <packagereq>pppconfig</packagereq>
-<packagereq>pump</packagereq>
 <packagereq>reiserfsprogs</packagereq>
 <packagereq>rsync</packagereq>
 <packagereq>samba-common</packagereq>

Modified: trunk/mmaker/templates/morphix-gnome-nl.xml
===================================================================
--- trunk/mmaker/templates/morphix-gnome-nl.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/morphix-gnome-nl.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -83,7 +83,7 @@
    <packagereq>gthumb</packagereq>
    <packagereq>gtweakui</packagereq>
    <packagereq>gocr</packagereq>
-   <packagereq>gpdf</packagereq>
+   <packagereq>evince</packagereq> <!-- Replaces gpdf -->
    <packagereq>gphoto2</packagereq>
    <packagereq>grdesktop</packagereq>
    <packagereq>grip</packagereq>

Modified: trunk/mmaker/templates/morphix-gnome.xml
===================================================================
--- trunk/mmaker/templates/morphix-gnome.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/morphix-gnome.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -84,7 +84,7 @@
    <packagereq>gthumb</packagereq>
    <packagereq>gtweakui</packagereq>
    <packagereq>gocr</packagereq>
-   <packagereq>gpdf</packagereq>
+   <packagereq>evince</packagereq> <!-- Replaces gpdf -->
    <packagereq>gphoto2</packagereq>
    <packagereq>grdesktop</packagereq>
    <packagereq>grip</packagereq>
@@ -96,7 +96,7 @@
    <packagereq>gv</packagereq>
    <packagereq>gwget</packagereq>
    <packagereq>hddtemp</packagereq>
-   <packagereq>hotplug</packagereq>
+   <packagereq>udev</packagereq>
    <packagereq>ibam</packagereq>
    <packagereq>kino</packagereq>
    <packagereq>kinoplus</packagereq>

Modified: trunk/mmaker/templates/morphix-server.xml
===================================================================
--- trunk/mmaker/templates/morphix-server.xml	2007-04-14 20:33:36 UTC (rev 2491)
+++ trunk/mmaker/templates/morphix-server.xml	2007-05-22 11:00:27 UTC (rev 2492)
@@ -5,11 +5,12 @@
   <name>Morphix Server</name>
   <repositorylist>
   <repository type="debian">ftp://ftp.debian.org/debian</repository>
-   <repository type="plain">http://www.morphix.org/debian</repository>
+  <repository type="debian" suite="etch/updates">http://security.debian.org/</repository>
+  <repository type="plain">http://www.morphix.org/debian</repository>
   </repositorylist>
   <description>Morphix Server mainmodule</description>
   <type>mainmod</type>
-  <suite>sarge</suite>
+  <suite>etch</suite>
   <packagelist>
 
 <!-- remove exim4 exim4-base exim4-config mailx ? -->
@@ -28,7 +29,7 @@
 <packagereq>grub</packagereq>
 <packagereq>gs</packagereq>
 <packagereq>hdparm</packagereq>
-<packagereq>hotplug</packagereq>
+<packagereq>udev</packagereq>
 <packagereq>less</packagereq>
 <packagereq>linux-wlan-ng</packagereq>
 <packagereq>locales</packagereq><!-- necessary for multiple locales, 10MB unpacked-->


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


