[castor] 06/08: Removed the calls to Google Analytics in the documentation

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Sep 29 12:11:49 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository castor.

commit adc936257598ae01c27e5f8ae8994f541b0749dd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 13:57:42 2014 +0200

    Removed the calls to Google Analytics in the documentation
---
 debian/changelog                            |   1 +
 debian/patches/remove-google-analytics.diff | 532 ++++++++++++++++++++++++++++
 debian/patches/series                       |   1 +
 3 files changed, 534 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 00230aa..a71dfee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ castor (1.3.2-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on libcglib3-java instead of libcglib-java
+  * Removed the calls to Google Analytics in the documentation
   * Standards-Version updated to 3.9.6 (no changes)
   * debian/rules: Generate Java 5 compatible bytecode
   * Switch to debhelper level 9
diff --git a/debian/patches/remove-google-analytics.diff b/debian/patches/remove-google-analytics.diff
new file mode 100644
index 0000000..90bea46
--- /dev/null
+++ b/debian/patches/remove-google-analytics.diff
@@ -0,0 +1,532 @@
+Description: Remove the calls to Google Analytics in the documentation
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/doc/src/docbkx/resources/xsl/html.xsl
++++ b/doc/src/docbkx/resources/xsl/html.xsl
+@@ -11,7 +11,6 @@
+                 
+     <xsl:import href="urn:docbkx:stylesheet"/>
+     <xsl:import href="highlight.xsl"/>
+-    <xsl:import href="tracking.xsl" />
+ 	
+     <!--###################################################
+                     HTML Settings
+@@ -63,45 +62,45 @@
+     <!--###################################################
+                          Misc
+    ################################################### -->
+-    <!-- Placement of titles -->
+-    <xsl:param name="formal.title.placement">
+-        figure after
+-        example before
+-        equation before
+-        table before
+-        procedure before
++    <!-- Placement of titles -->
++    <xsl:param name="formal.title.placement">
++        figure after
++        example before
++        equation before
++        table before
++        procedure before
+     </xsl:param>
+-    <xsl:template match="author" mode="titlepage.mode">
+-        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
++    <xsl:template match="author" mode="titlepage.mode">
++        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+             <xsl:text>, </xsl:text>
+         </xsl:if>
+-        <span class="{name(.)}">
++        <span class="{name(.)}">
+             <xsl:call-template name="person.name"/> 
+             (<xsl:value-of select="affiliation"/>)
+-            <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+-        </span>
+-    </xsl:template>
+-    <xsl:template match="authorgroup" mode="titlepage.mode">
+-        <div class="{name(.)}">
+-            <h2>Authors</h2>
+-            <p/>
+-            <xsl:apply-templates mode="titlepage.mode"/>
+-        </div>
++            <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
++        </span>
+     </xsl:template>
+-   <!--###################################################
+-                     Headers and Footers
+-    ################################################### -->
+-    <!-- let's have a Spring and I21 banner across the top of each page -->
+-    <xsl:template name="user.header.navigation">
+-        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
+-            <a style="border:none;" href="http://www.springframework.org/osgi/"
+-               title="The Spring Framework - Spring Dynamic Modules">
+-                <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
+-            </a>
+-            <a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
+-                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
+-            </a>
+-        </div>
++    <xsl:template match="authorgroup" mode="titlepage.mode">
++        <div class="{name(.)}">
++            <h2>Authors</h2>
++            <p/>
++            <xsl:apply-templates mode="titlepage.mode"/>
++        </div>
++    </xsl:template>
++   <!--###################################################
++                     Headers and Footers
++    ################################################### -->
++    <!-- let's have a Spring and I21 banner across the top of each page -->
++    <xsl:template name="user.header.navigation">
++        <div style="background-color:white;border:none;height:73px;border:1px solid black;">
++            <a style="border:none;" href="http://www.springframework.org/osgi/"
++               title="The Spring Framework - Spring Dynamic Modules">
++                <img style="border:none;" src="images/xdev-spring_logo.jpg"/>
++            </a>
++            <a style="border:none;" href="http://www.SpringSource.com/" title="SpringSource - Spring from the Source">
++                <img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/s2-banner-rhs.png"/>
++            </a>
++        </div>
+     </xsl:template>
+ 
+ </xsl:stylesheet>
+--- a/doc/src/docbkx/resources/xsl/html_chunk.xsl
++++ b/doc/src/docbkx/resources/xsl/html_chunk.xsl
+@@ -1,218 +1,217 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<!-- 
+-    This is the XSL HTML configuration file for the Spring Reference Documentation.
+--->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
+-                version="1.0">
+-
+-    <xsl:import href="urn:docbkx:stylesheet"/>
++<!-- 
++    This is the XSL HTML configuration file for the Spring Reference Documentation.
++-->
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:fo="http://www.w3.org/1999/XSL/Format"
++                version="1.0">
++
++    <xsl:import href="urn:docbkx:stylesheet"/>
+     <xsl:import href="highlight.xsl"/>
+-    <xsl:import href="tracking.xsl" />
+     
+-
+-    <!--###################################################
+-                     HTML Settings
+-    ################################################### -->
+-    <xsl:param name="chunk.section.depth">'5'</xsl:param>
+-    <xsl:param name="use.id.as.filename">'1'</xsl:param>
+-	<xsl:param name="tablecolumns.extension">0</xsl:param>
+-    <xsl:param name="graphicsize.extension">0</xsl:param>
+-    <xsl:param name="ignore.image.scaling">1</xsl:param>
+-    <!--###################################################
+-                      Table Of Contents
+-    ################################################### -->
+-    <!-- Generate the TOCs for named components only -->
+-    <xsl:param name="generate.toc">
+-        book toc
+-        qandaset toc
+-    </xsl:param>
+-    <!-- Show only Sections up to level 3 in the TOCs -->
+-    <xsl:param name="toc.section.depth">3</xsl:param>
+-    <!--###################################################
+-                         Labels
+-    ################################################### -->
+-    <!-- Label Chapters and Sections (numbering) -->
+-    <xsl:param name="chapter.autolabel">1</xsl:param>
+-    <xsl:param name="section.autolabel" select="1"/>
+-    <xsl:param name="section.label.includes.component.label" select="1"/>
+-    <!--###################################################
+-                         Callouts
+-    ################################################### -->
+-    <!-- Place callout marks at this column in annotated areas -->
+-    <xsl:param name="callout.graphics">1</xsl:param>
+-    <xsl:param name="callout.defaultcolumn">90</xsl:param>
+-    
++
++    <!--###################################################
++                     HTML Settings
++    ################################################### -->
++    <xsl:param name="chunk.section.depth">'5'</xsl:param>
++    <xsl:param name="use.id.as.filename">'1'</xsl:param>
++	<xsl:param name="tablecolumns.extension">0</xsl:param>
++    <xsl:param name="graphicsize.extension">0</xsl:param>
++    <xsl:param name="ignore.image.scaling">1</xsl:param>
++    <!--###################################################
++                      Table Of Contents
++    ################################################### -->
++    <!-- Generate the TOCs for named components only -->
++    <xsl:param name="generate.toc">
++        book toc
++        qandaset toc
++    </xsl:param>
++    <!-- Show only Sections up to level 3 in the TOCs -->
++    <xsl:param name="toc.section.depth">3</xsl:param>
++    <!--###################################################
++                         Labels
++    ################################################### -->
++    <!-- Label Chapters and Sections (numbering) -->
++    <xsl:param name="chapter.autolabel">1</xsl:param>
++    <xsl:param name="section.autolabel" select="1"/>
++    <xsl:param name="section.label.includes.component.label" select="1"/>
++    <!--###################################################
++                         Callouts
++    ################################################### -->
++    <!-- Place callout marks at this column in annotated areas -->
++    <xsl:param name="callout.graphics">1</xsl:param>
++    <xsl:param name="callout.defaultcolumn">90</xsl:param>
++    
+     <!--###################################################
+                       Admonitions
+    ################################################### -->
+ 
+     <!-- Use nice graphics for admonitions -->
+     <xsl:param name="admon.graphics">1</xsl:param>
+-	<xsl:param name="admon.graphics.path">images/admons/</xsl:param>    
+-    <!--###################################################
+-                          Misc
+-    ################################################### -->
+-    <!-- Placement of titles -->
+-    <xsl:param name="formal.title.placement">
+-        figure after
+-        example before
+-        equation before
+-        table before
+-        procedure before
++	<xsl:param name="admon.graphics.path">images/admons/</xsl:param>    
++    <!--###################################################
++                          Misc
++    ################################################### -->
++    <!-- Placement of titles -->
++    <xsl:param name="formal.title.placement">
++        figure after
++        example before
++        equation before
++        table before
++        procedure before
+     </xsl:param>
+-    <xsl:template match="author" mode="titlepage.mode">
+-        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
++    <xsl:template match="author" mode="titlepage.mode">
++        <xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+             <xsl:text>, </xsl:text>
+         </xsl:if>
+-        <span class="{name(.)}">
++        <span class="{name(.)}">
+             <xsl:call-template name="person.name"/> 
+             (<xsl:value-of select="affiliation"/>)
+-            <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+-            <!--
+-            <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
+-            -->
+-        </span>
+-    </xsl:template>
+-    <xsl:template match="authorgroup" mode="titlepage.mode">
+-        <div class="{name(.)}">
+-            <h2>Authors</h2>
+-            <p/>
+-            <xsl:apply-templates mode="titlepage.mode"/>
+-        </div>
+-    </xsl:template>
+-    <!--###################################################
+-                     Headers and Footers
+-    ################################################### -->
+-    <xsl:template name="user.header.navigation">
+-        <div id="top">
+-            <div id="header">
+-                <div class="projectlogo">
+-                    <a href="./"><img class="logoImage" src="images/castor.gif" alt="Castor" border="0" /></a>
+-                </div>
++            <xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
++            <!--
++            <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
++            -->
++        </span>
++    </xsl:template>
++    <xsl:template match="authorgroup" mode="titlepage.mode">
++        <div class="{name(.)}">
++            <h2>Authors</h2>
++            <p/>
++            <xsl:apply-templates mode="titlepage.mode"/>
++        </div>
++    </xsl:template>
++    <!--###################################################
++                     Headers and Footers
++    ################################################### -->
++    <xsl:template name="user.header.navigation">
++        <div id="top">
++            <div id="header">
++                <div class="projectlogo">
++                    <a href="./"><img class="logoImage" src="images/castor.gif" alt="Castor" border="0" /></a>
++                </div>
+             </div>
+-        </div>
+-        <div class="mhSpacer"></div>            
+-    </xsl:template>
+-    <!-- no other header navigation (prev, next, etc.) -->
+-    <xsl:template name="header.navigation"/>
+-    <xsl:param name="navig.showtitles">1</xsl:param>
+-    <!-- let's have a 'Sponsored by SpringSource' strapline (or somesuch) across the bottom of each page -->
+-    <xsl:template name="footer.navigation">
+-        <xsl:param name="prev" select="/foo"/>
+-        <xsl:param name="next" select="/foo"/>
+-        <xsl:param name="nav.context"/>
+-        <xsl:variable name="home" select="/*[1]"/>
+-        <xsl:variable name="up" select="parent::*"/>
+-        <xsl:variable name="row1" select="count($prev) > 0
+-                                        or count($up) > 0
+-                                        or count($next) > 0"/>
+-        <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)
+-                                        or (generate-id($home) != generate-id(.)
+-                                            or $nav.context = 'toc')
+-                                        or ($chunk.tocs.and.lots != 0
+-                                            and $nav.context != 'toc')
+-                                        or ($next and $navig.showtitles != 0)"/>
+-        <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
+-            <div class="navfooter">
+-                <xsl:if test="$footer.rule != 0">
+-                    <hr/>
+-                </xsl:if>
+-                <xsl:if test="$row1 or $row2">
+-                    <table width="100%" summary="Navigation footer">
+-                        <xsl:if test="$row1">
+-                            <tr>
+-                                <td width="40%" align="left">
+-                                    <xsl:if test="count($prev)>0">
+-                                        <a accesskey="p">
+-                                            <xsl:attribute name="href">
+-                                                <xsl:call-template name="href.target">
+-                                                    <xsl:with-param name="object" select="$prev"/>
+-                                                </xsl:call-template>
+-                                            </xsl:attribute>
+-                                            <xsl:call-template name="navig.content">
+-                                                <xsl:with-param name="direction" select="'prev'"/>
+-                                            </xsl:call-template>
+-                                        </a>
+-                                    </xsl:if>
+-                                    <xsl:text> </xsl:text>
+-                                </td>
+-
+-                                <td width="20%" align="center">
+-                                    <xsl:choose>
+-                                        <xsl:when test="$home != . or $nav.context = 'toc'">
+-                                            <a accesskey="h">
+-                                                <xsl:attribute name="href">
+-                                                    <xsl:call-template name="href.target">
+-                                                        <xsl:with-param name="object" select="$home"/>
+-                                                    </xsl:call-template>
+-                                                </xsl:attribute>
+-                                                <xsl:call-template name="navig.content">
+-                                                    <xsl:with-param name="direction" select="'home'"/>
+-                                                </xsl:call-template>
+-                                            </a>
+-                                            <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+-                                                <xsl:text> | </xsl:text>
+-                                            </xsl:if>
+-                                        </xsl:when>
+-                                        <xsl:otherwise> </xsl:otherwise>
+-                                    </xsl:choose>
+-                                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
+-                                        <a accesskey="t">
+-                                            <xsl:attribute name="href">
+-                                                <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
+-                                                    <xsl:with-param name="recursive" select="true()"/>
+-                                                </xsl:apply-templates>
+-                                                <xsl:text>-toc</xsl:text>
+-                                                <xsl:value-of select="$html.ext"/>
+-                                            </xsl:attribute>
+-                                            <xsl:call-template name="gentext">
+-                                                <xsl:with-param name="key" select="'nav-toc'"/>
+-                                            </xsl:call-template>
+-                                        </a>
+-                                    </xsl:if>
+-                                </td>
+-                                <td width="40%" align="right">
+-                                    <xsl:text> </xsl:text>
+-                                    <xsl:if test="count($next)>0">
+-                                        <a accesskey="n">
+-                                            <xsl:attribute name="href">
+-                                                <xsl:call-template name="href.target">
+-                                                    <xsl:with-param name="object" select="$next"/>
+-                                                </xsl:call-template>
+-                                            </xsl:attribute>
+-                                            <xsl:call-template name="navig.content">
+-                                                <xsl:with-param name="direction" select="'next'"/>
+-                                            </xsl:call-template>
+-                                        </a>
+-                                    </xsl:if>
+-                                </td>
+-                            </tr>
+-                        </xsl:if>
+-                        <xsl:if test="$row2">
+-                            <tr>
+-                                <td width="40%" align="left" valign="top">
+-                                    <xsl:if test="$navig.showtitles != 0">
+-                                        <xsl:apply-templates select="$prev" mode="object.title.markup"/>
+-                                    </xsl:if>
+-                                    <xsl:text> </xsl:text>
+-                                </td>
+-                                <td width="20%" align="center">
+-                                    <span style="color:white;font-size:85%;">
+-                                        <a href="http://www.castor.org/" title="The Castor community">The Castor community</a>
+-                                    </span>
+-                                </td>
+-                                <td width="40%" align="right" valign="top">
+-                                    <xsl:text> </xsl:text>
+-                                    <xsl:if test="$navig.showtitles != 0">
+-                                        <xsl:apply-templates select="$next" mode="object.title.markup"/>
+-                                    </xsl:if>
+-                                </td>
+-                            </tr>
+-                        </xsl:if>
+-                    </table>
+-                </xsl:if>
+-            </div>
+-        </xsl:if>
+-    </xsl:template>
+-</xsl:stylesheet>
++        </div>
++        <div class="mhSpacer"></div>            
++    </xsl:template>
++    <!-- no other header navigation (prev, next, etc.) -->
++    <xsl:template name="header.navigation"/>
++    <xsl:param name="navig.showtitles">1</xsl:param>
++    <!-- let's have a 'Sponsored by SpringSource' strapline (or somesuch) across the bottom of each page -->
++    <xsl:template name="footer.navigation">
++        <xsl:param name="prev" select="/foo"/>
++        <xsl:param name="next" select="/foo"/>
++        <xsl:param name="nav.context"/>
++        <xsl:variable name="home" select="/*[1]"/>
++        <xsl:variable name="up" select="parent::*"/>
++        <xsl:variable name="row1" select="count($prev) > 0
++                                        or count($up) > 0
++                                        or count($next) > 0"/>
++        <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)
++                                        or (generate-id($home) != generate-id(.)
++                                            or $nav.context = 'toc')
++                                        or ($chunk.tocs.and.lots != 0
++                                            and $nav.context != 'toc')
++                                        or ($next and $navig.showtitles != 0)"/>
++        <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
++            <div class="navfooter">
++                <xsl:if test="$footer.rule != 0">
++                    <hr/>
++                </xsl:if>
++                <xsl:if test="$row1 or $row2">
++                    <table width="100%" summary="Navigation footer">
++                        <xsl:if test="$row1">
++                            <tr>
++                                <td width="40%" align="left">
++                                    <xsl:if test="count($prev)>0">
++                                        <a accesskey="p">
++                                            <xsl:attribute name="href">
++                                                <xsl:call-template name="href.target">
++                                                    <xsl:with-param name="object" select="$prev"/>
++                                                </xsl:call-template>
++                                            </xsl:attribute>
++                                            <xsl:call-template name="navig.content">
++                                                <xsl:with-param name="direction" select="'prev'"/>
++                                            </xsl:call-template>
++                                        </a>
++                                    </xsl:if>
++                                    <xsl:text> </xsl:text>
++                                </td>
++
++                                <td width="20%" align="center">
++                                    <xsl:choose>
++                                        <xsl:when test="$home != . or $nav.context = 'toc'">
++                                            <a accesskey="h">
++                                                <xsl:attribute name="href">
++                                                    <xsl:call-template name="href.target">
++                                                        <xsl:with-param name="object" select="$home"/>
++                                                    </xsl:call-template>
++                                                </xsl:attribute>
++                                                <xsl:call-template name="navig.content">
++                                                    <xsl:with-param name="direction" select="'home'"/>
++                                                </xsl:call-template>
++                                            </a>
++                                            <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
++                                                <xsl:text> | </xsl:text>
++                                            </xsl:if>
++                                        </xsl:when>
++                                        <xsl:otherwise> </xsl:otherwise>
++                                    </xsl:choose>
++                                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
++                                        <a accesskey="t">
++                                            <xsl:attribute name="href">
++                                                <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
++                                                    <xsl:with-param name="recursive" select="true()"/>
++                                                </xsl:apply-templates>
++                                                <xsl:text>-toc</xsl:text>
++                                                <xsl:value-of select="$html.ext"/>
++                                            </xsl:attribute>
++                                            <xsl:call-template name="gentext">
++                                                <xsl:with-param name="key" select="'nav-toc'"/>
++                                            </xsl:call-template>
++                                        </a>
++                                    </xsl:if>
++                                </td>
++                                <td width="40%" align="right">
++                                    <xsl:text> </xsl:text>
++                                    <xsl:if test="count($next)>0">
++                                        <a accesskey="n">
++                                            <xsl:attribute name="href">
++                                                <xsl:call-template name="href.target">
++                                                    <xsl:with-param name="object" select="$next"/>
++                                                </xsl:call-template>
++                                            </xsl:attribute>
++                                            <xsl:call-template name="navig.content">
++                                                <xsl:with-param name="direction" select="'next'"/>
++                                            </xsl:call-template>
++                                        </a>
++                                    </xsl:if>
++                                </td>
++                            </tr>
++                        </xsl:if>
++                        <xsl:if test="$row2">
++                            <tr>
++                                <td width="40%" align="left" valign="top">
++                                    <xsl:if test="$navig.showtitles != 0">
++                                        <xsl:apply-templates select="$prev" mode="object.title.markup"/>
++                                    </xsl:if>
++                                    <xsl:text> </xsl:text>
++                                </td>
++                                <td width="20%" align="center">
++                                    <span style="color:white;font-size:85%;">
++                                        <a href="http://www.castor.org/" title="The Castor community">The Castor community</a>
++                                    </span>
++                                </td>
++                                <td width="40%" align="right" valign="top">
++                                    <xsl:text> </xsl:text>
++                                    <xsl:if test="$navig.showtitles != 0">
++                                        <xsl:apply-templates select="$next" mode="object.title.markup"/>
++                                    </xsl:if>
++                                </td>
++                            </tr>
++                        </xsl:if>
++                    </table>
++                </xsl:if>
++            </div>
++        </xsl:if>
++    </xsl:template>
++</xsl:stylesheet>
+--- a/src/doc/style/exolab.xsl
++++ b/src/doc/style/exolab.xsl
+@@ -224,14 +224,6 @@
+ 
+     </table>
+ 
+-    <script type="text/javascript">
+-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+-    </script>
+-    <script type="text/javascript">
+-        var pageTracker = _gat._getTracker("UA-3544187-1");
+-        pageTracker._trackPageview();
+-    </script>
+     <!--    
+     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+     </script>
diff --git a/debian/patches/series b/debian/patches/series
index 17db5ea..b2a886a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ add_cpa_generated_sources.diff
 add_schema_generated_sources.diff
 fix_debian_build.diff
 fix_maven_metadata.diff
+remove-google-analytics.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/castor.git



More information about the pkg-java-commits mailing list