From: <bms...@us...> - 2006-03-23 21:24:49
|
Revision: 2169 Author: bmsleight Date: 2006-03-23 13:24:41 -0800 (Thu, 23 Mar 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2169&view=rev Log Message: ----------- template update Modified Paths: -------------- trunk/mmaker/templates/morphing-morphix.xml trunk/mmaker/templates/morphix-game.xml Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2006-03-23 20:57:32 UTC (rev 2168) +++ trunk/mmaker/templates/morphing-morphix.xml 2006-03-23 21:24:41 UTC (rev 2169) @@ -46,6 +46,7 @@ <packagereq>imagemagick</packagereq> <packagereq>less</packagereq> <packagereq>linux-wlan-ng</packagereq> +<packagereq>locales</packagereq><!-- necessary for multiple locales, 10MB unpacked--> <packagereq>make</packagereq> <packagereq>menu</packagereq> <packagereq>menu-xdg</packagereq> @@ -93,8 +94,8 @@ <packagereq>morphing-morphix</packagereq> </packagelist> -<retrieve> <!-- only implemented for local from-to --> - <from>http://www.morphix.org/debian/source/morphix-iso-grubtheme_0.1-3.tar.gz</from> +<retrieve> + <from>http://www.morphix.org/dexbian/source/morphix-iso-grubtheme_0.1-3.tar.gz</from> <to>/morphix/</to> </retrieve> Modified: trunk/mmaker/templates/morphix-game.xml =================================================================== --- trunk/mmaker/templates/morphix-game.xml 2006-03-23 20:57:32 UTC (rev 2168) +++ trunk/mmaker/templates/morphix-game.xml 2006-03-23 21:24:41 UTC (rev 2169) @@ -53,7 +53,7 @@ <packagereq>xbase-clients</packagereq> <packagereq>x-window-system-core</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> -<packagereq>xserver-xfree86</packagereq> +<packagereq>xserver-xorg</packagereq> <!-- games! --> @@ -162,6 +162,7 @@ <packagereq>zsnes</packagereq> <packagereq>morphix-init-icewm</packagereq> +<packagereq>morphix-background</packagereq> </packagelist> </group> </comps> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-05-25 19:10:59
|
Revision: 2254 Author: bmsleight Date: 2006-05-25 12:10:52 -0700 (Thu, 25 May 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2254&view=rev Log Message: ----------- Updating templates Modified Paths: -------------- trunk/mmaker/templates/firefox.xml trunk/mmaker/templates/guest/morphixserver.xml Modified: trunk/mmaker/templates/firefox.xml =================================================================== --- trunk/mmaker/templates/firefox.xml 2006-05-25 18:46:02 UTC (rev 2253) +++ trunk/mmaker/templates/firefox.xml 2006-05-25 19:10:52 UTC (rev 2254) @@ -4,14 +4,14 @@ <id>firefox</id> <name>Morphix Firefox</name> <repositorylist> +<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> + <repository type="debian">http://127.0.0.1/sid/</repository> + <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> <!-- Updates and security packages.. --> <!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> <!-- firefox-1.5 for sarge is only available from backports.org --> <!-- <repository type="debian" suite="sarge-backports">http://www.backports.org/</repository> --> - - <repository type="debian">http://127.0.0.1/debian/</repository> - <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix Firefox mainmodule</description> <type>mainmod</type> @@ -32,7 +32,6 @@ <packagereq>menu-xdg</packagereq> <packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ --> <packagereq>most</packagereq> -<packagereq>mozilla-firefox</packagereq> <packagereq>pcmcia-cs</packagereq> <packagereq>pump</packagereq> <packagereq>ssh</packagereq> @@ -41,11 +40,18 @@ <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> <packagereq>xbase-clients</packagereq> <packagereq>x-window-system-core</packagereq> -<packagereq>xserver-xfree86</packagereq> +<packagereq>xserver-xorg</packagereq> <packagereq>xterm</packagereq> <packagereq>xutils</packagereq> +<!-- from morphix.org --> <packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox --> +<packagereq>morphix-background</packagereq> + +<!-- The single application which will be running--> +<!-- The require MiniModule to set /sysconfig/single-app --> +<packagereq>mozilla-firefox</packagereq> + </packagelist> </group> </comps> Modified: trunk/mmaker/templates/guest/morphixserver.xml =================================================================== --- trunk/mmaker/templates/guest/morphixserver.xml 2006-05-25 18:46:02 UTC (rev 2253) +++ trunk/mmaker/templates/guest/morphixserver.xml 2006-05-25 19:10:52 UTC (rev 2254) @@ -4,14 +4,14 @@ <id>server</id> <name>Morphix Server</name> <repositorylist> - <repository type="debian">http://127.0.0.1/debian</repository> + <repository type="debian">http://127.0.0.1/sid</repository> <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> - <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> +<!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix Server mainmodule</description> <type>mainmod</type> - <suite>sarge</suite> + <suite>sid</suite> <packagelist> <!-- remove exim4 exim4-base exim4-config mailx ? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-05-28 12:05:09
|
Revision: 2272 Author: bmsleight Date: 2006-05-28 05:04:47 -0700 (Sun, 28 May 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2272&view=rev Log Message: ----------- moving firefox.xml to morphix-livekiosk.xml Modified Paths: -------------- trunk/mmaker/templates/firefox.xml Added Paths: ----------- trunk/mmaker/templates/morphix-livekiosk.xml Modified: trunk/mmaker/templates/firefox.xml =================================================================== --- trunk/mmaker/templates/firefox.xml 2006-05-28 10:22:18 UTC (rev 2271) +++ trunk/mmaker/templates/firefox.xml 2006-05-28 12:04:47 UTC (rev 2272) @@ -1,57 +1,2 @@ -<comps> - <group> - <version>0.5</version> - <id>firefox</id> - <name>Morphix Firefox</name> - <repositorylist> -<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> - <repository type="debian">http://127.0.0.1/sid/</repository> - <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> -<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> - <!-- Updates and security packages.. --> -<!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> - <!-- firefox-1.5 for sarge is only available from backports.org --> -<!-- <repository type="debian" suite="sarge-backports">http://www.backports.org/</repository> --> - </repositorylist> - <description>Morphix Firefox mainmodule</description> - <type>mainmod</type> - <suite>sid</suite> - <packagelist> +<!-- depreciated see morphix-livekiosk.xml --> -<!-- remove exim4 exim4-base exim4-config mailx ? --> -<packagereq>alsa-base</packagereq> -<packagereq>alsa-utils</packagereq> -<packagereq>bzip2</packagereq> -<packagereq>dhcp-client</packagereq> -<packagereq>dialog</packagereq> -<packagereq>grub</packagereq> -<packagereq>hotplug</packagereq> -<packagereq>less</packagereq> -<packagereq>linux-wlan-ng</packagereq> -<packagereq>menu</packagereq> -<packagereq>menu-xdg</packagereq> -<packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ --> -<packagereq>most</packagereq> -<packagereq>pcmcia-cs</packagereq> -<packagereq>pump</packagereq> -<packagereq>ssh</packagereq> -<packagereq>sudo</packagereq> -<packagereq>wireless-tools</packagereq> -<packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> -<packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> -<packagereq>xserver-xorg</packagereq> -<packagereq>xterm</packagereq> -<packagereq>xutils</packagereq> - -<!-- from morphix.org --> -<packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox --> -<packagereq>morphix-background</packagereq> - -<!-- The single application which will be running--> -<!-- This requires MorphixMini-PersistentApp.xml to add to /morphix/persistent-app to launch application--> -<packagereq>mozilla-firefox</packagereq> - -</packagelist> -</group> -</comps> Added: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml (rev 0) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-05-28 12:04:47 UTC (rev 2272) @@ -0,0 +1,58 @@ +<comps> + <group> + <version>0.5</version> + <id>firefox</id> + <name>Morphix Firefox</name> + <repositorylist> +<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> + <repository type="debian">http://127.0.0.1/sid/</repository> + <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> +<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> + <!-- Updates and security packages.. --> +<!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> + <!-- firefox-1.5 for sarge is only available from backports.org --> +<!-- <repository type="debian" suite="sarge-backports">http://www.backports.org/</repository> --> + </repositorylist> + <description>Morphix Firefox mainmodule</description> + <type>mainmod</type> + <suite>sid</suite> + <packagelist> + +<!-- remove exim4 exim4-base exim4-config mailx ? --> +<packagereq>alsa-base</packagereq> +<packagereq>alsa-utils</packagereq> +<packagereq>bzip2</packagereq> +<packagereq>dhcp-client</packagereq> +<packagereq>dialog</packagereq> +<packagereq>grub</packagereq> +<packagereq>hotplug</packagereq> +<packagereq>less</packagereq> +<packagereq>linux-wlan-ng</packagereq> +<packagereq>menu</packagereq> +<packagereq>menu-xdg</packagereq> +<packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ --> +<packagereq>most</packagereq> +<packagereq>pcmcia-cs</packagereq> +<packagereq>pump</packagereq> +<packagereq>ssh</packagereq> +<packagereq>sudo</packagereq> +<packagereq>wireless-tools</packagereq> +<packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> +<packagereq>xbase-clients</packagereq> +<packagereq>x-window-system-core</packagereq> +<packagereq>xscreensaver</packagereq> +<!-- <packagereq>xserver-xorg</packagereq> --> +<packagereq>xterm</packagereq> +<packagereq>xutils</packagereq> + +<!-- from morphix.org --> +<packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox --> +<packagereq>morphix-background</packagereq> + +<!-- The single application which will be running --> +<!-- This requires MorphixMini-PersistentApp.xml to add to /morphix/persistent-app to launch application--> +<packagereq>mozilla-firefox</packagereq> + +</packagelist> +</group> +</comps> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-05-31 21:24:19
|
Revision: 2285 Author: bmsleight Date: 2006-05-31 14:24:07 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2285&view=rev Log Message: ----------- Testing <command> ... and > Modified Paths: -------------- trunk/mmaker/templates/morphix-livekiosk.xml trunk/mmaker/templates/morphix-server.xml Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2006-05-31 20:40:17 UTC (rev 2284) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-05-31 21:24:07 UTC (rev 2285) @@ -36,6 +36,7 @@ <packagereq>pump</packagereq> <packagereq>ssh</packagereq> <packagereq>sudo</packagereq> +<packagereq>unzip</packagereq> <packagereq>wireless-tools</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> <packagereq>xbase-clients</packagereq> Modified: trunk/mmaker/templates/morphix-server.xml =================================================================== --- trunk/mmaker/templates/morphix-server.xml 2006-05-31 20:40:17 UTC (rev 2284) +++ trunk/mmaker/templates/morphix-server.xml 2006-05-31 21:24:07 UTC (rev 2285) @@ -210,5 +210,11 @@ <packagereq>morphix-init-server</packagereq> <packagereq>morphix-init-matchbox</packagereq> </packagelist> + +<!-- Set the Main Application --> +<commandlist> + <command>echo "sh /morphix/menu.sh " >> /etc/skel/.persistent-app </command> +</commandlist> + </group> </comps> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-07-03 22:30:48
|
Revision: 2336 Author: bmsleight Date: 2006-07-03 15:30:39 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2336&view=rev Log Message: ----------- Minor update of templates Modified Paths: -------------- trunk/mmaker/templates/morphix-livekiosk.xml trunk/mmaker/templates/morphix-server.xml Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2006-07-03 21:09:24 UTC (rev 2335) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-07-03 22:30:39 UTC (rev 2336) @@ -19,12 +19,12 @@ <packagelist> <!-- remove exim4 exim4-base exim4-config mailx ? --> -<packagereq>perl-modules</packagereq> <packagereq>alsa-base</packagereq> <packagereq>alsa-utils</packagereq> <packagereq>bzip2</packagereq> <packagereq>dhcp-client</packagereq> <packagereq>dialog</packagereq> +<packagereq>evince</packagereq> <packagereq>grub</packagereq> <packagereq>hotplug</packagereq> <packagereq>less</packagereq> @@ -33,7 +33,9 @@ <packagereq>menu-xdg</packagereq> <packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ --> <packagereq>most</packagereq> +<packagereq>mozplugger</packagereq> <packagereq>pcmcia-cs</packagereq> +<packagereq>perl-modules</packagereq> <packagereq>pump</packagereq> <packagereq>ssh</packagereq> <packagereq>sudo</packagereq> @@ -56,5 +58,12 @@ <packagereq>mozilla-firefox</packagereq> </packagelist> +<!-- The single application does not neet documentation or manuals --> + <commandlist> + <command>rm -rf /usr/share/doc</command> + <command>rm -rf /usr/share/man</command> + <command>rm -rf /usr/share/man-db</command> + </commandlist> + </group> </comps> Modified: trunk/mmaker/templates/morphix-server.xml =================================================================== --- trunk/mmaker/templates/morphix-server.xml 2006-07-03 21:09:24 UTC (rev 2335) +++ trunk/mmaker/templates/morphix-server.xml 2006-07-03 22:30:39 UTC (rev 2336) @@ -4,7 +4,7 @@ <id>server</id> <name>Morphix Server</name> <repositorylist> - <repository type="debian">ftp://192.168.0.1/debian</repository> +<!-- <repository type="debian">ftp://192.168.0.1/debian</repository> --> <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> @@ -42,6 +42,7 @@ <packagereq>mozilla-firefox</packagereq> <packagereq>mtools</packagereq> <packagereq>pcmcia-cs</packagereq> +<packagereq>perl-modules</packagereq> <packagereq>pump</packagereq> <packagereq>reiserfsprogs</packagereq> <packagereq>rsync</packagereq> @@ -213,7 +214,8 @@ <!-- Set the Main Application --> <commandlist> - <command>echo "sh /morphix/menu.sh " >> /etc/skel/.persistent-app </command> + <command>echo \"xscreensaver-command -exit \" >> /etc/skel/.persistent-app </command> + <command>echo \"sh /morphix/menu.sh \" >> /etc/skel/.persistent-app </command> </commandlist> </group> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-08-27 06:14:13
|
Revision: 2400 Author: bmsleight Date: 2006-08-26 23:14:05 -0700 (Sat, 26 Aug 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2400&view=rev Log Message: ----------- Tweaking Modified Paths: -------------- trunk/mmaker/templates/morphing-morphix.xml trunk/mmaker/templates/morphix-livekiosk.xml Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2006-08-27 06:13:27 UTC (rev 2399) +++ trunk/mmaker/templates/morphing-morphix.xml 2006-08-27 06:14:05 UTC (rev 2400) @@ -1,8 +1,8 @@ <comps> <group> - <version>0.2</version> - <id>morphing-morphix</id> - <name>Morphing-Morphix_0.2</name> + <version>0.3</version> + <id>MorphingMorphix</id> + <name>MorphingMorphix 0.3</name> <repositorylist> <repository type="debian">http://127.0.0.1/sid/</repository> <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> @@ -15,28 +15,15 @@ <!-- remove exim4 exim4-base exim4-config mailx ? --> <packagereq>alsa-base</packagereq> <packagereq>alsa-utils</packagereq> -<packagereq>asciidoc</packagereq> -<packagereq>aspell</packagereq> -<packagereq>balsa</packagereq> <packagereq>bzip2</packagereq> -<packagereq>cdrecord</packagereq> <packagereq>cloop-utils</packagereq> <packagereq>dhcp-client</packagereq> -<packagereq>dpkg-buildpackage</packagereq> -<packagereq>debhelper</packagereq> -<packagereq>dialog</packagereq> -<packagereq>docbook-xml</packagereq> <packagereq>elinks</packagereq> <packagereq>euro-support</packagereq> <packagereq>ftp</packagereq> <packagereq>freeciv-client-gtk</packagereq> <packagereq>gcc</packagereq> -<packagereq>gftp-gtk</packagereq> -<packagereq>gimp</packagereq> -<packagereq>gksu</packagereq> -<packagereq>gnupg</packagereq> <packagereq>grub-gfxboot</packagereq> -<packagereq>gs</packagereq> <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> <packagereq>icewm</packagereq> @@ -52,9 +39,7 @@ <packagereq>menu-xdg</packagereq> <packagereq>mkisofs</packagereq> <packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ --> -<packagereq>most</packagereq> <packagereq>mozilla-firefox</packagereq> -<!--<packagereq>mozilla-thunderbird</packagereq>--> <packagereq>mtools</packagereq> <packagereq>pcmcia-cs</packagereq> <packagereq>pppconfig</packagereq> @@ -68,36 +53,47 @@ <packagereq>sudo</packagereq> <packagereq>smbclient</packagereq> <packagereq>smbfs</packagereq> -<packagereq>subversion</packagereq> <packagereq>wget</packagereq> -<packagereq>vnc-common</packagereq> <packagereq>wireless-tools</packagereq> -<packagereq>wvdial</packagereq> +<packagereq>xbase-clients</packagereq> <packagereq>xchat</packagereq> -<!--<packagereq>xdialog</packagereq>--> +<packagereq>xdialog</packagereq> <packagereq>xfsprogs</packagereq> -<packagereq>xpdf</packagereq> -<!---<packagereq>xvncviewer</packagereq>--> -<packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> +<packagereq>xpdf</packagereq> <packagereq>xserver-xorg</packagereq> -<packagereq>xsltproc</packagereq> <packagereq>xterm</packagereq> +<packagereq>xutils</packagereq> +<packagereq>x-window-system-core</packagereq> <packagereq>morphix-init-icewm</packagereq> -<packagereq>morphixinstaller</packagereq> <packagereq>morphix-background</packagereq> <packagereq>morphing-tools</packagereq> -<packagereq>morphix-manual</packagereq> -<packagereq>morphix-mmaker</packagereq> -<packagereq>morphing-morphix</packagereq> + </packagelist> -<retrieve> - <from>http://www.morphix.org/dexbian/source/morphix-iso-grubtheme_0.1-3.tar.gz</from> - <to>/morphix/</to> +<retrieve> + <from>/home/morph/morphix/trunk/morph-scripts/mmorphix/MorphingMorphix.xpm</from> + <to>/usr/share/icewm/taskbar/</to> </retrieve> +<retrieve> + <from>/home/morph/local_debs/morphix-rebrand_0.2-31_i386.deb</from> + <to>/tmp/</to> +</retrieve> +<retrieve> + <from>/home/morph/local_debs/morphix-chroot_0.2-31_i386.deb</from> + <to>/tmp/</to> +</retrieve> + +<commandlist> + <command>rm /usr/share/icewm/taskbar/icewm.xpm</command> + <command>rm /usr/share/icewm/themes/IceBlueCurve/taskbar/linux.xpm</command> + <command>ln -s /usr/share/icewm/taskbar/MorphingMorphix.xpm /usr/share/icewm/themes/IceBlueCurve/taskbar/linux.xpm</command> + <command>ln -s /usr/share/icewm/taskbar/MorphingMorphix.xpm /usr/share/icewm/taskbar/icewm.xpm</command> + <command>dpkg -i /tmp/morphix-rebrand_0.2-31_i386.deb</command> + <command>dpkg -i /tmp/morphix-chroot_0.2-31_i386.deb</command> + <command>rm -rf /tmp/*.deb</command> +</commandlist> </group> </comps> Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2006-08-27 06:13:27 UTC (rev 2399) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-08-27 06:14:05 UTC (rev 2400) @@ -56,6 +56,8 @@ <!-- The single application which will be running --> <!-- This requires MorphixMini-PersistentApp.xml to add to ~/.persistent-app to launch application --> <packagereq>mozilla-firefox</packagereq> +<packagereq>gcjwebplugin</packagereq> +<packagereq>kaffe</packagereq> </packagelist> <!-- The single application does not neet documentation or manuals --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-08-27 21:25:15
|
Revision: 2402 Author: bmsleight Date: 2006-08-27 14:25:00 -0700 (Sun, 27 Aug 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2402&view=rev Log Message: ----------- Tweaking Modified Paths: -------------- trunk/mmaker/templates/morphing-morphix.xml trunk/mmaker/templates/morphix-livekiosk.xml Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2006-08-27 21:22:58 UTC (rev 2401) +++ trunk/mmaker/templates/morphing-morphix.xml 2006-08-27 21:25:00 UTC (rev 2402) @@ -4,8 +4,8 @@ <id>MorphingMorphix</id> <name>MorphingMorphix 0.3</name> <repositorylist> - <repository type="debian">http://127.0.0.1/sid/</repository> -<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> +<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> + <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphing Morphix mainmodule</description> @@ -15,6 +15,7 @@ <!-- remove exim4 exim4-base exim4-config mailx ? --> <packagereq>alsa-base</packagereq> <packagereq>alsa-utils</packagereq> +<packagereq>build-essential</packagereq> <packagereq>bzip2</packagereq> <packagereq>cloop-utils</packagereq> <packagereq>dhcp-client</packagereq> Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2006-08-27 21:22:58 UTC (rev 2401) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-08-27 21:25:00 UTC (rev 2402) @@ -4,8 +4,8 @@ <id>firefox</id> <name>Morphix LiveKiosk</name> <repositorylist> -<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> - <repository type="debian">http://127.0.0.1/sid/</repository> + <repository type="debian">ftp://ftp.debian.org/debian</repository> +<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> <!-- Updates and security packages.. --> @@ -56,9 +56,11 @@ <!-- The single application which will be running --> <!-- This requires MorphixMini-PersistentApp.xml to add to ~/.persistent-app to launch application --> <packagereq>mozilla-firefox</packagereq> -<packagereq>gcjwebplugin</packagereq> -<packagereq>kaffe</packagereq> +<!-- These alternatives do not work well yet - hence comment out --> +<!-- <packagereq>gcjwebplugin</packagereq> --> +<!-- <packagereq>kaffe</packagereq> --> + </packagelist> <!-- The single application does not neet documentation or manuals --> <commandlist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-12-24 20:37:31
|
Revision: 2449 http://svn.sourceforge.net/morphix/?rev=2449&view=rev Author: bmsleight Date: 2006-12-24 12:37:27 -0800 (Sun, 24 Dec 2006) Log Message: ----------- Updating templates to reflect depends of morphix-init-*. Small template are good 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 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/BareX.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -33,8 +33,6 @@ <packagereq>wireless-tools</packagereq> <packagereq>xfsprogs</packagereq> <packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> -<packagereq>xserver-xfree86</packagereq> <packagereq>xterm</packagereq> <packagereq>xutils</packagereq> Modified: trunk/mmaker/templates/lightgui.xml =================================================================== --- trunk/mmaker/templates/lightgui.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/lightgui.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -69,7 +69,6 @@ <packagereq>wvdial</packagereq> <packagereq>xchat</packagereq> <!--<packagereq>xdialog</packagereq>--> -<packagereq>xfce4</packagereq> <packagereq>xfce4-themes</packagereq> <packagereq>xfce4-utils</packagereq> <packagereq>xfdeskmenu4</packagereq> @@ -82,8 +81,6 @@ <packagereq>xpdf</packagereq> <packagereq>xvncviewer</packagereq> <packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> -<packagereq>xserver-xorg</packagereq> <packagereq>xterm</packagereq> <packagereq>xutils</packagereq> @@ -119,7 +116,6 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> - <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphing-morphix.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -27,7 +27,6 @@ <packagereq>grub-gfxboot</packagereq> <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> -<packagereq>icewm</packagereq> <packagereq>icewm-themes</packagereq> <packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> @@ -62,10 +61,8 @@ <packagereq>xfsprogs</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> <packagereq>xpdf</packagereq> -<packagereq>xserver-xorg</packagereq> <packagereq>xterm</packagereq> <packagereq>xutils</packagereq> -<packagereq>x-window-system-core</packagereq> <packagereq>morphix-init-icewm</packagereq> <packagereq>morphix-background</packagereq> @@ -77,23 +74,12 @@ <from>/home/morph/morphix/trunk/morph-scripts/mmorphix/MorphingMorphix.xpm</from> <to>/usr/share/icewm/taskbar/</to> </retrieve> -<retrieve> - <from>/home/morph/local_debs/morphix-rebrand_0.2-31_i386.deb</from> - <to>/tmp/</to> -</retrieve> -<retrieve> - <from>/home/morph/local_debs/morphix-chroot_0.2-31_i386.deb</from> - <to>/tmp/</to> -</retrieve> <commandlist> <command>rm /usr/share/icewm/taskbar/icewm.xpm</command> <command>rm /usr/share/icewm/themes/IceBlueCurve/taskbar/linux.xpm</command> <command>ln -s /usr/share/icewm/taskbar/MorphingMorphix.xpm /usr/share/icewm/themes/IceBlueCurve/taskbar/linux.xpm</command> <command>ln -s /usr/share/icewm/taskbar/MorphingMorphix.xpm /usr/share/icewm/taskbar/icewm.xpm</command> - <command>dpkg -i /tmp/morphix-rebrand_0.2-31_i386.deb</command> - <command>dpkg -i /tmp/morphix-chroot_0.2-31_i386.deb</command> - <command>rm -rf /tmp/*.deb</command> </commandlist> </group> Modified: trunk/mmaker/templates/morphix-game.xml =================================================================== --- trunk/mmaker/templates/morphix-game.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphix-game.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -29,7 +29,6 @@ <packagereq>grub</packagereq> <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> -<packagereq>icewm</packagereq> <packagereq>icewm-themes</packagereq> <packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> @@ -51,9 +50,7 @@ <packagereq>wireless-tools</packagereq> <packagereq>xfsprogs</packagereq> <packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> -<packagereq>xserver-xorg</packagereq> <!-- games! --> Modified: trunk/mmaker/templates/morphix-gnome.xml =================================================================== --- trunk/mmaker/templates/morphix-gnome.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphix-gnome.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -213,9 +213,7 @@ <packagereq>xsane</packagereq> <packagereq>xscreensaver</packagereq> <packagereq>xscreensaver-gl</packagereq> - <packagereq>xserver-xorg</packagereq> <packagereq>x-ttcidfont-conf</packagereq> - <packagereq>xfonts-base</packagereq> <packagereq>xterm</packagereq> <packagereq>xutils</packagereq> <packagereq>yelp</packagereq> @@ -226,7 +224,6 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> - <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> Modified: trunk/mmaker/templates/morphix-icewm.xml =================================================================== --- trunk/mmaker/templates/morphix-icewm.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphix-icewm.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -39,7 +39,6 @@ <packagereq>gs</packagereq> <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> -<packagereq>icewm</packagereq> <packagereq>icewm-themes</packagereq> <packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> @@ -76,12 +75,9 @@ <packagereq>xpdf</packagereq> <packagereq>xvncviewer</packagereq> <packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> -<packagereq>xserver-xorg</packagereq> <packagereq>xterm</packagereq> <packagereq>morphix-init-icewm</packagereq> - <packagereq>morphixinstaller</packagereq> <packagereq>morphix-background</packagereq> <packagereq>morphix-tools</packagereq> Modified: trunk/mmaker/templates/morphix-kde.xml =================================================================== --- trunk/mmaker/templates/morphix-kde.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphix-kde.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -89,7 +89,6 @@ <packagereq>xsane</packagereq> <packagereq>xscreensaver</packagereq> <packagereq>xscreensaver-gl</packagereq> - <packagereq>xserver-xfree86</packagereq> <packagereq>x-ttcidfont-conf</packagereq> <packagereq>xfonts-base</packagereq> <packagereq>xterm</packagereq> @@ -101,7 +100,6 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> - <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2006-12-24 20:35:37 UTC (rev 2448) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2006-12-24 20:37:27 UTC (rev 2449) @@ -4,9 +4,9 @@ <id>firefox</id> <name>Morphix LiveKiosk</name> <repositorylist> - <repository type="debian">ftp://ftp.debian.org/debian</repository> -<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> - <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> +<repository type="debian">ftp://ftp.debian.org/debian</repository> +<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> +<repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> <!-- Updates and security packages.. --> <!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> @@ -43,11 +43,11 @@ <packagereq>wireless-tools</packagereq> <packagereq>xloadimage</packagereq> <!-- necessary for xsetbg at boot --> <packagereq>xbase-clients</packagereq> -<packagereq>x-window-system-core</packagereq> <packagereq>xscreensaver</packagereq> -<!-- <packagereq>xserver-xorg</packagereq> --> <!-- <packagereq>xterm</packagereq> --> <packagereq>xutils</packagereq> +<packagereq>console-data</packagereq> +<packagereq>console-common</packagereq> <!-- from morphix.org --> <packagereq>morphix-init-matchbox</packagereq> <!-- which depends matchbox --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2006-12-25 23:10:17
|
Revision: 2451 http://svn.sourceforge.net/morphix/?rev=2451&view=rev Author: bmsleight Date: 2006-12-25 15:10:14 -0800 (Mon, 25 Dec 2006) Log Message: ----------- Boss says: xconf isn't a requirement, it's merely a configuration tool Modified Paths: -------------- trunk/mmaker/templates/lightgui.xml trunk/mmaker/templates/morphix-gnome.xml trunk/mmaker/templates/morphix-kde.xml Modified: trunk/mmaker/templates/lightgui.xml =================================================================== --- trunk/mmaker/templates/lightgui.xml 2006-12-25 23:09:46 UTC (rev 2450) +++ trunk/mmaker/templates/lightgui.xml 2006-12-25 23:10:14 UTC (rev 2451) @@ -116,6 +116,7 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> + <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> Modified: trunk/mmaker/templates/morphix-gnome.xml =================================================================== --- trunk/mmaker/templates/morphix-gnome.xml 2006-12-25 23:09:46 UTC (rev 2450) +++ trunk/mmaker/templates/morphix-gnome.xml 2006-12-25 23:10:14 UTC (rev 2451) @@ -224,6 +224,7 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> + <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> Modified: trunk/mmaker/templates/morphix-kde.xml =================================================================== --- trunk/mmaker/templates/morphix-kde.xml 2006-12-25 23:09:46 UTC (rev 2450) +++ trunk/mmaker/templates/morphix-kde.xml 2006-12-25 23:10:14 UTC (rev 2451) @@ -100,6 +100,7 @@ <packagereq>morphixinstaller</packagereq> <packagereq>partitionmorpher</packagereq> <packagereq>mcp</packagereq> + <packagereq>xconf</packagereq> <packagereq>networkconf</packagereq> <packagereq>datetimeconf</packagereq> <packagereq>langconf</packagereq> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Alex de L. <al...@de...> - 2006-12-25 23:25:39
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 And sorry for being a pita :) merry christmas! bms...@us... wrote: > Revision: 2451 > http://svn.sourceforge.net/morphix/?rev=2451&view=rev > Author: bmsleight > Date: 2006-12-25 15:10:14 -0800 (Mon, 25 Dec 2006) > > Log Message: > ----------- > Boss says: xconf isn't a requirement, it's merely a configuration tool > > Modified Paths: > -------------- > trunk/mmaker/templates/lightgui.xml > trunk/mmaker/templates/morphix-gnome.xml > trunk/mmaker/templates/morphix-kde.xml > > Modified: trunk/mmaker/templates/lightgui.xml > =================================================================== > --- trunk/mmaker/templates/lightgui.xml 2006-12-25 23:09:46 UTC (rev 2450) > +++ trunk/mmaker/templates/lightgui.xml 2006-12-25 23:10:14 UTC (rev 2451) > @@ -116,6 +116,7 @@ > <packagereq>morphixinstaller</packagereq> > <packagereq>partitionmorpher</packagereq> > <packagereq>mcp</packagereq> > + <packagereq>xconf</packagereq> > <packagereq>networkconf</packagereq> > <packagereq>datetimeconf</packagereq> > <packagereq>langconf</packagereq> > > Modified: trunk/mmaker/templates/morphix-gnome.xml > =================================================================== > --- trunk/mmaker/templates/morphix-gnome.xml 2006-12-25 23:09:46 UTC (rev 2450) > +++ trunk/mmaker/templates/morphix-gnome.xml 2006-12-25 23:10:14 UTC (rev 2451) > @@ -224,6 +224,7 @@ > <packagereq>morphixinstaller</packagereq> > <packagereq>partitionmorpher</packagereq> > <packagereq>mcp</packagereq> > + <packagereq>xconf</packagereq> > <packagereq>networkconf</packagereq> > <packagereq>datetimeconf</packagereq> > <packagereq>langconf</packagereq> > > Modified: trunk/mmaker/templates/morphix-kde.xml > =================================================================== > --- trunk/mmaker/templates/morphix-kde.xml 2006-12-25 23:09:46 UTC (rev 2450) > +++ trunk/mmaker/templates/morphix-kde.xml 2006-12-25 23:10:14 UTC (rev 2451) > @@ -100,6 +100,7 @@ > <packagereq>morphixinstaller</packagereq> > <packagereq>partitionmorpher</packagereq> > <packagereq>mcp</packagereq> > + <packagereq>xconf</packagereq> > <packagereq>networkconf</packagereq> > <packagereq>datetimeconf</packagereq> > <packagereq>langconf</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 > _______________________________________________ > Morphix-cvs mailing list > Mor...@li... > https://lists.sourceforge.net/lists/listinfo/morphix-cvs -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFkGBbQeuQA5TF/UsRAuWDAKCS+7Ge5a9F0jjvpsWedCy19uYjbwCdFf1t GTr4kPSwKN4mfnEFXQsrU34= =jl/l -----END PGP SIGNATURE----- |
From: <bms...@us...> - 2007-01-01 16:28:21
|
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. |
From: <bms...@us...> - 2007-04-09 19:13:51
|
Revision: 2485 http://svn.sourceforge.net/morphix/?rev=2485&view=rev Author: bmsleight Date: 2007-04-09 12:13:42 -0700 (Mon, 09 Apr 2007) Log Message: ----------- Tidying-up the templates. Modified Paths: -------------- trunk/mmaker/templates/gnomey.xml trunk/mmaker/templates/lightgui.xml trunk/mmaker/templates/morphing-morphix.xml trunk/mmaker/templates/morphix-game.xml trunk/mmaker/templates/morphix-gnome-nl.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 trunk/mmaker/templates/morphix-mythtv.xml trunk/mmaker/templates/morphix-server.xml Modified: trunk/mmaker/templates/gnomey.xml =================================================================== --- trunk/mmaker/templates/gnomey.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/gnomey.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -5,7 +5,6 @@ <name>Gnomey</name> <repositorylist> <repository type="debian" suite="unstable main contrib non-free">ftp://ftp.debian.org/debian</repository> -<!-- <repository type="debian">ftp://192.168.0.1/debian</repository>--> <repository type="plain" suite="./">http://www.morphix.org/debian</repository> <repository type="plain" suite="./">http://debs.livecd.net/gparted</repository> <repository type="plain" suite="non-free">ftp://ftp.tux.org/java/debian/</repository> Modified: trunk/mmaker/templates/lightgui.xml =================================================================== --- trunk/mmaker/templates/lightgui.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/lightgui.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,7 +4,6 @@ <id>lightgui</id> <name>Morphix LightGUI</name> <repositorylist> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository> --> <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="debian" suite="sid">http://www.debian-multimedia.org</repository> <repository type="debian" suite="unstable">http://www.os-works.com/debian</repository> Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphing-morphix.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,7 +4,6 @@ <id>MorphingMorphix</id> <name>MorphingMorphix 0.3</name> <repositorylist> -<!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> Modified: trunk/mmaker/templates/morphix-game.xml =================================================================== --- trunk/mmaker/templates/morphix-game.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-game.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,8 +4,7 @@ <id>morphixgame</id> <name>Morphix Game LiveCD</name> <repositorylist> - <repository type="debian">http://127.0.0.1/sid/</repository> -<!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> + <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix game mainmodule</description> Modified: trunk/mmaker/templates/morphix-gnome-nl.xml =================================================================== --- trunk/mmaker/templates/morphix-gnome-nl.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-gnome-nl.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -5,7 +5,6 @@ <name>Morphix Gnome</name> <repositorylist> <repository type="debian">ftp://ftp.debian.org/debian</repository> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository>--> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix Gnome mainmodule</description> Modified: trunk/mmaker/templates/morphix-gnome.xml =================================================================== --- trunk/mmaker/templates/morphix-gnome.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-gnome.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -5,7 +5,6 @@ <name>Morphix Gnome</name> <repositorylist> <repository type="debian">ftp://ftp.debian.org/debian</repository> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository> --> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix Gnome mainmodule</description> Modified: trunk/mmaker/templates/morphix-icewm.xml =================================================================== --- trunk/mmaker/templates/morphix-icewm.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-icewm.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,7 +4,6 @@ <id>morphix-icewm</id> <name>Morphix icewm</name> <repositorylist> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository>--> <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> Modified: trunk/mmaker/templates/morphix-kde.xml =================================================================== --- trunk/mmaker/templates/morphix-kde.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-kde.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,7 +4,6 @@ <version>0.5</version> <name>Morphix KDE</name> <repositorylist> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository>--> <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> </repositorylist> Modified: trunk/mmaker/templates/morphix-livekiosk.xml =================================================================== --- trunk/mmaker/templates/morphix-livekiosk.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-livekiosk.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -5,13 +5,9 @@ <name>Morphix LiveKiosk</name> <repositorylist> <repository type="debian">ftp://ftp.debian.org/debian</repository> - <!-- <repository type="debian">http://127.0.0.1/sid/</repository> --> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> - <!-- <repository type="debian">ftp://ftp.debian.org/debian</repository> --> <!-- Updates and security packages.. --> - <!-- <repository type="debian" suite="sarge/updates">http://127.0.0.1/debian/debian-security/</repository> --> - <!-- firefox-1.5 for sarge is only available from backports.org --> - <!-- <repository type="debian" suite="sarge-backports">http://www.backports.org/</repository> --> + <!-- <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository> --> </repositorylist> <description>Morphix Live Kiosk mainmodule. Outline template, LiveCD will have a single application running full screen</description> <type>mainmod</type> Modified: trunk/mmaker/templates/morphix-mythtv.xml =================================================================== --- trunk/mmaker/templates/morphix-mythtv.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-mythtv.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -5,7 +5,6 @@ <name>Morphix MythTV</name> <repositorylist> <repository type="debian">ftp://ftp.debian.org/debian</repository> -<!-- <repository type="debian">ftp://127.0.0.1/debian</repository>--> <repository type="plain" suite="unstable">http://www.morphix.org/debian</repository> <repository type="debian">http://dijkstra.csh.rit.edu/~mdz/debian</repository> </repositorylist> Modified: trunk/mmaker/templates/morphix-server.xml =================================================================== --- trunk/mmaker/templates/morphix-server.xml 2007-04-08 14:07:58 UTC (rev 2484) +++ trunk/mmaker/templates/morphix-server.xml 2007-04-09 19:13:42 UTC (rev 2485) @@ -4,8 +4,7 @@ <id>server</id> <name>Morphix Server</name> <repositorylist> -<!-- <repository type="debian">ftp://192.168.0.1/debian</repository> --> - <repository type="debian">ftp://ftp.debian.org/debian</repository> + <repository type="debian">ftp://ftp.debian.org/debian</repository> <repository type="plain">http://www.morphix.org/debian</repository> </repositorylist> <description>Morphix Server mainmodule</description> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2007-05-22 11:00:39
|
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. |
From: <pa...@us...> - 2007-06-03 00:18:07
|
Revision: 2519 http://svn.sourceforge.net/morphix/?rev=2519&view=rev Author: paul_c Date: 2007-06-02 17:18:05 -0700 (Sat, 02 Jun 2007) Log Message: ----------- icepref no longer in stable/testing/unstable Modified Paths: -------------- trunk/mmaker/templates/morphing-morphix.xml trunk/mmaker/templates/morphix-game.xml trunk/mmaker/templates/morphix-icewm.xml Modified: trunk/mmaker/templates/morphing-morphix.xml =================================================================== --- trunk/mmaker/templates/morphing-morphix.xml 2007-06-03 00:09:47 UTC (rev 2518) +++ trunk/mmaker/templates/morphing-morphix.xml 2007-06-03 00:18:05 UTC (rev 2519) @@ -27,7 +27,6 @@ <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> <packagereq>icewm-themes</packagereq> -<packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> <packagereq>imagemagick</packagereq> <packagereq>less</packagereq> Modified: trunk/mmaker/templates/morphix-game.xml =================================================================== --- trunk/mmaker/templates/morphix-game.xml 2007-06-03 00:09:47 UTC (rev 2518) +++ trunk/mmaker/templates/morphix-game.xml 2007-06-03 00:18:05 UTC (rev 2519) @@ -29,7 +29,6 @@ <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> <packagereq>icewm-themes</packagereq> -<packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> <packagereq>less</packagereq> <packagereq>locales</packagereq> Modified: trunk/mmaker/templates/morphix-icewm.xml =================================================================== --- trunk/mmaker/templates/morphix-icewm.xml 2007-06-03 00:09:47 UTC (rev 2518) +++ trunk/mmaker/templates/morphix-icewm.xml 2007-06-03 00:18:05 UTC (rev 2519) @@ -39,7 +39,6 @@ <packagereq>hdparm</packagereq> <packagereq>hotplug</packagereq> <packagereq>icewm-themes</packagereq> -<packagereq>icepref</packagereq> <packagereq>iceconf</packagereq> <packagereq>less</packagereq> <packagereq>locales</packagereq> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |