[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 289aa8e4ec467ddc107ad550291ca00df17b9c63

Michal Čihař nijel at users.sourceforge.net
Thu Mar 11 15:26:49 CET 2010


The branch, master has been updated
       via  289aa8e4ec467ddc107ad550291ca00df17b9c63 (commit)
       via  63e91924957afa9d7116c5ac1a5acdcce9e65dca (commit)
       via  3495263591f529ad5455d3bc1b09fe3073129296 (commit)
       via  0c9a156ed2a5edcea007788d661509a26b8bb39f (commit)
      from  79502ca3ff88d0103624bf2e358899f72fdb6574 (commit)


- Log -----------------------------------------------------------------
commit 289aa8e4ec467ddc107ad550291ca00df17b9c63
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 15:26:23 2010 +0100

    Update vcs-* links.

commit 63e91924957afa9d7116c5ac1a5acdcce9e65dca
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 15:24:35 2010 +0100

    Update notifications mailing list.

commit 3495263591f529ad5455d3bc1b09fe3073129296
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 15:24:10 2010 +0100

    Adjust DOAP.

commit 0c9a156ed2a5edcea007788d661509a26b8bb39f
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Mar 11 15:22:47 2010 +0100

    Another place where it's better to use generic vcs.

-----------------------------------------------------------------------

Summary of changes:
 render.py                         |    8 ++++----
 templates/_page.tpl               |    4 ++--
 templates/downloads.tpl           |    2 +-
 templates/phpmyadmin-doap.xml.tpl |    8 ++++----
 templates/support.tpl             |    2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/render.py b/render.py
index cf1fad1..de7fb1f 100755
--- a/render.py
+++ b/render.py
@@ -468,7 +468,7 @@ class SFGenerator:
 
     def get_snapshots_info(self):
         '''
-        Retrieves SVN snapshots info and fills it in data['releases_svn'].
+        Retrieves vcs snapshots info and fills it in data['release_vcs'].
         '''
         md5_strings = self.urls.load(SNAPSHOT_MD5).split('\n')
         size_strings = self.urls.load(SNAPSHOT_SIZES).split('\n')
@@ -478,12 +478,12 @@ class SFGenerator:
                 continue
             md5, name = line.split('  ')
             md5s[name] = md5
-        svn = []
+        vcs = []
         for line in size_strings:
             if line.strip() == '':
                 continue
             name, size = line.split(' ')
-            svn.append({
+            vcs.append({
                 'name' : name,
                 'size' : int(size),
                 'size_k' : int(size) / 1024,
@@ -492,7 +492,7 @@ class SFGenerator:
                 'url' : 'http://dl.cihar.com.nyud.net/phpMyAdmin/master/%s' % name,
                 'md5' : md5s[name],
             })
-        self.data['release_svn'] = svn
+        self.data['release_vcs'] = vcs
 
     def process_themes(self, xml_files):
         '''
diff --git a/templates/_page.tpl b/templates/_page.tpl
index 0257062..21ce4ec 100644
--- a/templates/_page.tpl
+++ b/templates/_page.tpl
@@ -14,8 +14,8 @@
   <link rel="stylesheet" type="text/css" href="${base_url}css/slimbox.css" media="screen" />
   <link rel="shortcut icon" href="${base_url}favicon.ico" type="image/x-icon" />
   <link rel="icon" href="${base_url}favicon.ico" type="image/x-icon" />
-  <link rel="vcs-svn" href="https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin" title="phpMyAdmin svn repository" />
-  <link rel="vcs-browse" href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" title="phpMyAdmin svn repository browser" />
+  <link rel="vcs-git" href="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" title="phpMyAdmin Git repository" />
+  <link rel="vcs-browse" href="http://phpmyadmin.git.sourceforge.net/" title="phpMyAdmin Git repository browser" />
   <script src="${base_url}js/mootools.js" type="text/javascript"></script>
   <script src="${base_url}js/mootools-more.js" type="text/javascript"></script>
   <script src="${base_url}js/slimbox.js" type="text/javascript"></script>
diff --git a/templates/downloads.tpl b/templates/downloads.tpl
index b9f9ef8..9caf150 100644
--- a/templates/downloads.tpl
+++ b/templates/downloads.tpl
@@ -55,7 +55,7 @@
         </tr>
     </thead>
     <tbody>
-        <tr py:for="file in release_svn">
+        <tr py:for="file in release_vcs">
             <td><a href="${file.url}#!md5!${file.md5}">${file.name}</a></td>
             <td class="size">${file.humansize}</td>
             <td>${file.md5}</td>
diff --git a/templates/phpmyadmin-doap.xml.tpl b/templates/phpmyadmin-doap.xml.tpl
index a3e5ae6..0999f8c 100644
--- a/templates/phpmyadmin-doap.xml.tpl
+++ b/templates/phpmyadmin-doap.xml.tpl
@@ -35,10 +35,10 @@
     </foaf:Person>
   </developer>
 <repository>
-    <SVNRepository>
-      <location rdf:resource="https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin" />
-      <browse rdf:resource="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" />
-    </SVNRepository>
+    <GitRepository>
+      <location rdf:resource="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" />
+      <browse rdf:resource="http://phpmyadmin.git.sourceforge.net/" />
+    </GitRepository>
   </repository>
 <py:for each="release in releases_featured">
 <release py:for="file in release.files">
diff --git a/templates/support.tpl b/templates/support.tpl
index 081308d..56b894b 100644
--- a/templates/support.tpl
+++ b/templates/support.tpl
@@ -27,7 +27,7 @@
     <li>For news/announcements: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-news">phpmyadmin-news at lists.sourceforge.net</a></li>
     <li>For user questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-users">phpmyadmin-users at lists.sourceforge.net</a></li>
     <li>For developer questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-devel">phpmyadmin-devel at lists.sourceforge.net</a></li>
-    <li>SVN commit notifications: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-svn">phpmyadmin-svn at lists.sourceforge.net</a></li>
+    <li>Git commit notifications: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-git">phpmyadmin-git at lists.sourceforge.net</a></li>
     <li><a href="http://sourceforge.net/mail/?group_id=23067">Mailing lists overview</a></li>
 </ul>
 </div>


hooks/post-receive
-- 
phpMyAdmin website




More information about the Git mailing list