GNOME.org
 

damned-lies r978 - in trunk: . templates

Author: claudep
Date: Sat Aug 30 09:35:35 2008
New Revision: 978
URL: http://svn.gnome.org/viewvc/damned-lies?rev=978&view=rev

Log:
2008-08-30  Claude Paroz  <claude 2xlibre net>

	* gnome-modules.xml.in:
	* releases.xml.in: gok branched for 2.22, added avahi module in
	freedesktop.
	* people.xml.in: Added Lennart.
	* modules.py: Defines "Enter bug" and "i18n bugs" URLs depending on bug
	tracking type.
	* templates/module.tmpl: Use the URLs defined in modules.py.

Modified:
   trunk/ChangeLog
   trunk/gnome-modules.xml.in
   trunk/modules.py
   trunk/people.xml.in
   trunk/releases.xml.in
   trunk/templates/module.tmpl

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Sat Aug 30 09:35:35 2008
@@ -1367,9 +1367,10 @@
   <module id="gok">
     <maintainer id="dtb"/>
     <webpage>http://www.gok.ca/</webpage>
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gnome-2-14" stringfrozen="true"/>
     <branch id="gnome-2-18" stringfrozen="true"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
 
   <module id="goobox">
@@ -2044,6 +2045,18 @@
 
   <!-- Non-GNOME modules -->
 
+  <module id="avahi">
+    <webpage>http://avahi.org/</webpage>
+    <maintainer id="mezcalero"/>
+    <bugs-baseurl>http://avahi.org/report</bugs-baseurl>
+    <scmroot type="git">
+      <path>git://git.0pointer.de/avahi.git</path>
+    </scmroot>
+    <scmmodule></scmmodule>
+    <scmweb>http://git.0pointer.de/?p=avahi.git;a=tree</scmweb>
+    <branch id="master"/>
+  </module>
+
   <module id="gnucash">
     <description>GNUCash</description>
     <_comment>GNUCash is not part of the GNOME SVN repository. Please check <a href="http://wiki.gnucash.org/wiki/Translation#Submitting";>the GNUCash Wiki</a> to see where to send translations.</_comment>

Modified: trunk/modules.py
==============================================================================
--- trunk/modules.py	(original)
+++ trunk/modules.py	Sat Aug 30 09:35:35 2008
@@ -10,36 +10,43 @@
         only_module = module
 
         people = data.getPeople()
-
-        for module in self.modules:
-            modid = module
+        
+        for modid, module in self.modules.items():
 
             if only_module and modid != only_module:
                 continue
             #
             # maintainers = self.getMaintainers(module, default = defaults.maintainers)
-            if self.modules[module].has_key('maintainer'):
-                for maint in self.modules[module]['maintainer']:
+            if module.has_key('maintainer'):
+                for maint in module['maintainer']:
                     if people.has_key(maint):
-                        self.modules[module]['maintainer'][maint] = people[maint]
+                        module['maintainer'][maint] = people[maint]
+
+            if module.has_key('bugs-baseurl'):
+                if module['bugs-baseurl'].find("bugzilla") != -1 or \
+                   module['bugs-baseurl'].find("freedesktop") != -1:
+                    module['bugs-enterurl'] = "%senter_bug.cgi?product=%s&amp;component=%s" % (module['bugs-baseurl'], module['bugs-product'], module['bugs-component'])
+                    module['bugs-i18nurl'] = "%sbuglist.cgi?product=%s&amp;component=%s&amp;keywords_type=anywords&amp;keywords=I18N+L10N&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=NEEDINFO" % (module['bugs-baseurl'], module['bugs-product'], module['bugs-component'])
+                else:
+                    module['bugs-enterurl'] = module['bugs-baseurl']
 
-            if self.modules[module].has_key('branch'):
-                for branch in self.modules[module]['branch']:
-                    if not self.modules[module]["branch"][branch].has_key('domain'):
-                        self.modules[module]["branch"][branch]['domain'] = {}
-                    trdomains = self.modules[module]["branch"][branch]['domain'].keys()
-                    if not self.modules[module]["branch"][branch].has_key('document'):
-                        self.modules[module]["branch"][branch]['document'] = {}
-                    documents = self.modules[module]["branch"][branch]['document'].keys()
+            if module.has_key('branch'):
+                for branch in module['branch']:
+                    if not module["branch"][branch].has_key('domain'):
+                        module["branch"][branch]['domain'] = {}
+                    trdomains = module["branch"][branch]['domain'].keys()
+                    if not module["branch"][branch].has_key('document'):
+                        module["branch"][branch]['document'] = {}
+                    documents = module["branch"][branch]['document'].keys()
                     for trdomain in trdomains:
