--- trunk/pts/www/xsl/pts.xsl	2005/06/08 01:37:45	1024
+++ trunk/pts/www/xsl/pts.xsl	2005/09/10 17:50:51	1090
@@ -24,6 +24,8 @@
 <xsl:param name="hasoldstable-security" select="''"/>
 <xsl:param name="hasstable-security" select="''"/>
 <xsl:param name="hastesting-security" select="''"/>
+<xsl:param name="hassecure-testing" select="''"/>
+<xsl:param name="hasvolatile" select="''"/>
 <xsl:param name="hasnews" select="''"/>
 <xsl:param name="hasexcuse" select="''"/>
 
@@ -31,7 +33,7 @@
 
 <!-- Those variables controls the todo and problem item concerning
      standards-version not being up to date -->
-<xsl:variable name="lastsv" select="'3.6.1'"/>
+<xsl:variable name="lastsv" select="'3.6.2'"/>
 <xsl:variable name="lastmajorsv" select="'3.'"/>
 
 <!-- Named templates aka functions -->
@@ -77,11 +79,25 @@
   </xsl:if>
 </xsl:template>
 
+<!-- Strip epoch -->
+<xsl:template name="strip-epoch">
+  <xsl:param name="version"/>
+  <xsl:if test="contains($version,':')">
+    <xsl:value-of select="substring-after($version,':')"/>
+  </xsl:if>
+  <xsl:if test="not(contains($version,':'))">
+    <xsl:value-of select="$version"/>
+  </xsl:if>
+</xsl:template>
+
 
 <!-- All the work is done in a single template -->
 <xsl:template match="source">
 
   <!-- Start of html -->
+  <xsl:text disable-output-escaping="yes">
+  &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"&gt;
+  </xsl:text>
   <html>
   <head>
   <meta name="ROBOTS" content="NOFOLLOW"/>
@@ -93,10 +109,18 @@
   
   <form method="get" action="/common/index.html" style="float: right;">
   <!-- this link should make lynx/links happy [FG] -->
-  Jump to package (<a href="/">home page</a>): <br/>
-  <input type="text" name="src" value=""/>
+  <p>Jump to package (<a href="/">home page</a>): <br/>
+  <input type="text" name="src" value=""/></p>
   </form>
-  <h1>Overview of <xsl:value-of select="$package"/> source package</h1>
+  <h1>Overview of
+  <xsl:element name="a">
+    <xsl:attribute name="href">
+      <xsl:text>http://packages.debian.org/src:</xsl:text>
+       <xsl:value-of select="$package"/>
+    </xsl:attribute>
+   <xsl:value-of select="$package"/>
+  </xsl:element>
+  source package</h1>
 
   <table class="containertable">
   <tr class="containerrow" valign="top">
@@ -279,6 +303,7 @@
   </td></tr>
   <tr class="normalrow">
   <td class="normalcell" colspan="2" style="text-align: left">
+  <ul>
   <xsl:for-each select="binary/item">
     <xsl:sort select="text()"/>
     <xsl:variable name="pkg" select="text()"/>
@@ -337,44 +362,58 @@
     </span>
     </li>
   </xsl:for-each>
-  </td></tr>
+  </ul></td></tr>
 
   <tr class="titlerow">
   <td class="titlecell" colspan="2">
-  Other available versions
+  Available versions
   </td></tr>
-  <xsl:if test="$hasexperimental">
+
+  <!-- oldstable -->
+  <xsl:if test="$hasoldstable">  
   <tr class="normalrow">
-  <td class="labelcell">Experimental</td>
+  <td class="labelcell"><a href="http://www.debian.org/releases/woody/">Oldstable</a></td>
   <td class="contentcell">
-  <xsl:value-of select="document(concat('../base/', $dir, '/experimental.xml'))/source/version"/>
+  <xsl:value-of select="document(concat('../base/', $dir, '/oldstable.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
   <xsl:if test="$hasoldstable-security">
   <tr class="normalrow">
-  <td class="labelcell">Security Updates (oldstable)</td>
+  <td class="labelcell"><small>Oldstable Security Updates</small></td>
   <td class="contentcell">
   <xsl:value-of select="document(concat('../base/', $dir, '/oldstable-security.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
