[Demudi-commits] r9 - in trunk/demudi: debian debian-cd debian-cd/data/sarge debian-cd/tasks tasksel/descs trac/templates

Free Ekanayaka free-guest@haydn.debian.org
Tue, 26 Oct 2004 05:29:21 -0600


Author: free-guest
Date: 2004-10-26 05:29:15 -0600 (Tue, 26 Oct 2004)
New Revision: 9

Added:
   trunk/demudi/debian-cd/tasks/base-demudi
   trunk/demudi/debian-cd/tasks/unexclude-CD2-demudi
Removed:
   trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include
Modified:
   trunk/demudi/debian-cd/debian-cd.conf
   trunk/demudi/debian-cd/tasks/demudi
   trunk/demudi/debian/changelog
   trunk/demudi/debian/rules
   trunk/demudi/tasksel/descs/default
   trunk/demudi/tasksel/descs/edit
   trunk/demudi/trac/templates/wiki.cs
Log:
release 0.4

Modified: trunk/demudi/debian/changelog
===================================================================
--- trunk/demudi/debian/changelog	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian/changelog	2004-10-26 11:29:15 UTC (rev 9)
@@ -1,19 +1,50 @@
-demudi (0.2) UNRELEASED; urgency=low
+demudi (0.4) unstable; urgency=low
 
   * debian-cd:
+     - removed xdebconfigurator and localization-config from the base-demudi,
+       installing them in the second stage
+  
+ -- Free Ekanayaka <free@agnula.org>  Tue, 26 Oct 2004 13:11:34 +0200
+
+demudi (0.3) unstable; urgency=low
+
+  * debian-cd:
+     - removed task forcd1, we don't need many of those packages
+     - removed msttcorefonts from the default task, as it is in contrib
+     - removed detect from the default task, as it dosn't exist anymore
+     - removed hwsetup and kudzu-vesa from the default task, as the are
+       knoppix specific
+     - new base-demudi task for extra packages to be installed with dbootstrap
+  
+  * tasksel:
+     - removed rcconf, songwrite, t-gnus, as they are currently blocked in sid due to
+       serious bugs. we may reconsider their inclusion once the bugs are fixed
+     - replaced snd with snd-gtk-alsa and snd-doc
+  
+  * trac:
+     - added history link to the documents section
+  
+ -- Free Ekanayaka <free@agnula.org>  Tue, 26 Oct 2004 10:31:04 +0200
+
+demudi (0.2) unstable; urgency=low
+
+  * debian-cd:
      - un-excluded texinfo, needed by lilypond
      - set DI_WWW_HOME to use daily built image
      - excluded discover2
+  
   * tasksel:
      - added apt-spy to the default packages
      - renamed editors in edit
      - renamed recording in record
      - renamed djing in dj
+  
   * cfengine:
      - removed ide-scsi script, have to find a better solution with ide-cd
      - new naming policy: scripts are named against the package they deal
        with, which chunks are named package-somedirname_otherdirname_filename;
        renamed files accordingly
+  
   * trac:
      - first version of the package
      - automatized creation of software description pages
@@ -25,6 +56,7 @@
      - new section Develop
      - renamed section Docs to Documents
      - added postinst and prerm scripts to set right permission for the db
+     - added Hystory link in Docs
   
  -- Free Ekanayaka <free@agnula.org>  Mon, 25 Oct 2004 14:27:31 +0200
 

Modified: trunk/demudi/debian/rules
===================================================================
--- trunk/demudi/debian/rules	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian/rules	2004-10-26 11:29:15 UTC (rev 9)
@@ -22,6 +22,7 @@
 
 build: build-stamp
 build-stamp:
