[Demudi-commits] r340 - in demudi-debian-cd/trunk: . data/sarge debian tasks

[Free Ekanayaka]

Author: free-guest
Date: 2004-12-15 04:39:36 -0700 (Wed, 15 Dec 2004)
New Revision: 340

Modified:
   demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
   demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed
   demudi-debian-cd/trunk/debian-cd.conf
   demudi-debian-cd/trunk/debian/changelog
   demudi-debian-cd/trunk/demudi-debian-cd
   demudi-debian-cd/trunk/tasks/demudi
   demudi-debian-cd/trunk/tasks/exclude-demudi
Log:
demudi-debian-cd:   
 * Do not run xdebconfigurator in late command, it's regularly run by
  
 * Passing the "new" option to demudi-cfengine
  
 * Added missing libraries to base-sarge-extra

Modified: demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_late_command	2004-12-15 11:39:36 UTC (rev 340)
@@ -13,6 +13,7 @@
     demudi-debtags \
     demudi-grub-splashimages \
     demudi-tasksel \
+    xdebconfigurator \
     "
 splash=/boot/grub/splashimages/agnula-romantic.xpm.gz
 

Modified: demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed
===================================================================
--- demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/data/sarge/demudi_i386_preseed	2004-12-15 11:39:36 UTC (rev 340)
@@ -67,7 +67,7 @@
 # This command is run after base-config is done, just before the login:
 # prompt. This is a good way to install a set of packages you want, or to
 # tweak the configuration of the system.
-base-config	base-config/late_command	string /usr/sbin/demudi-cfengine all; /usr/lib/base-config/menu/xdebconfigurator
+base-config	base-config/late_command	string /usr/sbin/demudi-cfengine new
 
 #### Network configuration.
 

Modified: demudi-debian-cd/trunk/debian/changelog
===================================================================
--- demudi-debian-cd/trunk/debian/changelog	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/debian/changelog	2004-12-15 11:39:36 UTC (rev 340)
@@ -38,6 +38,10 @@
   * Run xdebconfigurator in base-config late command, as it's not run otherwise
   * Deleted notes about the vesa and the gnome bug, which are now fixed
   * Added xdebconfigurator to BASE_INCLUDE
+  * Do not run xdebconfigurator in late command, it's regularly run by
+    base-config
+  * Passing the "new" option to demudi-cfengine
+  * Added missing libraries to base-sarge-extra
 
  -- Free Ekanayaka <free@agnula.org>  Sun, 31 Oct 2004 10:14:37 +0100
  
\ No newline at end of file

Modified: demudi-debian-cd/trunk/debian-cd.conf
===================================================================
--- demudi-debian-cd/trunk/debian-cd.conf	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/debian-cd.conf	2004-12-15 11:39:36 UTC (rev 340)
@@ -260,7 +260,7 @@
 # debian-installer). One package per line.  Lines starting with '#'
 # are comments.  The package order is important, as the packages will
 # be installed in the given order.
-export BASE_INCLUDE="$BASEDIR"/data/"$CODENAME"/demudi_"$ARCH"_base_include
+#export BASE_INCLUDE="$BASEDIR"/data/"$CODENAME"/demudi_"$ARCH"_base_include
 
 # File with list of packages to exclude as above.
 #export BASE_EXCLUDE="/usr/share/demudi-debian-cd/base_exclude"

Modified: demudi-debian-cd/trunk/demudi-debian-cd
===================================================================
--- demudi-debian-cd/trunk/demudi-debian-cd	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/demudi-debian-cd	2004-12-15 11:39:36 UTC (rev 340)
@@ -48,7 +48,7 @@
 mkdir -p /var/cache/demudi-debian-cd/tmp/sarge-i386/CD1/dists/sarge/local/debian-installer/binary-i386/
 make bootable
 make packages
-#make md5list
+make md5list
 make bin-images
 
 # Sanity checks

Modified: demudi-debian-cd/trunk/tasks/demudi
===================================================================
--- demudi-debian-cd/trunk/tasks/demudi	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/tasks/demudi	2004-12-15 11:39:36 UTC (rev 340)
@@ -7,6 +7,7 @@
 /* Basic sarge CD */
 #include <debian-installer>
 #include <base-sarge>
+#include <base-sarge-extra>
 #include <forcd1-demudi>
 
 /* DeMuDi */

Modified: demudi-debian-cd/trunk/tasks/exclude-demudi
===================================================================
--- demudi-debian-cd/trunk/tasks/exclude-demudi	2004-12-15 08:18:57 UTC (rev 339)
+++ demudi-debian-cd/trunk/tasks/exclude-demudi	2004-12-15 11:39:36 UTC (rev 340)
@@ -8,10 +8,12 @@
 aspell-es
 aspell-fr
 aspell-pt