+
+  <!-- stable -->
+  <xsl:if test="$hasstable">  
+  <tr class="normalrow">
+  <td class="labelcell"><a href="http://www.debian.org/releases/stable/">Stable</a></td>
+  <td class="contentcell">
+  <xsl:value-of select="document(concat('../base/', $dir, '/stable.xml'))/source/version"/>
+  </td>
+  </tr>
+  </xsl:if>
   <xsl:if test="$hasstable-security">
   <tr class="normalrow">
-  <td class="labelcell">Security Updates (stable)</td>
+  <td class="labelcell"><small>Stable Security Updates</small></td>
   <td class="contentcell">
   <xsl:value-of select="document(concat('../base/', $dir, '/stable-security.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
-  <xsl:if test="$hastesting-security">
+  <xsl:if test="$hass-p-u">  
   <tr class="normalrow">
-  <td class="labelcell">Security Updates (testing)</td>
+  <td class="labelcell"><small>Stable Proposed Updates</small></td>
   <td class="contentcell">
-  <xsl:value-of select="document(concat('../base/', $dir, '/testing-security.xml'))/source/version"/>
+  <xsl:value-of select="document(concat('../base/', $dir, '/s-p-u.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
+
+  <!-- testing -->
   <xsl:if test="$hastesting">
   <tr class="normalrow">
   <td class="labelcell"><a href="http://www.debian.org/releases/testing/">Testing</a></td>
@@ -383,45 +422,146 @@
   </td>
   </tr>
   </xsl:if>
+  <xsl:if test="$hastesting-security">
+  <tr class="normalrow">
+  <td class="labelcell"><small>Testing Security Updates</small></td>
+  <td class="contentcell">
+  <xsl:value-of select="document(concat('../base/', $dir, '/testing-security.xml'))/source/version"/>
+  </td>
+  </tr>
+  </xsl:if>
   <xsl:if test="$hast-p-u">
   <tr class="normalrow">
-  <td class="labelcell">Testing Proposed Updates</td>
+  <td class="labelcell"><small>Testing Proposed Updates</small></td>
   <td class="contentcell">
   <xsl:value-of select="document(concat('../base/', $dir, '/t-p-u.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
-  <xsl:if test="$hasoldstable">  
+ 
+  <!-- unstable -->
+  <xsl:if test="$hasunstable">
   <tr class="normalrow">
-  <td class="labelcell"><a href="http://www.debian.org/releases/stable/">Stable</a></td>
+  <td class="labelcell">Unstable</td>
   <td class="contentcell">
-  <xsl:value-of select="document(concat('../base/', $dir, '/stable.xml'))/source/version"/>
+  <xsl:value-of select="document(concat('../base/', $dir, '/unstable.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
-  <xsl:if test="$hasstable">  
+ 
+  <!-- experimental -->
+  <xsl:if test="$hasexperimental">
   <tr class="normalrow">
-  <td class="labelcell"><a href="http://www.debian.org/releases/stable/">Stable</a></td>
+  <td class="labelcell">Experimental</td>
   <td class="contentcell">
-  <xsl:value-of select="document(concat('../base/', $dir, '/stable.xml'))/source/version"/>
+  <xsl:value-of select="document(concat('../base/', $dir, '/experimental.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
-  <xsl:if test="$hass-p-u">  
+
+  <!-- secure-testing -->
+  <xsl:if test="$hassecure-testing">
   <tr class="normalrow">
-  <td class="labelcell">Stable Proposed Updates</td>
+  <td class="labelcell">Secure testing</td>
   <td class="contentcell">
-  <xsl:value-of select="document(concat('../base/', $dir, '/s-p-u.xml'))/source/version"/>
+  <xsl:value-of select="document(concat('../base/', $dir, '/secure-testing.xml'))/source/version"/>
   </td>
   </tr>
   </xsl:if>
