[Cdd-commits] r854 - in cdd/trunk/webtools: . po templates webconf
CDD Subversion Commit
noreply at alioth.debian.org
Mon Jun 23 13:24:29 UTC 2008
Author: tille
Date: Mon Jun 23 13:24:29 2008
New Revision: 854
Modified:
cdd/trunk/webtools/cddtasktools.py
cdd/trunk/webtools/mkpot.sh
cdd/trunk/webtools/po/cdd-webtools.pot
cdd/trunk/webtools/po/da.po
cdd/trunk/webtools/po/de.po
cdd/trunk/webtools/po/fr.po
cdd/trunk/webtools/po/it.po
cdd/trunk/webtools/po/pt.po
cdd/trunk/webtools/tasks.py
cdd/trunk/webtools/templates/tasks.xhtml
cdd/trunk/webtools/templates/tasks_idx.xhtml
cdd/trunk/webtools/webconf/debian-edu.conf
cdd/trunk/webtools/webconf/debian-gis.conf
cdd/trunk/webtools/webconf/debian-junior.conf
cdd/trunk/webtools/webconf/debian-med.conf
cdd/trunk/webtools/webconf/debian-science.conf
Log:
Factorisation of CDD typical stuff in separate config files. Not yet working: Localisation of CDD specific "advertising text"
Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py (original)
+++ cdd/trunk/webtools/cddtasktools.py Mon Jun 23 13:24:29 2008
@@ -29,52 +29,86 @@
BASEURL = 'http://ftp.debian.org/'
# SVNHOST = 'svn+ssh://svn.debian.org'
SVNHOST = 'svn://svn.debian.org'
-REPOS = { 'debian-med' : SVNHOST+"/svn/cdd/projects/med/trunk/debian-med",
- 'debian-edu' : SVNHOST+"/svn/debian-edu/trunk/src/debian-edu",
- 'debian-gis' : SVNHOST+"/pkg-grass/packages/debian-gis",
- 'debian-junior' : SVNHOST+"/svn/cdd/projects/junior/trunk/debian-junior",
- 'debian-science' : SVNHOST+"/svn/cdd/projects/science/trunk/debian-science",
- }
-HTMLBASE = "/var/lib/gforge/chroot/home/groups"
-DATADIR = { 'debian-med' : HTMLBASE+"/debian-med/data",
- 'debian-edu' : HTMLBASE+"/cdd/data/edu",
- 'debian-gis' : HTMLBASE+"/cdd/data/gis",
- 'debian-junior' : HTMLBASE+"/cdd/data/junior",
- 'debian-science' : HTMLBASE+"/cdd/data/science",
- }
KEYSTOIGNORE = ( 'Architecture', 'Leaf', 'NeedConfig', 'Note', 'Section' )
GLOBALCACHE = "/var/cache/cdd/"
DDTPURL = "http://ddtp.debian.net/debian/dists/"
DDTPDIR = "/i18n/Translation-"
DDTPLISTS = ('etch', 'lenny', 'sid')
+CONFDIR = 'webconf'
+
# COMPRESSIONEXTENSION='bz2'
COMPRESSIONEXTENSION='gz'
-def InitTasksFiles(cddname):
+def ReadConfig(cddname=''):
+ # Try to read config file CONFDIR/<cddname>.conf
+ conffile = CONFDIR + '/' + cddname + '.conf'
+ if not os.access(conffile, os.R_OK):
+ # if config file can not be found in local dir, try /etc/cdd/webconf as fallback
+ conffile_default = '/etc/cdd/webconf/' + cddname + '.conf'
+ if not os.access(conffile_default, os.R_OK):
+ print >>stderr, "Unable to open config file %s or %s." % (conffile, conffile_default)
+ exit(-1)
+ conffile = conffile_default
+ f = open(conffile, 'r')
+ ret = { 'CDD' : '',
+ 'projectname' : '',
+ 'projecturl' : '',
+ 'homepage' : '',
+ 'aliothurl' : '',
+ 'projectlist' : '',
+ 'logourl' : '',
+ 'css' : '',
+ 'outputdir' : '',
+ 'datadir' : '',
+ 'cachedir' : '/var/lib/gforge/chroot/home/groups/cdd/cache',
+ 'advertising' : '',
+ }
+ for stanza in deb822.Sources.iter_paragraphs(f, shared_storage=False):
+ ret['CDD'] = stanza['cdd'] # short name of the project
+ ret['projectname'] = stanza['projectname'] # Printed name of the project
+ ret['projecturl'] = stanza['projecturl'] # Link to the developer page with dynamic content
+ # like for instance these tasks pages
+ ret['homepage'] = stanza['homepage'] # Homepage with general information about the project
+ # for instance at www.debian.org or wiki.debian.org
+ ret['aliothurl'] = stanza['aliothurl'] # Link to the Alioth page of the project
+ ret['projectlist'] = stanza['projectlist'] # Mailinglist of the project
+ if stanza.has_key('logourl'):
+ ret['logourl'] = stanza['logourl'] # URL to logo image (might be missing
+ ret['css'] = stanza['css'] # (relative) URL to CSS file
+ ret['outputdir'] = stanza['outputdir'] # Dir for storing output HTML files
+ ret['datadir'] = stanza['datadir'] # Dir for storing SVN information about project
+ ret['cachedir'] = stanza['cachedir'] # Cache for Package and DDTP files - could be common
+ # for all CDDs that's why the default value makes sense
+ ret['vcsdir'] = stanza['vcsdir'] # Path to CDD information files at svn.debian.org
+ if stanza.has_key('advertising'):
+ ret['advertising'] = stanza['advertising'] # Some advertising text for the headline
+
+ return ret
+
+
+def InitTasksFiles(data):
# Obtain tasks files from SVN of a CDD
- # cddname can be: debian-med, debian-edu, debian-science
- # In case you know another CDD that uses the meta package
- # technology make sure to include the location in the
- # REPOS dictionary
+ # The specification of the repository containing the tasks files
+ # of a CDD can be done in webconf/<CDD>.conf
# tasks directory to obtain dependencies and debian/control to obtain meta
# information like the metapackage prefix
for dir in ('tasks', 'debian'):
- tasksdir = DATADIR[cddname] + '/' + dir
+ tasksdir = data['datadir'] + '/' + dir
if not os.access(tasksdir, os.W_OK):
try:
os.makedirs(tasksdir)
except:
print >> stderr, "Unable to create data directory", tasksdir
# Checkout/Update tasks from SVN
- svncommand = "svn %%s %s/%s %s >> /dev/null" % (REPOS[cddname], dir, tasksdir)
+ svncommand = "svn %%s %s/%s %s >> /dev/null" % (SVNHOST, data['vcsdir'], tasksdir)
if os.path.isdir(tasksdir+'/.svn'):
os.system(svncommand % 'up')
else:
os.system("mkdir -p %s" % (tasksdir))
os.system(svncommand % 'co')
- return DATADIR[cddname] + '/tasks'
+ return data['datadir'] + '/tasks'
def SplitDescription(description):
# Split first line of Description value as short description
@@ -173,12 +207,9 @@
# See below for more information about Available class
global available
- if cddname not in REPOS.keys():
- print >>stderr, "Unknown CDD."
- return None
-
- self.cddname = cddname
- self.tasksdir = InitTasksFiles(self.cddname)
+ self.data = ReadConfig(cddname)
+ self.cddname = self.data['CDD']
+ self.tasksdir = InitTasksFiles(self.data)
self.tasks = {} # Dictionary of TasksDependency objects
self.metapackagekeys = []
self.available = available
@@ -211,7 +242,7 @@
exit(-1)
# The prefix is used to build the meta package name that belongs to the task
- cmd = "cd %s; %s metapackageprefix" % (DATADIR[self.cddname], cdd_get_names)
+ cmd = "cd %s; %s metapackageprefix" % (self.data['datadir'], cdd_get_names)
pipe = Popen(cmd, shell=True, stdout=PIPE).stdout
prefix = pipe.read().strip() + '-'
pipe.close()
@@ -362,15 +393,13 @@
class TaskDependencies:
# List of depencencies defined in one Metapackage
def __init__(self, cddname, task, tasksdir=None, prefix=''):
- if cddname not in REPOS.keys():
- print >>stderr, "Unknown CDD."
- return None
- self.cddname = cddname
+ self.data = ReadConfig(cddname)
+ self.cddname = self.data['CDD']
if tasksdir != None:
self.tasksdir = tasksdir
else:
- self.tasksdir = InitTasksFiles(self.cddname)
+ self.tasksdir = InitTasksFiles(self.data)
self.taskfile = self.tasksdir+'/'+task
if os.path.isfile(self.taskfile):
self.task = task
Modified: cdd/trunk/webtools/mkpot.sh
==============================================================================
--- cdd/trunk/webtools/mkpot.sh (original)
+++ cdd/trunk/webtools/mkpot.sh Mon Jun 23 13:24:29 2008
@@ -11,6 +11,19 @@
--output-dir="po" \
--escape \
--output="${NAME}.pot" \
+ --language="Python" \
tasks.py templates/tasks_idx.xhtml templates/tasks.xhtml
-# --language="Python" \
+# Fake xgettext output for config files
+grep --with-filename --line-number "_(.\+)" webconf/*.conf | \
+ perl -ne '/^([^:]+):([0-9]+):.*_\(\W(.+)\W\)/; print "\n#: $1:$2\nmsgid \"$3\"\nmsgstr\"\"\n";' \
+ >> po/${NAME}.pot
+
+exit
+
+#: tasks.py:109
+msgid "Packages"
+msgstr ""
+webconf/debian-med.conf:Advertising: {gettext = _('Help us to see Debian used by medical practicioners and researchers! Join us on the <a href="http://alioth.debian.org/projects/debi
+webconf/test.conf:Advertising= _('Help us to see Debian used by medical practicioners and researchers! Join us on the <a href="http=//alioth.debian.org/projects/debian-med">Alioth pa
+
Modified: cdd/trunk/webtools/po/cdd-webtools.pot
==============================================================================
--- cdd/trunk/webtools/po/cdd-webtools.pot (original)
+++ cdd/trunk/webtools/po/cdd-webtools.pot Mon Jun 23 13:24:29 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: cdd-webtools 0.1.1\n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
-"POT-Creation-Date: 2008-06-20 13:55+0200\n"
+"POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,49 +16,49 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr ""
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr ""
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr ""
-#: tasks.py:78
+#: tasks.py:76
msgid "Version"
msgstr ""
-#: tasks.py:79
+#: tasks.py:77
msgid "Summary"
msgstr ""
-#: tasks.py:80
+#: tasks.py:78
msgid "Last update:"
msgstr ""
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr ""
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr ""
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr ""
-#: tasks.py:84
+#: tasks.py:82
msgid ""
"For a better overview of the project's availability as a Debian package, "
"each head row has a color code according to this scheme:"
msgstr ""
-#: tasks.py:85
+#: tasks.py:83
#, python-format
msgid ""
"If you discover a project which looks like a good candidate for %s\n"
@@ -68,7 +68,7 @@
"href=\"mailto:%s\">%s mailing list</a>"
msgstr ""
-#: tasks.py:89
+#: tasks.py:87
#, python-format
msgid ""
"The list to the right includes various software projects which are of some "
@@ -77,66 +77,62 @@
"which can sensibly add to a high quality Custom Debian Distribution."
msgstr ""
-#: tasks.py:90
+#: tasks.py:88
msgid "Tasks page"
msgstr ""
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr ""
-#: tasks.py:92
-#, python-format
-msgid ""
-"Help us to see Debian used by medical practicioners and researchers!\n"
-"Join us on the\n"
-"<a href=\"%s\">Alioth page</a>."
-msgstr ""
-
-#: tasks.py:97
+#: tasks.py:93
msgid ""
"Green: The project is <a href=\"#official-debs\">available as an official "
"Debian package</a>"
msgstr ""
-#: tasks.py:98
+#: tasks.py:94
msgid ""
"Yellow: The project is <a href=\"#unofficial-debs\">available as an "
"unofficial Debian package</a>"
msgstr ""
-#: tasks.py:99
+#: tasks.py:95
msgid ""
"Red: The project is <a href=\"#prospective-debs\">not (yet) available as a "
"Debian package</a>"
msgstr ""
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr ""
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr ""
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr ""
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr ""
-#: tasks.py:110
+#: tasks.py:106
msgid ""
"Experimental or unofficial Debian packages, projects with packaging stuff in "
"SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
msgid "Debian packages not available"
msgstr ""
-#: tasks.py:113
+#: tasks.py:109
msgid "Packages"
msgstr ""
+
+#: webconf/debian-med.conf:14
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr""
Modified: cdd/trunk/webtools/po/da.po
==============================================================================
--- cdd/trunk/webtools/po/da.po (original)
+++ cdd/trunk/webtools/po/da.po Mon Jun 23 13:24:29 2008
@@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: cdd-webtools 0.1.1\n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
- "POT-Creation-Date: 2008-06-20 13:55+0200\n"
+ "POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -15,48 +15,48 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr ""
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr ""
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr ""
-#: tasks.py:78
+#: tasks.py:76
msgid "Version"
msgstr ""
-#: tasks.py:79
+#: tasks.py:77
msgid "Summary"
msgstr ""
-#: tasks.py:80
+#: tasks.py:78
msgid "Last update:"
msgstr ""
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr ""
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr ""
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr ""
-#: tasks.py:84
+#: tasks.py:82
msgid "For a better overview of the project's availability as a Debian package, each head row "
"has a color code according to this scheme:"
msgstr ""
-#: tasks.py:85
+#: tasks.py:83
#, python-format
msgid "If you discover a project which looks like a good candidate for %s\n"
" to you, or if you have prepared an inofficial Debian "
@@ -65,7 +65,7 @@
"s\">%s mailing list</a>"
msgstr ""
-#: tasks.py:89
+#: tasks.py:87
#, python-format
msgid "The list to the right includes various software projects which are of some interest to "
"the %s Project. Currently, only a few of them are available as Debian packages. It is our "
@@ -73,64 +73,62 @@
"Custom Debian Distribution."
msgstr ""
-#: tasks.py:90
+#: tasks.py:88
msgid "Tasks page"
msgstr ""
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr ""
-#: tasks.py:92
-#, python-format
-msgid "Help us to see Debian used by medical practicioners and researchers!\n"
- "Join us on the\n"
- "<a href=\"%s\">Alioth page</a>."
-msgstr ""
-
-#: tasks.py:97
+#: tasks.py:93
msgid "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
"a>"
msgstr ""
-#: tasks.py:98
+#: tasks.py:94
msgid "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
"package</a>"
msgstr ""
-#: tasks.py:99
+#: tasks.py:95
msgid "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
"package</a>"
msgstr ""
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr ""
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr ""
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr ""
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr ""
-#: tasks.py:110
+#: tasks.py:106
msgid "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
msgid "Debian packages not available"
msgstr ""
-#: tasks.py:113
+#: tasks.py:109
msgid "Packages"
msgstr ""
+#: webconf/debian-med.conf:14
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a "
+ "href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr ""
+
#
# These strings occured in the old *.php files and the translations should be
# preserved for later use.
Modified: cdd/trunk/webtools/po/de.po
==============================================================================
--- cdd/trunk/webtools/po/de.po (original)
+++ cdd/trunk/webtools/po/de.po Mon Jun 23 13:24:29 2008
@@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
- "POT-Creation-Date: 2008-06-20 13:55+0200\n"
+ "POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: 2008-02-17 17:13:51+0200\n"
"Last-Translator: Steffen Möller, Andreas Tille <{moeller,tille}@debian.org>\n"
"Language-Team: German <de at li.org>\n"
@@ -15,49 +15,49 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr "Betreuer"
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr "Verantwortlich"
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr "Lizenz"
-#: tasks.py:78
+#: tasks.py:76
msgid "Version"
msgstr "Version"
-#: tasks.py:79
+#: tasks.py:77
msgid "Summary"
msgstr "Zusammenfassung"
-#: tasks.py:80
+#: tasks.py:78
msgid "Last update:"
msgstr "Zuletzt aktualisiert:"
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr "Offizielles Debianpaket"
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr "Inoffizielles Debianpaket"
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr "Debianpaket nicht verfügbar"
-#: tasks.py:84
+#: tasks.py:82
msgid "For a better overview of the project's availability as a Debian package, each head row "
"has a color code according to this scheme:"
msgstr "Um einen besseren Überblick über die Verfügbarkeit der Projekte als Debian Paket zu "
"geben, hat jede Kopfzeile einen Farbcode entsprechend diesem Schema:"
-#: tasks.py:85
+#: tasks.py:83
#, python-format
msgid "If you discover a project which looks like a good candidate for %s\n"
" to you, or if you have prepared an inofficial Debian "
@@ -68,79 +68,78 @@
"Sie ein inoffizielles Debianpaket erstellt haben, zögern Sie bitte nicht eine "
"Beschreibung des Projekts an die <a href=\"mailto:%s\">%s Mailingliste</a> zu schicken."
-#: tasks.py:89
+#: tasks.py:87
+#, python-format
msgid "The list to the right includes various software projects which are of some interest to "
"the %s Project. Currently, only a few of them are available as Debian packages. It is our "
"goal, however, to include all software in %s which can sensibly add to a high quality "
"Custom Debian Distribution."
msgstr "Die Liste auf der rechten Seite enthält verschiedene Softwareprojekte, die für das %s "
"Projekt von Interesse sind. Derzeit sind nur einige von diesen als Debianpakete "
- "verfügbar. Zielsetzung ist es jedoch, all die Software für %s zu paketieren, um einen qualitativ "
- "hochwertigeCustom Debian Distribution (interne Anpassung von Debian an spezielle "
- "Bedürfnisse) zu erstellen."
+ "verfügbar. Zielsetzung ist es jedoch, all die Software für %s zu paketieren, um einen "
+ "qualitativ hochwertigeCustom Debian Distribution (interne Anpassung von Debian an "
+ "spezielle Bedürfnisse) zu erstellen."
-#: tasks.py:90
+#: tasks.py:88
msgid "Tasks page"
msgstr "Aufgaben"
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr "Projekt"
-#: tasks.py:92
-#, python-format
-msgid "Help us to see Debian used by medical practicioners and researchers!\n"
- "Join us on the\n"
- "<a href=\"%s\">Alioth page</a>."
-msgstr "Hilf uns dabei, Debian für Ärzte und Forscher attraktiv zu machen!\n"
- "Du kannst dem Projekt auf der <a href=\"%s\">Alioth Seite</a> beitreten."
-
-#: tasks.py:97
+#: tasks.py:93
msgid "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
"a>"
msgstr "Grün: Das Projekt <a href=\"#official-debs\">ist als ein offizielles Debianpaket "
"verfügbar</a>"
-#: tasks.py:98
+#: tasks.py:94
msgid "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
"package</a>"
msgstr "Gelb: Das Projekt <a href=\"#unofficial-debs\">ist als ein inoffizielles Debianpaket "
"verfügbar</a>"
-#: tasks.py:99
+#: tasks.py:95
msgid "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
"package</a>"
msgstr "Rot: Das Projekt <a href=\"#prospective-debs\">ist (noch) nicht als Debianpaket "
"verfügbar</a>"
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr "Offiziell"
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr "Inoffiziell"
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr "Voraussichtlich"
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr "Offizielle Debianpakete"
-#: tasks.py:110
+#: tasks.py:106
msgid "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
msgid "Debian packages not available"
msgstr "Debianpakete nicht verfügbar"
-#: tasks.py:113
+#: tasks.py:109
msgid "Packages"
msgstr "Pakete"
+#: webconf/debian-med.conf:14
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a "
+ "href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr "Hilf uns dabei, Debian für Ärzte und Forscher attraktiv zu machen!\n"
+ "Du kannst dem Projekt auf der <a href=\"http://alioth.debian.org/projects/debian-med\">Alioth Seite</a> beitreten."
+
#: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
msgid "summary"
Modified: cdd/trunk/webtools/po/fr.po
==============================================================================
--- cdd/trunk/webtools/po/fr.po (original)
+++ cdd/trunk/webtools/po/fr.po Mon Jun 23 13:24:29 2008
@@ -10,7 +10,7 @@
msgid ""
msgstr "Project-Id-Version: messages\n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
- "POT-Creation-Date: 2008-06-20 13:55+0200\n"
+ "POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: 2007-10-07 10:38+0900\n"
"Last-Translator: Charles Plessy <charles-debian-nospam at plessy.org>\n"
"Language-Team: français <fr at li.org.example>\n"
@@ -19,49 +19,49 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr ""
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr ""
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr ""
-#: tasks.py:78
+#: tasks.py:76
msgid "Version"
msgstr ""
-#: tasks.py:79
+#: tasks.py:77
#, fuzzy
msgid "Summary"
msgstr "résumé"
-#: tasks.py:80
+#: tasks.py:78
msgid "Last update:"
msgstr ""
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr ""
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr ""
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr ""
-#: tasks.py:84
+#: tasks.py:82
msgid "For a better overview of the project's availability as a Debian package, each head row "
"has a color code according to this scheme:"
msgstr ""
-#: tasks.py:85
+#: tasks.py:83
#, python-format
msgid "If you discover a project which looks like a good candidate for %s\n"
" to you, or if you have prepared an inofficial Debian "
@@ -70,7 +70,7 @@
"s\">%s mailing list</a>"
msgstr ""
-#: tasks.py:89
+#: tasks.py:87
#, python-format
msgid "The list to the right includes various software projects which are of some interest to "
"the %s Project. Currently, only a few of them are available as Debian packages. It is our "
@@ -78,66 +78,64 @@
"Custom Debian Distribution."
msgstr ""
-#: tasks.py:90
+#: tasks.py:88
#, fuzzy
msgid "Tasks page"
msgstr "Localisation"
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr ""
-#: tasks.py:92
-#, python-format
-msgid "Help us to see Debian used by medical practicioners and researchers!\n"
- "Join us on the\n"
- "<a href=\"%s\">Alioth page</a>."
-msgstr ""
-
-#: tasks.py:97
+#: tasks.py:93
msgid "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
"a>"
msgstr ""
-#: tasks.py:98
+#: tasks.py:94
msgid "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
"package</a>"
msgstr ""
-#: tasks.py:99
+#: tasks.py:95
msgid "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
"package</a>"
msgstr ""
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr ""
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr ""
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr ""
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr ""
-#: tasks.py:110
+#: tasks.py:106
msgid "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
msgid "Debian packages not available"
msgstr ""
-#: tasks.py:113
+#: tasks.py:109
#, fuzzy
msgid "Packages"
msgstr "Liens"
+#: webconf/debian-med.conf:14
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a "
+ "href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr ""
+
#: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
msgid "summary"
Modified: cdd/trunk/webtools/po/it.po
==============================================================================
--- cdd/trunk/webtools/po/it.po (original)
+++ cdd/trunk/webtools/po/it.po Mon Jun 23 13:24:29 2008
@@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
- "POT-Creation-Date: 2008-06-20 13:55+0200\n"
+ "POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: 2008-02-17 13:30+0100\n"
"Last-Translator: David Paleino <d.paleino at gmail.com>\n"
"Language-Team: Italian <it at li.org>\n"
@@ -15,52 +15,52 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr ""
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr "Responsabile"
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr ""
-#: tasks.py:78
+#: tasks.py:76
#, fuzzy
msgid "Version"
msgstr "Revisione"
-#: tasks.py:79
+#: tasks.py:77
#, fuzzy
msgid "Summary"
msgstr "riassunto"
-#: tasks.py:80
+#: tasks.py:78
#, fuzzy
msgid "Last update:"
msgstr "Ultimo aggiornamento"
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr ""
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr ""
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr "pacchetto Debian non disponibile"
-#: tasks.py:84
+#: tasks.py:82
msgid "For a better overview of the project's availability as a Debian package, each head row "
"has a color code according to this scheme:"
msgstr "Per una migliore visione d'insieme della disponibilità del progetto come pacchetto "
"Debian, ogni riga ha un colore codificato secondo il seguente schema:"
-#: tasks.py:85
+#: tasks.py:83
#, fuzzy, python-format
msgid "If you discover a project which looks like a good candidate for %s\n"
" to you, or if you have prepared an inofficial Debian "
@@ -71,7 +71,7 @@
"preparato un pacchetto Debian non ufficiale, non esitare a mandare una descrizione di "
"quel progetto alla %smailing list Debian-Med%s"
-#: tasks.py:89
+#: tasks.py:87
#, python-format
msgid "The list to the right includes various software projects which are of some interest to "
"the %s Project. Currently, only a few of them are available as Debian packages. It is our "
@@ -79,70 +79,69 @@
"Custom Debian Distribution."
msgstr ""
-#: tasks.py:90
+#: tasks.py:88
msgid "Tasks page"
msgstr "Tasks della CDD"
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr ""
-#: tasks.py:92
-#, fuzzy, python-format
-msgid "Help us to see Debian used by medical practicioners and researchers!\n"
- "Join us on the\n"
- "<a href=\"%s\">Alioth page</a>."
-msgstr "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %spagina "
- "Alioth%s."
-
-#: tasks.py:97
+#: tasks.py:93
#, fuzzy
msgid "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
"a>"
msgstr "Verde: Il progetto è %sdisponibile come pacchetto Debian ufficiale%s"
-#: tasks.py:98
+#: tasks.py:94
#, fuzzy
msgid "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
"package</a>"
msgstr "Giallo: Il progetto è %sdisponibile come pacchetto Debian non ufficiale%s"
-#: tasks.py:99
+#: tasks.py:95
#, fuzzy
msgid "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
"package</a>"
msgstr "Rosso: Il progetto %snon è (ancora) disponibile come pacchetto Debian%s"
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr ""
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr ""
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr ""
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr ""
-#: tasks.py:110
+#: tasks.py:106
msgid "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
#, fuzzy
msgid "Debian packages not available"
msgstr "pacchetto Debian non disponibile"
-#: tasks.py:113
+#: tasks.py:109
#, fuzzy
msgid "Packages"
msgstr "pagine"
+#: webconf/debian-med.conf:14
+#, fuzzy
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a "
+ "href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %spagina "
+ "Alioth%s."
+
#: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
msgid "summary"
@@ -453,9 +452,8 @@
#, fuzzy
#~ msgid "Help us to see Debian used by medical practicioners and researchers!\n"
-#~ " Join us on the\n"
-#~ " <a href=\"http://alioth.debian.org/projects/debian-med"
-#~ "\">Alioth page</a>."
+#~ "Join us on the\n"
+#~ "<a href=\"%s\">Alioth page</a>."
#~ msgstr "Aiutaci a vedere Debian usata dai medici e dai ricercatori! Unisciti a noi sulla %"
#~ "spagina Alioth%s."
Modified: cdd/trunk/webtools/po/pt.po
==============================================================================
--- cdd/trunk/webtools/po/pt.po (original)
+++ cdd/trunk/webtools/po/pt.po Mon Jun 23 13:24:29 2008
@@ -7,7 +7,7 @@
msgid ""
msgstr "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: debian-custom at lists.debian.org\n"
- "POT-Creation-Date: 2008-06-20 13:55+0200\n"
+ "POT-Creation-Date: 2008-06-23 15:13+0200\n"
"PO-Revision-Date: 2008-02-10 21:36-0300\n"
"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
"Language-Team: Debian i10n Português <debian-l10n-portuguese at lists.debian.org>\n"
@@ -15,51 +15,51 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: tasks.py:75
+#: tasks.py:73
msgid "Maintainer"
msgstr ""
-#: tasks.py:76
+#: tasks.py:74
msgid "Responsible"
msgstr ""
-#: tasks.py:77
+#: tasks.py:75
msgid "License"
msgstr ""
-#: tasks.py:78
+#: tasks.py:76
#, fuzzy
msgid "Version"
msgstr "Revisão"
-#: tasks.py:79
+#: tasks.py:77
#, fuzzy
msgid "Summary"
msgstr "sumário"
-#: tasks.py:80
+#: tasks.py:78
#, fuzzy
msgid "Last update:"
msgstr "Última atualização"
-#: tasks.py:81
+#: tasks.py:79
msgid "Official Debian package"
msgstr ""
-#: tasks.py:82
+#: tasks.py:80
msgid "Unofficial Debian package"
msgstr ""
-#: tasks.py:83
+#: tasks.py:81
msgid "Debian package not available"
msgstr ""
-#: tasks.py:84
+#: tasks.py:82
msgid "For a better overview of the project's availability as a Debian package, each head row "
"has a color code according to this scheme:"
msgstr ""
-#: tasks.py:85
+#: tasks.py:83
#, python-format
msgid "If you discover a project which looks like a good candidate for %s\n"
" to you, or if you have prepared an inofficial Debian "
@@ -68,7 +68,7 @@
"s\">%s mailing list</a>"
msgstr ""
-#: tasks.py:89
+#: tasks.py:87
#, python-format
msgid "The list to the right includes various software projects which are of some interest to "
"the %s Project. Currently, only a few of them are available as Debian packages. It is our "
@@ -76,67 +76,65 @@
"Custom Debian Distribution."
msgstr ""
-#: tasks.py:90
+#: tasks.py:88
#, fuzzy
msgid "Tasks page"
msgstr "Página de traduções"
-#: tasks.py:91
+#: tasks.py:89
msgid "Project"
msgstr ""
-#: tasks.py:92
-#, python-format
-msgid "Help us to see Debian used by medical practicioners and researchers!\n"
- "Join us on the\n"
- "<a href=\"%s\">Alioth page</a>."
-msgstr ""
-
-#: tasks.py:97
+#: tasks.py:93
msgid "Green: The project is <a href=\"#official-debs\">available as an official Debian package</"
"a>"
msgstr ""
-#: tasks.py:98
+#: tasks.py:94
msgid "Yellow: The project is <a href=\"#unofficial-debs\">available as an unofficial Debian "
"package</a>"
msgstr ""
-#: tasks.py:99
+#: tasks.py:95
msgid "Red: The project is <a href=\"#prospective-debs\">not (yet) available as a Debian "
"package</a>"
msgstr ""
-#: tasks.py:104
+#: tasks.py:100
msgid "Official"
msgstr ""
-#: tasks.py:105
+#: tasks.py:101
msgid "Unofficial"
msgstr ""
-#: tasks.py:106
+#: tasks.py:102
msgid "Prospective"
msgstr ""
-#: tasks.py:109
+#: tasks.py:105
msgid "Official Debian packages"
msgstr ""
-#: tasks.py:110
+#: tasks.py:106
msgid "Experimental or unofficial Debian packages, projects with packaging stuff in SVN"
msgstr ""
-#: tasks.py:111
+#: tasks.py:107
#, fuzzy
msgid "Debian packages not available"
msgstr "status das traduções"
-#: tasks.py:113
+#: tasks.py:109
#, fuzzy
msgid "Packages"
msgstr "links"
+#: webconf/debian-med.conf:14
+msgid "Help us to see Debian used by medical practicioners and researchers! Join us on the <a "
+ "href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>."
+msgstr ""
+
#: ../bug_details.tmpl:8 ../bugs.tmpl:7 ../ddtp.tmpl:7 ../ddtp_details.tmpl:8 ../locales.php:7
#: ../tasks.tmpl:8 ../tasks_idx.tmpl:8
msgid "summary"
Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py (original)
+++ cdd/trunk/webtools/tasks.py Mon Jun 23 13:24:29 2008
@@ -4,7 +4,7 @@
import apt_pkg
import apt_inst
-from sys import stderr, exit
+from sys import argv, exit, stderr
import os
import gettext
@@ -15,18 +15,25 @@
from genshi.template import TemplateLoader
from genshi import Markup
-from cddtasktools import CddDependencies, HTMLBASE, REPOS
-
-CDD='debian-med'
+from cddtasktools import CddDependencies, ReadConfig
languages = ('en', 'da', 'de', 'es', 'fr', 'it', 'jp', 'pt')
-cdeps=CddDependencies(CDD)
+if len(argv) <= 1:
+ print >>stderr, "Usage: %s <CDD name>\n The <CDD name> needs a matching config file webconf/<CDD name>.conf"\
+ % argv[0]
+ exit(-1)
+
+cdeps=CddDependencies(argv[1])
cdeps.GetAllDependencies()
packages = cdeps.GetNamesOnlyDict()
cdeps.GetTranslations(languages)
cdeps.MarkupPreformatedStringsCDD()
+data = cdeps.data
+data['tasks'] = cdeps.GetTaskDescDict()
+data['taskskeys'] = cdeps.metapackagekeys
+
# Define directories used
current_dir = os.path.dirname(__file__)
locale_dir = os.path.join(current_dir, 'locale')
@@ -42,33 +49,15 @@
# initialize gensi
loader = TemplateLoader(template_dir)
-data = {
- 'aliothurl' : 'http://alioth.debian.org/projects/debian-med',
- 'css' : 'inc/style.css',
- 'projectname' : 'Debian Med',
- 'projecturl' : 'http://debian-med.alioth.debian.org/',
- 'projectlist' : 'debian-med at lists.debian.org',
- 'logourl' : 'http://people.debian.org/~tille/debian-med/logos/med-06.jpg',
- 'tasks' : cdeps.GetTaskDescDict(),
- 'taskskeys' : cdeps.metapackagekeys
- }
-
-CDD='debian-med'
-OUTPUTDIR = { 'debian-med' : './output', # HTMLBASE+"/debian-med/static/tasks/",
- 'debian-edu' : HTMLBASE+"/cdd/htdocs/edu/tasks/",
- 'debian-gis' : HTMLBASE+"/cdd/htdocs/gis/tasks/",
- 'debian-science' : HTMLBASE+"/cdd/htdocs/science/tasks/",
- }
-
-if not os.access(OUTPUTDIR[CDD], os.W_OK):
+if not os.access(data['outputdir'], os.W_OK):
try:
- os.mkdir(OUTPUTDIR[CDD])
+ os.mkdir(data['outputdir'])
except:
- print >>stderr, "Unable to create output dir " + OUTPUTDIR[CDD]
+ print >>stderr, "Unable to create output dir " + data['outputdir']
exit(-1)
t = datetime.now()
-htaccess = OUTPUTDIR[CDD] + '/.htaccess'
+htaccess = data['outputdir'] + '/.htaccess'
try:
os.unlink(htaccess)
except: # simply continue if file does not exist
@@ -98,10 +87,8 @@
data['description'] = _("The list to the right includes various software projects which are of some interest to the %s Project. Currently, only a few of them are available as Debian packages. It is our goal, however, to include all software in %s which can sensibly add to a high quality Custom Debian Distribution.") % (data['projectname'], data['projectname'])
data['gtstrTasksPage'] = _('Tasks page')
data['gtstrProject'] = _('Project')
- data['projectadvertising'] = _("""Help us to see Debian used by medical practicioners and researchers!
-Join us on the
-<a href="%s">Alioth page</a>.""") % (data['aliothurl'])
-
+ data['projectadvertising'] = data['advertising'] # Hopefully translation will work this way ...
+ print "DEBUG", data['projectadvertising'], data['advertising']
COLORCODES = { 'official' : _('Green: The project is <a href="#official-debs">available as an official Debian package</a>'),
'unofficial' : _('Yellow: The project is <a href="#unofficial-debs">available as an unofficial Debian package</a>'),
@@ -130,7 +117,7 @@
template = loader.load('tasks_idx.xhtml')
- outputfile = OUTPUTDIR[CDD] + '/index.html'
+ outputfile = data['outputdir'] + '/index.html'
if lang != 'en':
outputfile += '.' + lang
try:
@@ -159,7 +146,7 @@
data['colorcodes'].append(Markup(COLORCODES[type]))
data['projects'] = cdeps.tasks[task].dependencies
- outputfile = OUTPUTDIR[CDD] + '/' + task + '.html'
+ outputfile = data['outputdir'] + '/' + task + '.html'
if lang != 'en':
outputfile += '.' + lang
try:
Modified: cdd/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks.xhtml (original)
+++ cdd/trunk/webtools/templates/tasks.xhtml Mon Jun 23 13:24:29 2008
@@ -10,8 +10,10 @@
</head>
<body>
<div style="text-align: center;">
-<a href="$projecturl">
- <img src="$logourl" alt="$projectname Project"/>
+<a href="$projecturl"><span py:choose="logourl">
+ <span py:when="None">${projectname} Project</span>
+ <span py:otherwise=""><img src="$logourl" alt="$projectname Project"/></span>
+ </span>
</a>
</div>
<div class="heading" py:if="projectadvertising">
@@ -73,7 +75,7 @@
<em>${license}: ${project.license}</em><br/>
<span py:choose="type">
<span py:when="'official'">
- <a href="${project.pkgURL}">${officialpkg}</a> - <a href="${project.pkgURL}/${project.filename}"><img src="deb-icon.png"/></a>
+ <a href="${project.pkgURL}">${officialpkg}</a> - <a href="${project.pkgURL}/${project.filename}"><img src="../inc/deb-icon.png"/></a>
</span>
<span py:when="'unofficial'"><a href="${project.pkgURL}">${unofficialpkg}</a></span>
<span py:otherwise="">${nopkgavail}</span>
Modified: cdd/trunk/webtools/templates/tasks_idx.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks_idx.xhtml (original)
+++ cdd/trunk/webtools/templates/tasks_idx.xhtml Mon Jun 23 13:24:29 2008
@@ -10,8 +10,10 @@
</head>
<body>
<div style="text-align: center;">
-<a href="$projecturl">
- <img src="$logourl" alt="$projectname $gtstrProject"/>
+<a href="$projecturl"><span py:choose="logourl">
+ <span py:when="None">${projectname} Project</span>
+ <span py:otherwise=""><img src="$logourl" alt="$projectname Project"/></span>
+ </span>
</a>
</div>
<div class="heading" py:if="projectadvertising">
Modified: cdd/trunk/webtools/webconf/debian-edu.conf
==============================================================================
--- cdd/trunk/webtools/webconf/debian-edu.conf (original)
+++ cdd/trunk/webtools/webconf/debian-edu.conf Mon Jun 23 13:24:29 2008
@@ -9,4 +9,4 @@
DataDir: /var/lib/gforge/chroot/home/groups/cdd/data/edu
CacheDir: /var/lib/gforge/chroot/home/groups/cdd/cache
VcsDir: /svn/debian-edu/trunk/src/debian-edu
-CSS: inc/style.css
+CSS: ../inc/style.css
Modified: cdd/trunk/webtools/webconf/debian-gis.conf
==============================================================================
--- cdd/trunk/webtools/webconf/debian-gis.conf (original)
+++ cdd/trunk/webtools/webconf/debian-gis.conf Mon Jun 23 13:24:29 2008
@@ -9,4 +9,4 @@
DataDir: /var/lib/gforge/chroot/home/groups/cdd/data/gis
CacheDir: /var/lib/gforge/chroot/home/groups/cdd/cache
VcsDir: /svn/pkg-grass/packages/debian-gis
-CSS: inc/style.css
+CSS: ../inc/style.css
Modified: cdd/trunk/webtools/webconf/debian-junior.conf
==============================================================================
--- cdd/trunk/webtools/webconf/debian-junior.conf (original)
+++ cdd/trunk/webtools/webconf/debian-junior.conf Mon Jun 23 13:24:29 2008
@@ -8,4 +8,4 @@
DataDir: /var/lib/gforge/chroot/home/groups/cdd/data/junior
CacheDir: /var/lib/gforge/chroot/home/groups/cdd/cache
VcsDir: /svn/cdd/projects/junior/trunk/debian-junior
-CSS: inc/style.css
+CSS: ../inc/style.css
Modified: cdd/trunk/webtools/webconf/debian-med.conf
==============================================================================
--- cdd/trunk/webtools/webconf/debian-med.conf (original)
+++ cdd/trunk/webtools/webconf/debian-med.conf Mon Jun 23 13:24:29 2008
@@ -4,9 +4,11 @@
Homepage: http://www.debian.org/devel/debian-med
AliothUrl: http://alioth.debian.org/projects/debian-med
ProjectList: debian-med at lists.debian.org
-LogoUrl: http://people.debian.org/~tille/debian-med/logos/med-06.jpg
+LogoUrl: http://debian-med.alioth.debian.org/img/logo.png
+Ignore: alternative Logo: http://people.debian.org/~tille/debian-med/logos/med-06.jpg
OutputDir: /var/lib/gforge/chroot/home/groups/debian-med/static/tasks_new
DataDir: /var/lib/gforge/chroot/home/groups/debian-med/data
CacheDir: /var/lib/gforge/chroot/home/groups/cdd/cache
VcsDir: /svn/cdd/projects/med/trunk/debian-med
-CSS: inc/style.css
+CSS: ../inc/style.css
+Advertising: _('Help us to see Debian used by medical practicioners and researchers! Join us on the <a href=\"http://alioth.debian.org/projects/debian-med\">Alioth page</a>.')
Modified: cdd/trunk/webtools/webconf/debian-science.conf
==============================================================================
--- cdd/trunk/webtools/webconf/debian-science.conf (original)
+++ cdd/trunk/webtools/webconf/debian-science.conf Mon Jun 23 13:24:29 2008
@@ -8,4 +8,4 @@
DataDir: /var/lib/gforge/chroot/home/groups/cdd/data/science
CacheDir: /var/lib/gforge/chroot/home/groups/cdd/cache
VcsDir: /svn/cdd/projects/science/trunk/debian-science
-CSS: inc/style.css
+CSS: ../inc/style.css
More information about the Cdd-commits
mailing list