-cfdisk-utf8
+aspell-sl
+aspell-sv
+aspell-ukr
+cfdisk-utf8aspell-sk
 gcc272
 kernel-image-2.4.21-5-386kernel-image-2.6-amd64-k8
-kernel-image-2.6.8-9-amd64-k8
 kernel-image-2.6-amd64-k8-smp
 kernel-image-2.6.8-9-amd64-k8-smp
 kernel-image-2.6-em64t-p4
@@ -199,3 +201,203 @@
 xemacs21-gnome-mule-canna-wnn
 xemacs21-nomule
 xemacs21-gnome-nomule
+alsaplayer
+alsaplayer-esd
+alsaplayer-nas
+altgcc
+amaya
+apt-file
+aspell-ca
+aspell-en
+aterm-ml
+bcc
+beep-media-player
+bin86
+bison
+caps
+chimera2
+courier-authdaemon
+courier-base
+courier-mta
+dc
+delo
+dictionaries-common
+dillo
+discover1-udeb
+discover-data-udeb
+discover-udeb
+dnsutils
+doc-debian
+doc-linux-text
+dosfstools
+dvd+rw-tools
+elinks
+elvis
+elvis-common
+elvis-console
+emacs21-nox
+encompass
+epiphany-browser
+esmtp
+esmtp-run
+esound
+esound-clients
+eterm
+exim
+fam
+flex
+gawk
+gimp-svg
+gnome2-user-guide
+gnome-media
+gnome-system-monitor
+gs
+gs-common
+gs-esp
+gs-gpl
+gstreamer0.8-alsa
+gstreamer0.8-artsd
+gstreamer0.8-esd
+gstreamer0.8-misc
+guile1.4
+guile-common
+host
+iamerican
+ibritish
+inetutils-inetd
+inetutils-ping
+inetutils-syslogd
+ipmasqadm
+ispell
+k6fftwgel2
+k7fftwgel2
+kbd-compat
+kcontrol
+kdebase-data
+kdebase-kio-plugins
+kdesktop
+kernel-image-2.6.8-9-amd64-generic
+kernel-image-2.6-amd64-generic
+kernel-package
+kfind
+konqueror
+kterm
+libast2
+libcupsimage2
+libelysium2.0-0
+libggi2
+libgii0
+libgii0-target-x
+libglide2
+libgtkgl2.0-1
+libgtkhtml3.0-4
+libguile9
+libkonq4
+liblua50
+liblualib50
+libpaper-utils
+lynx-cur
+masqmail
+mesag3
+mesag3+ggi
+mesag3-glide2
+mew-beta
+mew-beta-bin
+mime-codecs
+miscfiles
+mozilla-browser
+mozilla-psm
+nautilus-cd-burner
+ncurses-term
+netkit-ping
+nullmailer
+openssl
+original-awk
+perl-tk
+portmap
+postfix
+python2.3-xml
+python-xml
+raptor-utils
+rcs
+realtime-lsm-module-2.6.8-1-386
+realtime-lsm-module-2.6.8-1-686
+realtime-lsm-module-2.6.8-1-686-smp
+realtime-lsm-module-2.6.8-1-k7
+realtime-lsm-module-2.6.8-1-k7-smp
+realtime-lsm-source
+resolvconf
+sendmail-base
+sendmail-bin
+sendmail-cf
+sharutils
+ssmtp
+svgalib1-libggi2
+syslog-ng
+tcc
+tcl8.0-ja
+tetex-doc
+texi2html
+tk8.0-ja
+traceroute
+update
+util-linux-locales
+vacation
+vcdimager
+wamerican
+wbulgarian
+wcatalan
+wdanish
+wdiff
+wdutch
+wfaroese
+wfinnish
+wfrench
+witalian
+wngerman
+wogerman
+wpolish
+wspanish
+wswedish
+wswiss
+wukrainian
+xli
+xloadimage
+xmail
+zenity
+aspell
+aspell-bin
+aspell-fi
+aspell-fo
+aspell-ga
+aspell-gl-minimos
+aspell-is
+aspell-it
+aspell-nl
+aspell-no
+aspell-pl
+aspell-pt-br
+aspell-pt-common
+galeon
+galeon-common
+imlib1
+ipsvd
+kazehakase
+libatk1.0-data
+libft-perl
+libgal2.0-common
+libglib2.0-data
+libgsasl1
+libmailutils0
+libmatrixssl1.2
+libmoe1.5
+libttf2
+mailutils
+metalog
+netrik
+runit
+socklog
+socklog-run
+w3-el-e21
+w3mmee
+w3-url-e21