- 
+
+  <!-- volatile -->
+  <xsl:if test="$hasvolatile">
+  <tr class="normalrow">
+  <td class="labelcell">Volatile</td>
+  <td class="contentcell">
+  <xsl:value-of select="document(concat('../base/', $dir, '/volatile.xml'))/source/version"/>
+  </td>
+  </tr>
+  </xsl:if>
+
+  <!-- Patches list [FG] -->
+  <xsl:if test="$other/@patches='yes'">
+    <tr class="titlerow">
+    <td class="titlecell" colspan="2">
+    Patches
+    </td></tr>
+    <tr>
+    <td class="contentcell" colspan="2" style="text-align: left">
+    <ul>
+    <xsl:for-each select="$other/patches/item">
+      <li>
+        <a href="{$other/patches/item/@url}">Patch from <xsl:value-of select="$other/patches/item/@distro"/> for version <xsl:value-of select="$other/patches/item/@version"/></a>
+      </li>
+    </xsl:for-each>
+    <xsl:if test="$other/bugs/@patch!='0'">
+      <li>
+        <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&amp;data={$package}&amp;include=patch&amp;exclude=pending">Patches from BTS (<xsl:value-of select="$other/bugs/@patch"/>)</a>
+      </li>
+    </xsl:if>
+    </ul>
+    </td>
+    </tr>
+  </xsl:if> 
+
+
   <tr class="titlerow">
   <td class="titlecell" colspan="2">
   Other links
   </td></tr>
   <tr>
   <td class="contentcell" colspan="2" style="text-align: left">
+  <ul>
+  <li>
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:text>http://packages.debian.org/changelogs/</xsl:text>
+        <xsl:value-of select="directory"/>
+        <xsl:text>/</xsl:text>
+        <xsl:call-template name="escape-name">
+          <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>_</xsl:text>
+        <xsl:call-template name="escape-name">
+          <xsl:with-param name="text">
+            <xsl:call-template name="strip-epoch">
+              <xsl:with-param name="version">
+                <xsl:value-of select="version"/>
+              </xsl:with-param>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>/changelog</xsl:text>
+      </xsl:attribute>
+      <xsl:text>Changelog</xsl:text>
+    </xsl:element>
+    /
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:text>http://packages.debian.org/changelogs/</xsl:text>
+        <xsl:value-of select="directory"/>
+        <xsl:text>/</xsl:text>
+        <xsl:call-template name="escape-name">
+          <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>_</xsl:text>
+        <xsl:call-template name="escape-name">
+          <xsl:with-param name="text">
+            <xsl:call-template name="strip-epoch">
+              <xsl:with-param name="version">
+                <xsl:value-of select="version"/>
+              </xsl:with-param>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>/</xsl:text>
+	<xsl:call-template name="escape-name">
+          	<xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+        </xsl:call-template>
+        <xsl:text>.copyright</xsl:text>
+      </xsl:attribute>
+      <xsl:text>Copyright</xsl:text>
+    </xsl:element>
+  </li>
   <xsl:if test="architecture!='all'">
     <li>
       <xsl:element name="a">
@@ -505,7 +645,18 @@
                               <xsl:variable name="pattern" select="concat('אבטיכךעצרמלשס-/()&#34; ', &quot;'&quot;)"/>
   <xsl:variable name="_name" select="translate(maintainer/name, $pattern, '____________________')"/>
     <li><a href="http://lintian.debian.org/reports/m{$_name}.html#{$package}">Lintian report</a></li>
-  
+  <li>
+    <xsl:element name="a">
+      <xsl:attribute name="href">
+        <xsl:text>http://qa.debian.org/developer.php?popcon=</xsl:text>
+        <xsl:call-template name="escape-name">
+          <xsl:with-param name="text"><xsl:value-of select="$package"/></xsl:with-param>
+        </xsl:call-template>
+      </xsl:attribute>
+      <xsl:text>Popcon stats</xsl:text>
+    </xsl:element>
+  </li>
+  </ul>
   </td>
   </tr>
 
@@ -526,6 +677,7 @@
   </td></tr>
   <tr class="normalrow">
   <td class="normalcell" colspan="2" style="text-align: left">
+  <ul>
   <xsl:for-each select="files/item">
     <li>
     <xsl:element name="a">
@@ -545,7 +697,7 @@
     </xsl:element>
     </li>
   </xsl:for-each>
