Bug#488751: Patch

[Frank Lichtenheld <djpig@debian.org>]

On Mon, Jul 21, 2008 at 09:35:29AM +0200, Thijs Kinkhorst wrote:
> 4 it needs, regardless of how many extra information items get added. Updated 
> patch attached.
> 

I guess this part doesn't really belong to the patch, right?

> Index: pts/www/xsl/pts.xsl
> ===================================================================
> --- pts/www/xsl/pts.xsl	(revision 1917)
> +++ pts/www/xsl/pts.xsl	(working copy)
> @@ -917,6 +917,12 @@
>        <xsl:if test="$other/bugs/@patch!='0'">
>  	<li>The Bug Tracking System contains
>            <a href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src={$escaped-package}&amp;include=tags:patch&amp;exclude=tags:pending&amp;pend-exc=done&amp;repeatmerged=no";>patches fixing
> +<<<<<<< .mine
> +	    <xsl:value-of select="$other/bugs/@patch"/> bug<xsl:if test="$other/bugs/@patch!='1'">s</xsl:if>
> +          </a>, consider including or untagging
> +	  <xsl:if test="$other/bugs/@patch!='1'">them</xsl:if>
> +	  <xsl:if test="$other/bugs/@patch='1'">it</xsl:if>.
> +=======
>            <xsl:value-of select="$other/bugs/@patch"/> bug<xsl:if test="$other/bugs/@patch!='1'">s</xsl:if>
>            </a>
>  	  <xsl:if test="$other/bugs/@patch_m">
> @@ -928,6 +934,7 @@
>  	  </xsl:if>, consider including or untagging
>            <xsl:if test="$other/bugs/@patch!='1'">them</xsl:if>
>            <xsl:if test="$other/bugs/@patch='1'">it</xsl:if>.
> +>>>>>>> .r1860
>  	</li>
>        </xsl:if>
>      </xsl:if>


Gruesse,
-- 
Frank Lichtenheld <djpig@debian.org>
www: http://www.djpig.de/