[SCM] pkg-kde.alioth.debian.org website branch, master, updated. 46e6ee2be31d3d1b359db413d24c7fc3c2361182
Eshat Cakar
eshat-guest at alioth.debian.org
Mon Jun 6 12:22:34 UTC 2011
The following commit has been merged in the master branch:
commit f90002b0b5fd6758cbc4ad4d400e335cdd8a3fbe
Author: Eshat Cakar <info at eshat.de>
Date: Mon Jun 6 14:11:28 2011 +0200
Clean up unused files and
update web-maintaince documentation
---
genweb-hook.sh | 26 ----------------
oldpages/kde4livecd | 80 -------------------------------------------------
pages/web-maintenance | 17 ++++++----
3 files changed, 10 insertions(+), 113 deletions(-)
diff --git a/genweb-hook.sh b/genweb-hook.sh
deleted file mode 100755
index b6574fe..0000000
--- a/genweb-hook.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -e
-
-umask 002
-DIR=/var/lib/gforge/chroot/home/groups/pkg-kde/web-autoupdate/www/v2
-OUTPUT=/var/lib/gforge/chroot/home/groups/pkg-kde/web-autoupdate/www/v2/output
-rm -rf $DIR/pages/*~ $OUTPUT
-mkdir -p $OUTPUT
-FILES=`ls $DIR/pages/ | grep -v "style.css\|top\|bottom"`
-
-cp $DIR/pages/style.css $OUTPUT/style.css
-cp -a $DIR/images $OUTPUT/
-cp $DIR/images/KDEbian2.ico $OUTPUT/favicon.ico
-
-
-for i in $FILES
-do
- cat $DIR/pages/top > $OUTPUT/$i.html
- cat $DIR/pages/$i >> $OUTPUT/$i.html
- cat $DIR/pages/bottom >> $OUTPUT/$i.html
-done
-
-sh $DIR/genrss.sh > $OUTPUT/rss.xml
-
-# find $OUTPUT/ -name ".svn" -exec rm -rf {} \; || true
-chmod -R g+w $OUTPUT/*
-cp -a $OUTPUT/* /var/lib/gforge/chroot/home/groups/pkg-kde/htdocs
diff --git a/oldpages/kde4livecd b/oldpages/kde4livecd
deleted file mode 100644
index 2698048..0000000
--- a/oldpages/kde4livecd
+++ /dev/null
@@ -1,80 +0,0 @@
-
- <h2>KDE 4.0 live CD<img src="../images/cd_64.png" style="float:right; margin:-8px 0 0 0;" /></h2>
- <p>The livecd is currently outdated, please wait for a new update if you want a better livecd experience - the software is from january</p>
-
- <p>Thanks to the efforts of the <a href="http://debian-live.alioth.debian.org/">Debian Live</a>
- project, we have created live CDs with experimental versions of KDE 4.</p>
- <p>These live CDs allow users to try the latest KDE 4 without any risk to their existing installation.</p>
-
- <h3>Technical details</h3>
-
- <p style="margin-bottom:0.1em;"> At the login screen, enter:</p>
-
- <table style="margin-left:5em">
- <tr>
- <td style="width:7em;"><b>username</b></td>
- <td>user</td>
- </tr>
- <tr>
- <td><b>password</b></td>
- <td>live</td>
- </tr>
- </table>
-
-
- <br />
-
- <p style="margin-bottom:0.1em;">If you do not use an English keyboard layout, you can specify your two-letter ISO language code at the boot prompt:
- <table style="margin-left:5em">
- <tr>
- <td style="width:15em;"><b>live keyb=</b>fr</td>
- <td><i>French AZERTY layout</i></td>
- </tr>
- <tr>
- <td><b>live keyb=</b>de</td>
- <td><i>German QWERTZ layout</i></td>
- </tr>
- <tr>
- <td><b>live keyb=</b>es</td>
- <td><i>Spanish QWERTY layout</i></td>
- </tr>
- </table>
-
- <br />
-
- <p>For more information on options for the Live CD, see <a href="http://live.debian.net/other/manpages/live-initramfs.7.html">the live-initramfs manual page</a>.</p>
-
- <h3>Download the Debian KDE 4.0 live CD</h3>
- <p>Please use BitTorrent if possible to minimize the strain on our servers.</p>
-
- <ul>
- <li><a>Torrent for AMD64 (Coming soon!)</a></li>
- <li><a>Torrent for i386 (Coming soon!)</a></li>
- </ul>
-
-
- <p>If you cannot use BitTorrent, please use the following mirrors:</p>
- <blockquote>
- <table>
- <tr>
- <td style="width:6em;">amd64</td>
- <td><a>Coming soon!</a></td>
- </tr>
- <tr>
- <td>i386</td>
- <td><a>Coming soon!</a></td>
- </tr>
- </table>
- </blockquote>
-<!--
- <h3>How to use the live CD in a QEMU virtual machine</h3>
-
- <p>To install the QEMU virtual machine software, see the tutorial at <a href="http://wiki.debian.org/QEMU">FIXME</a><p>
-
- <p>Run the cd with the following line:</p>
- <pre>qemu -cdrom FIXME.iso</pre>
--->
- <h3>Troubleshooting and Support</h3>
- <p>If you run into any problem and need help, you can send a mail to the
- <a href="http://lists.debian.org/debian-kde/">Debian KDE support list.</a>
- The list is not moderated, so you can post without subscribing.</p>
diff --git a/pages/web-maintenance b/pages/web-maintenance
index b467f09..7aacc07 100644
--- a/pages/web-maintenance
+++ b/pages/web-maintenance
@@ -1,18 +1,21 @@
<h2>Debian KDE Team Web Maintenance<img alt="webmaint_icon" src="../images/webmaint_64.png" style="float:right; margin:-8px 0 0 0;" /></h2>
<ol>
- <li>Edit/create pages in folder `pkg-kde/www/v2/pages/'.<br />
+ <li>Edit/create pages (without .html suffix) in folder './pages/'.<br />
These pages must only include its very own content.<br />
- Header and footer are in files `top' and `bottom'.</li>
+ Header, sidebar and footer are in files 'top' and 'bottom' and will be appended <br />
+ by running genweb.sh Skript in next step.</li>
- <li>Run script `pkg-kde/www/v2/genweb.sh'.
- It will create full-fledged pages in folder `pkg-kde/www/v2/output/'.</li>
+ <li>Run script './genweb.sh'.
+ It will create full-fledged pages in folder './output/'.</li>
<li>Use a browser to check your changes, and repeat previous steps if necessary.</li>
- <li>Commit the modifications you did inside `pkg-kde/www/v2/pages/'.</li>
+ <li>Commit the modifications you did inside 'pkg-kde/www/v2/pages/'.</li>
- <li>After every commit under www/ the website is updated
- automatically.</li>
+ <li>After every commit to git.debian.org the website is updated
+ automatically by running a cronjob on wagner. This pulls the changes and invokes
+ the git post-merge hook (located in .git/hooks/) to run genweb.sh and copy
+ content from output to ../htdocs/</li>
</ol>
--
pkg-kde.alioth.debian.org website
More information about the pkg-kde-commits
mailing list