-  </td></tr>
+  </ul></td></tr>
  
   </table>
   <!-- END LEFT SIDE -->
@@ -577,6 +729,9 @@
         <li>A new upstream version was found:
            (<xsl:value-of select="$other/watch/@new"/>). <a href="{$other/watch/@url}"><xsl:value-of select="$other/watch/@url"/></a></li>
       </xsl:if>
+      <xsl:if test="$other/bugs/@patch!='0'">
+        <li>The Bug Tracking System contains <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?which=src&amp;data={$package}&amp;include=patch&amp;exclude=pending"><xsl:value-of select="$other/bugs/@patch"/> patch(es)</a>, you should include it(them).</li>
+      </xsl:if>
     </xsl:if>
   </xsl:variable>
   <xsl:if test="count($todo)>0 and string($todo)!=''">  
@@ -585,7 +740,10 @@
   Todo
   </td></tr>
   <tr class="normalrow">
-  <td class="contentcell2"><xsl:copy-of select="$todo"/>
+  <td class="contentcell2">
+  <ul>
+  <xsl:copy-of select="$todo"/>
+  </ul>
   </td>
   </tr>
   </xsl:if>
@@ -704,7 +862,8 @@
   Problems
   </td></tr>
   <tr class="normalrow">
-  <td class="contentcell2"><xsl:copy-of select="$problems"/>
+  <td class="contentcell2">
+  <ul><xsl:copy-of select="$problems"/></ul>
   </td>
   </tr>
   </xsl:if>
@@ -716,9 +875,11 @@
   </td></tr>
   <tr class="normalrow">
   <td class="contentcell2" style="text-align: left">
+  <ul>
   <xsl:for-each select="document(concat('../base/', $dir, '/excuse.xml'))/excuse/item">
     <xsl:call-template name="outputitem"/>
   </xsl:for-each>
+  </ul>
   </td>
   </tr>
   </xsl:if>
@@ -737,7 +898,9 @@
     Static Information
     </td></tr>
     <tr class="normalrow">
-    <td class="contentcell2"><xsl:copy-of select="$static"/></td>
+    <td class="contentcell2">
+    <ul><xsl:copy-of select="$static"/></ul>
+    </td>
     </tr>
   </xsl:if>
   
@@ -754,7 +917,9 @@
     Latest News
     </td></tr>
     <tr class="normalrow">
-    <td class="contentcell2"><xsl:copy-of select="$news"/></td>
+    <td class="contentcell2">
+    <ul><xsl:copy-of select="$news"/></ul>
+    </td>
     </tr>
   </xsl:if>
 
@@ -763,7 +928,9 @@
   </td></tr>
   </table>
   <hr/>
-  Debian Package Tracking System - Copyright 2002-2004 Raphaכl Hertzog<br/>
+  Debian Package Tracking System - Copyright 2002-2005 Raphaכl Hertzog<br/>
+  Report problems to the <a href="http://bugs.debian.org/qa.debian.org"
+  >qa.debian.org pseudopackage</a><br/>
   Last modified : <xsl:value-of select="$date"/>
   </body>
   </html>

+ @@ -337,44 +362,58 @@ -
- Other available versions + Available versions
Experimental	Oldstable	- +
Security Updates (oldstable)	Oldstable Security Updates
Stable	+ +
Security Updates (stable)	Stable Security Updates
Security Updates (testing)	Stable Proposed Updates	- +
Testing
Testing Security Updates	+ +
Testing Proposed Updates	Testing Proposed Updates
Stable	Unstable	- +
Stable	Experimental	- +
Stable Proposed Updates	Secure testing	- +
Volatile	+ +
+ Patches +
+ + + + Patch from for version + + + + + Patches from BTS () + + + +
Other links
+ + + + + http://packages.debian.org/changelogs/ + + / + + + + _ + + + + + + + + + + /changelog + + Changelog + + / + + + http://packages.debian.org/changelogs/ + + / + + + + _ + + + + + + + + + + / + + + + .copyright + + Copyright + + @@ -505,7 +645,18 @@ Lintian report - + + + + http://qa.debian.org/developer.php?popcon= + + + + + Popcon stats + + +
+ @@ -545,7 +697,7 @@ -