[Demudi-commits] r8 - in trunk/demudi: debian debian-cd debian-cd/data/sarge debian-cd/tasks trac/scripts trac/templates
Free Ekanayaka
free-guest@haydn.debian.org
Mon, 25 Oct 2004 14:30:09 -0600
Author: free-guest
Date: 2004-10-25 14:29:44 -0600 (Mon, 25 Oct 2004)
New Revision: 8
Added:
trunk/demudi/debian/demudi-trac.postinst
trunk/demudi/debian/demudi-trac.prerm
Modified:
trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include
trunk/demudi/debian-cd/data/sarge/demudi_i386_extra_files
trunk/demudi/debian-cd/debian-cd.conf
trunk/demudi/debian-cd/tasks/exclude-demudi
trunk/demudi/debian/changelog
trunk/demudi/debian/rules
trunk/demudi/trac/scripts/gen-sw-descs
trunk/demudi/trac/templates/wiki.cs
Log:
Minor changes to the web site. Fixed debian-cd bugs.
Modified: trunk/demudi/debian/changelog
===================================================================
--- trunk/demudi/debian/changelog 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian/changelog 2004-10-25 20:29:44 UTC (rev 8)
@@ -1,5 +1,9 @@
demudi (0.2) UNRELEASED; 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
@@ -17,6 +21,10 @@
- added a table with versions and short descriptions
- added named top and back reference link
- using h2 for package names
+ - remove start page link from the wiki header, we have already home
+ - new section Develop
+ - renamed section Docs to Documents
+ - added postinst and prerm scripts to set right permission for the db
-- Free Ekanayaka <free@agnula.org> Mon, 25 Oct 2004 14:27:31 +0200
Added: trunk/demudi/debian/demudi-trac.postinst
===================================================================
--- trunk/demudi/debian/demudi-trac.postinst 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian/demudi-trac.postinst 2004-10-25 20:29:44 UTC (rev 8)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+dpkg-statoverride --update --add www-data www-data 775 /var/www/demudi-trac/db
+dpkg-statoverride --update --add www-data www-data 664 /var/www/demudi-trac/db/trac.db
Added: trunk/demudi/debian/demudi-trac.prerm
===================================================================
--- trunk/demudi/debian/demudi-trac.prerm 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian/demudi-trac.prerm 2004-10-25 20:29:44 UTC (rev 8)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+dpkg-statoverride --remove /var/www/demudi-trac/db
+dpkg-statoverride --remove /var/www/demudi-trac/db/trac.db
Modified: trunk/demudi/debian/rules
===================================================================
--- trunk/demudi/debian/rules 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian/rules 2004-10-25 20:29:44 UTC (rev 8)
@@ -26,7 +26,7 @@
cat tasksel/lists/* | sort > debian-cd/tasks/demudi-tasksel
wget -O trac/db/trac.db http://demudi.alioth.debian.org/db/trac.db
./trac/scripts/gen-sw-descs $(SECTIONS)
- for i in DocsSoftware*; do trac-admin trac wiki import $$i $$i; done
+ for i in DocumentsSoftware*; do trac-admin trac wiki import $$i $$i; done
touch build-stamp
clean:
@@ -38,7 +38,7 @@
-rm debian-cd/tasks/demudi-tasksel
-rm trac/db/trac.db
-rm build-stamp
- -rm DocsSoftware*
+ -rm DocumentsSoftware*
install: build
dh_testdir
Modified: trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include
===================================================================
--- trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian-cd/data/sarge/demudi_i386_base_include 2004-10-25 20:29:44 UTC (rev 8)
@@ -5,3 +5,9 @@
hwinfo
kudzu-vesa
detect
+demudi-menu
+demudi-artwork
+demudi-base-files
+demudi-tasksel
+demudi-base-config
+demudi-cfengine
Modified: trunk/demudi/debian-cd/data/sarge/demudi_i386_extra_files
===================================================================
--- trunk/demudi/debian-cd/data/sarge/demudi_i386_extra_files 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian-cd/data/sarge/demudi_i386_extra_files 2004-10-25 20:29:44 UTC (rev 8)
@@ -1 +1 @@
-.disk/=/usr/share/debian-cd/data/sarge/demudi_i386_prefeed
+.disk/preseed=/usr/share/debian-cd/data/sarge/demudi_i386_preseed
Modified: trunk/demudi/debian-cd/debian-cd.conf
===================================================================
--- trunk/demudi/debian-cd/debian-cd.conf 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian-cd/debian-cd.conf 2004-10-25 20:29:44 UTC (rev 8)
@@ -61,7 +61,7 @@
# This may be an url, or "default", which will make it use the default url
# for the daily d-i builds. If not set, uses the official d-i images from
# the Debian mirror.
-#export DI_WWW_HOME=default
+export DI_WWW_HOME=default
# Version number, "2.2 r0", "2.2 r1" etc.
export DEBVERSION="1.2.1"
@@ -146,7 +146,7 @@
# export MKISOFS=/usr/bin/mkisofs
# export MKISOFS_OPTS="-r" #For normal users
# export MKISOFS_OPTS="-r -F ." #For symlink farmers
-export MKISOFS_OPTS="-graft-points -path-list $BASEDIR/data/$CODENAME/demudi_$ARCH_extra_files"
+export MKISOFS_OPTS="-graft-points -path-list ${BASEDIR}/data/${CODENAME}/demudi_${ARCH}_extra_files"
# ISOLinux support for multiboot on CD1 for i386
export ISOLINUX=1
Modified: trunk/demudi/debian-cd/tasks/exclude-demudi
===================================================================
--- trunk/demudi/debian-cd/tasks/exclude-demudi 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/debian-cd/tasks/exclude-demudi 2004-10-25 20:29:44 UTC (rev 8)
@@ -1,38 +1,32 @@
#include <exclude-sarge>
amiga-fdisk-cross
+aptitude-doc-cs
+aptitude-doc-en
bind9-host
+ca-certificates
+discover
+efibootmgr
elilo
-efibootmgr
elvis-tiny
fbset
finger
gnu-efi
-wamerican-large
-wamerican-small
-wbritish
-wbritish-large
-wbritish-small
-wcanadian
-wcanadian-large
-wcanadian-small
-wgalician-minimos
-wnorwegian
isapnptools
kernel-headers-2.4-386
+kernel-headers-2.4-586tsc
+kernel-headers-2.4-686
+kernel-headers-2.4-686-smp
+kernel-headers-2.4-k6
+kernel-headers-2.4-k7
+kernel-headers-2.4-k7-smp
+kernel-headers-2.4.27-1
kernel-headers-2.4.27-1-386
-kernel-headers-2.4.27-1
-kernel-headers-2.4-586tsc
kernel-headers-2.4.27-1-586tsc
-kernel-headers-2.4-686
kernel-headers-2.4.27-1-686
-kernel-headers-2.4-686-smp
kernel-headers-2.4.27-1-686-smp
-kernel-headers-2.4-k6
kernel-headers-2.4.27-1-k6
-kernel-headers-2.4-k7
kernel-headers-2.4.27-1-k7
-kernel-headers-2.4-k7-smp
kernel-headers-2.4.27-1-k7-smp
kernel-image-2.4.26-1-386
kernel-image-2.4.26-1-686
@@ -59,14 +53,20 @@
nfs-common
palo
pidentd
+python-newt
+python2.3-cjkcodecs
python2.3-iconvcodec
-python2.3-cjkcodecs
python2.3-japanese-codecs
-python-newt
-aptitude-doc-en
-aptitude-doc-cs
tcsh
-texinfo
time
type-handling
-ca-certificates
+wamerican-large
+wamerican-small
+wbritish
+wbritish-large
+wbritish-small
+wcanadian
+wcanadian-large
+wcanadian-small
+wgalician-minimos
+wnorwegian
Modified: trunk/demudi/trac/scripts/gen-sw-descs
===================================================================
--- trunk/demudi/trac/scripts/gen-sw-descs 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/trac/scripts/gen-sw-descs 2004-10-25 20:29:44 UTC (rev 8)
@@ -10,13 +10,13 @@
cache = apt_pkg.GetCache()
records = apt_pkg.GetPkgRecords(cache)
-out = file('DocsSoftware', 'w')
+out = file('DocumentsSoftware', 'w')
print >> out, '= DeMuDi software sections ='
print >> out, ''
for section in sections:
- print >> out, ' * [wiki:DocsSoftware%s %s]' % (section.capitalize(), section.capitalize())
+ print >> out, ' * [wiki:DocumentsSoftware%s %s]' % (section.capitalize(), section.capitalize())
for section in sections:
packages = ((file( 'tasksel/lists/%s' % (section) , 'r')).read()).split('\n')
@@ -24,7 +24,7 @@
put, get = os.popen4('tasksel --task-desc %s' % (section))
description = get.read()
- out = file('DocsSoftware%s' % (section.capitalize()), 'w')
+ out = file('DocumentsSoftware%s' % (section.capitalize()), 'w')
print >> out, "{{{"
print >> out, "#!html"
Modified: trunk/demudi/trac/templates/wiki.cs
===================================================================
--- trunk/demudi/trac/templates/wiki.cs 2004-10-25 13:06:51 UTC (rev 7)
+++ trunk/demudi/trac/templates/wiki.cs 2004-10-25 20:29:44 UTC (rev 8)
@@ -3,7 +3,6 @@
<div id="page-content">
<h2 class="hide">Wiki Navigation</h2>
<ul class="subheader-links">
- <li><a href="<?cs var:$trac.href.wiki ?>">Start Page</a></li>
<li><a href="<?cs var:$trac.href.wiki ?>/TitleIndex">Title Index</a></li>
<li><a href="<?cs var:$trac.href.wiki ?>/RecentChanges">Recent Changes</a></li>
<?cs if $wiki.history ?>
@@ -24,14 +23,14 @@
</div>
<div id="left">
-<div class="section-label">Docs</div>
+<div class="section-label">Documents</div>
<div class="section-links">
<ul>
-<li><a href="<?cs var:$trac.href.wiki ?>/DocsConcept">Concept</a></li>
-<li><a href="<?cs var:$trac.href.wiki ?>/DocsOverview">Overview</a></li>
-<li><a href="<?cs var:$trac.href.wiki ?>/DocsSoftware">Software</a></li>
-<li><a href="<?cs var:$trac.href.wiki ?>/DocsFAQ">FAQ</a></li>
-<li><a href="<?cs var:$trac.href.wiki ?>/DocsManuals">Manuals</a></li>
+<li><a href="<?cs var:$trac.href.wiki ?>/DocumentsConcept">Concept</a></li>
+<li><a href="<?cs var:$trac.href.wiki ?>/DocumentsOverview">Overview</a></li>
+<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>
</ul>
</div>
</div>
@@ -46,6 +45,16 @@
</div>
</div>
+<div id="left">
+<div class="section-label">Develop</div>
+<div class="section-links">
+<ul>
+<li><a href="<?cs var:$trac.href.wiki ?>/DevelopBugs">Bugs</a></li>
+<li><a href="<?cs var:$trac.href.wiki ?>/DevelopCode">Code</a></li>
+</ul>
+</div>
+</div>
+
<?cs def:day_separator(date) ?>
<?cs if: $date != $current_date ?>
<?cs set: $current_date = $date ?>