Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=2c60bb804cd71cde3fbcadeec71fde4eda7d6715
commit 2c60bb804cd71cde3fbcadeec71fde4eda7d6715
Author: Janny <[EMAIL PROTECTED]>
Date: Sun Jan 27 12:22:45 2008 +0100
fwlive-0.8rc1
* version bump at rc1
* change packages repo at fwlive_pkgs
* remove unnecessary udev.diff
* add copy2ram and failsafe title to menu.lst
diff --git a/Makefile b/Makefile
index f48ac79..a11f07f 100644
--- a/Makefile
+++ b/Makefile
@@ -41,23 +41,8 @@ all: checkroot check-tree checkfiles chroot-mkdirs
create-pkgdb cache-mount inst
check-tree:
source /etc/repoman.conf; \
grep -v Include /etc/pacman-g2.conf >${PACCONF}; \
-<<<<<<< HEAD:Makefile
- echo "[janny]" >> ${PACCONF}; \
- echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive/frugalware-i686/"; >>
${PACCONF}; \
- if [ ${APPSGROUP} == TEST ] ; then \
- echo "[xorg73]" >> ${PACCONF}; \
- echo "Server =
http://ftp.frugalware.org/pub/other/people/krix/xorg73/frugalware-i686"; >>
${PACCONF}; \
- echo "[playground]" >> ${PACCONF}; \
- echo "Server =
http://ftp.frugalware.org/pub/other/people/crazy/playground/frugalware-i686"; >>
${PACCONF}; \
- fi
-=======
echo "[fwlive_pkgs]" >> ${PACCONF}; \
echo "Server =
http://ftp.frugalware.org/pub/other/people/janny/fwlive_pkgs/frugalware-i686/";
>> ${PACCONF}; \
->>>>>>> fwlive-0.8rc1
- * version bump at rc1
- * change packages repo at fwlive_pkgs
- * remove unnecessary udev.diff
- * add copy2ram and failsafe title to menu.lst:Makefile
if [ ${APPSGROUP} == "KDE4" ] ; then \
echo "[playground]" >> ${PACCONF}; \
echo "Server =
http://ftp.frugalware.org/pub/other/people/crazy/playground/frugalware-i686/";
>> ${PACCONF}; \
diff --git a/config b/config
index 37632ea..655bdba 100644
--- a/config
+++ b/config
@@ -24,15 +24,7 @@ FWLFONT = lat2-16.psfu.gz
# * SERVER
# * MIN - comfortable console workstation
# * MUSTHAVE - minimalistic one, base of all profiles
-<<<<<<< HEAD:config
-APPSGROUP = TEST
-=======
APPSGROUP = MUSTHAVE
->>>>>>> fwlive-0.8rc1
- * version bump at rc1
- * change packages repo at fwlive_pkgs
- * remove unnecessary udev.diff
- * add copy2ram and failsafe title to menu.lst:config
# grub title part 1
FWLSREL = FWLive-${APPSGROUP}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