+	cp debian-cd/tasks/base-demudi debian-cd/data/sarge/demudi_i386_base_include
 	cd tasksel && ./makedesc.pl descs/ demudi-tasks.desc && cd ..
 	cat tasksel/lists/* | sort > debian-cd/tasks/demudi-tasksel
 	wget -O trac/db/trac.db http://demudi.alioth.debian.org/db/trac.db
@@ -33,6 +34,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean
+	-rm debian-cd/data/sarge/demudi_i386_base_include
 	-rm -R tasksel/lists
 	-rm tasksel/demudi-tasks.desc
 	-rm debian-cd/tasks/demudi-tasksel

Deleted: trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include
===================================================================
--- trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include	2004-10-26 11:29:15 UTC (rev 9)
@@ -1,13 +0,0 @@
-discover1
-discover1-data
-xdebconfigurator
-read-edid
-hwinfo
-kudzu-vesa
-detect
-demudi-menu
-demudi-artwork
-demudi-base-files
-demudi-tasksel
-demudi-base-config
-demudi-cfengine

Modified: trunk/demudi/debian-cd/debian-cd.conf
===================================================================
--- trunk/demudi/debian-cd/debian-cd.conf	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian-cd/debian-cd.conf	2004-10-26 11:29:15 UTC (rev 9)
@@ -167,7 +167,8 @@
 # We don't want certain packages to take up space on CD1...
 export EXCLUDE="$BASEDIR"/tasks/exclude-demudi
 # ...but they are okay for other CDs (UNEXCLUDEx == may be included on CD >= x)
-#export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-sarge
+export UNEXCLUDE2="$BASEDIR"/tasks/unexclude-CD2-demudi
+
 # Any packages listed in EXCLUDE but not in any UNEXCLUDE will be
 # excluded completely.
 
@@ -272,7 +273,7 @@
 
 # Parameters to pass to kernel when the CD boots. Not currently supported
 # for all architectures.
-export KERNEL_PARAMS="preseed/file=/cdrom/.disk/preseed vga=791 video=vesafb:ypan"
+export KERNEL_PARAMS="preseed/file=/cdrom/.disk/preseed vga=791 video=vesafb:ypan debconf/priority=critical mirror/suite=sarge"
 
 # If set, limits the number of binary CDs to produce.
 #export MAXCDS=1

Added: trunk/demudi/debian-cd/tasks/base-demudi
===================================================================
--- trunk/demudi/debian-cd/tasks/base-demudi	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian-cd/tasks/base-demudi	2004-10-26 11:29:15 UTC (rev 9)
@@ -0,0 +1,8 @@
+demudi-base-config
+demudi-base-files
+demudi-cfengine
+demudi-menu
+demudi-tasksel
+discover1
+discover1-data
+hwinfo

Modified: trunk/demudi/debian-cd/tasks/demudi
===================================================================
--- trunk/demudi/debian-cd/tasks/demudi	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian-cd/tasks/demudi	2004-10-26 11:29:15 UTC (rev 9)
@@ -7,21 +7,8 @@
 /* Basic sarge CD */
 #include <debian-installer>
 #include <base-sarge>
-#include <forcd1>
+#include <base-demudi>
 
 /* DeMuDi */
 #include <demudi-kernel>
 #include <demudi-tasksel>
-
-/*
-#include <demudi-base>
-#include <demudi-xfree86>
-#include <demudi-fluxbox>
-#include <demudi-gnome>
-#include <demudi-non-free>*/
-
-/* Other interesting packages */
-/*#include <interesting-fromcd23>*/
-
-/* The rest ordered by popularity */
-/* #include <popularity-contest-sarge>*/

Added: trunk/demudi/debian-cd/tasks/unexclude-CD2-demudi
===================================================================
--- trunk/demudi/debian-cd/tasks/unexclude-CD2-demudi	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/debian-cd/tasks/unexclude-CD2-demudi	2004-10-26 11:29:15 UTC (rev 9)
@@ -0,0 +1,10 @@
+alsa-base
+alsa-source
+alsa-utils
+debhelper
+gimp
+grep-dctrl
+html2text
+intltool
+kernel-source-2.4.25 
+po-debconf

Modified: trunk/demudi/tasksel/descs/default
===================================================================
--- trunk/demudi/tasksel/descs/default	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/tasksel/descs/default	2004-10-26 11:29:15 UTC (rev 9)
@@ -49,6 +49,8 @@
  debtags-edit
  dhcp-client
  dict
+ discover1
+ discover1-data
  docker
  docker
  e2fsprogs
@@ -80,7 +82,6 @@
  hotplug
  hwdata
  hwinfo
- hwsetup
  irssi-text
  jack-tools
  jackd
@@ -92,6 +93,7 @@
  links
  linuxlogo
  lm-sensors
+ localization-config
  lynx
  mc
  mdetect
@@ -103,7 +105,6 @@
  mozilla-firefox
  mp32ogg
  mpg321
- msttcorefonts
  mtools
  music123
  mutt
@@ -118,8 +119,6 @@
  psutils
  pump
  qjackctl
- rcconf
- read-edid
  realtime-lsm
  reportbug
  rsync
@@ -130,7 +129,6 @@
  strace
  sudo
  synaptic
- t-gnus
  tagcoll
  tagcolledit
  tasksel

Modified: trunk/demudi/tasksel/descs/edit
===================================================================
--- trunk/demudi/tasksel/descs/edit	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/tasksel/descs/edit	2004-10-26 11:29:15 UTC (rev 9)
@@ -18,7 +18,8 @@
  id3v2
  rezound
  smurf
- snd
+ snd-gtk-alsa
+ snd-doc
  sweep
  wavesurfer
  xsox

Modified: trunk/demudi/trac/templates/wiki.cs
===================================================================
--- trunk/demudi/trac/templates/wiki.cs	2004-10-25 20:29:44 UTC (rev 8)
+++ trunk/demudi/trac/templates/wiki.cs	2004-10-26 11:29:15 UTC (rev 9)
@@ -31,6 +31,7 @@
 <li><a href="<?cs var:$trac.href.wiki ?>/DocumentsSoftware">Software</a></li>
 <li><a href="<?cs var:$trac.href.wiki ?>/DocumentsFAQ">FAQ</a></li>
 <li><a href="<?cs var:$trac.href.wiki ?>/DocumentsManuals">Manuals</a></li>
+<li><a href="<?cs var:$trac.href.wiki ?>/DocumentsHistory">History</a></li>
 </ul>
 </div>
 </div>