-                        here = self.modules[module]["branch"][branch]['domain'][trdomain]
+                        here = module["branch"][branch]['domain'][trdomain]
                         if not here.has_key('potbase'):
-                            here['potbase'] = self.modules[module]['id']
+                            here['potbase'] = module['id']
                         if not here.has_key('description'):
                             here['description'] = here['potbase']
 
                     for document in documents:
-                        here = self.modules[module]["branch"][branch]['document'][document]
+                        here = module["branch"][branch]['document'][document]
                         here['potbase'] = document
                         if not here.has_key('directory'):
                             here['directory'] = here['id']

Modified: trunk/people.xml.in
==============================================================================
--- trunk/people.xml.in	(original)
+++ trunk/people.xml.in	Sat Aug 30 09:35:35 2008
@@ -107,8 +107,15 @@
     <email>mclasen redhat com</email>
     <nick>mclasen</nick>
   </person>
+  <person id="mezcalero">
+    <name>Lennart Poettering</name>
+    <email>mzjro 0pointer de</email>
+    <nick>mezcalero</nick>
+    <webpage>http://0pointer.de/lennart/</webpage>
+    <icon>http://planet.gnome.org/heads/mezcalero.png</icon>
+  </person>
   <person id="ogmaciel">
-    <name>OgMaciel</name>
+    <name>Og Maciel</name>
     <email>ogmaciel gnome org</email>
     <nick>OgMaciel</nick>
     <webpage>http://www.ogmaciel.com/</webpage>

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Sat Aug 30 09:35:35 2008
@@ -529,7 +529,7 @@
       <module id="gnome-user-docs" branch="gnome-2-22"/>
       <module id="gnome-utils" branch="gnome-2-20"/>
       <module id="gnome-volume-manager" branch="gnome-2-20"/>
-      <module id="gok"/>
+      <module id="gok" branch="gnome-2-22"/>
       <module id="gtk-engines" branch="gtk-engines-2-12"/>
       <module id="gtkhtml" branch="gnome-2-20"/>
       <module id="gtksourceview" branch="gnome-2-20"/>
@@ -634,7 +634,7 @@
       <module id="gnome-user-docs" branch="gnome-2-22"/>
       <module id="gnome-utils" branch="gnome-2-20"/>
       <module id="gnome-volume-manager"/>
-      <module id="gok"/>
+      <module id="gok" branch="gnome-2-22"/>
       <module id="gtk-engines" branch="gtk-engines-2-14"/>
       <module id="gtkhtml" branch="gnome-2-22"/>
       <module id="gtksourceview" branch="gnome-2-22"/>
@@ -824,6 +824,7 @@
   <release id="freedesktop.org" status="external">
     <_description>freedesktop.org (non-GNOME)</_description>
 
+    <module id="avahi"/>
     <module id="gstreamer"/>
     <module id="gst-plugins-base"/>
     <module id="gst-plugins-good"/>

Modified: trunk/templates/module.tmpl
==============================================================================
--- trunk/templates/module.tmpl	(original)
+++ trunk/templates/module.tmpl	Sat Aug 30 09:35:35 2008
@@ -35,8 +35,10 @@
 #if $module.has_key('bugs-baseurl')
 <h2>$_("Bug reporting")</h2>
 <ul>
-    <li><a href="$(module['bugs-baseurl'])buglist.cgi?product=$module['bugs-product']&amp;component=$module['bugs-component']&amp;keywords_type=anywords&keywords=I18N+L10N&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=NEEDINFO">$_("Show existing i18n and l10n bugs")</li>
-   <li><a href="$(module['bugs-baseurl'])enter_bug.cgi?product=$module['bugs-product']&amp;component=$module['bugs-component']">$_("Report bugs to Bugzilla")</a></li>
+#if $module.has_key('bugs-i18nurl')
+    <li><a href="$(module['bugs-i18nurl'])">$_("Show existing i18n and l10n bugs")</li>
+#end if
+   <li><a href="$(module['bugs-enterurl'])">$_("Report bugs to Bugzilla")</a></li>
 </ul>
 #end if
 </td></tr></table>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]