[SCM] qgis branch, master, updated. upstream/2.0.1-13463-g98795a7
Bas Couwenberg
sebastic at xs4all.nl
Fri Jan 17 16:27:41 UTC 2014
The following commit has been merged in the master branch:
commit 98795a7d1d075df7ac7a766cc6d119f30c50567b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 17 17:27:36 2014 +0100
Add patch to remove Google AdSense from documention.
diff --git a/debian/changelog b/debian/changelog
index 264b631..e521aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ qgis (2.0.1-1) unstable; urgency=low
* Add patch to fix building with SIP 4.15.
* Update Source URL in copyright.
* Add patches from upstream release-2_0 branch.
+ * Add patch to remove Google AdSense from documention.
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 16 Jan 2014 21:28:09 +0100
diff --git a/debian/patches/remove-google-adsense.patch b/debian/patches/remove-google-adsense.patch
new file mode 100644
index 0000000..3160e4c
--- /dev/null
+++ b/debian/patches/remove-google-adsense.patch
@@ -0,0 +1,107 @@
+Description: Remove Google AdSense tracker from documentation.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2014-01-17
+--- a/python/plugins/processing/otb/description/doc/BlockMatching.html
++++ b/python/plugins/processing/otb/description/doc/BlockMatching.html
+@@ -898,4 +898,4 @@ href="CookBooksu72.html" >front</a>] [<a
+ href="CookBookse17.html#CookBooksu72.html" >up</a>] </p></div>
+ <!--l. 3525--><p class="noindent" ><a
+ id="tailCookBooksu72.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/DimensionalityReduction.html
++++ b/python/plugins/processing/otb/description/doc/DimensionalityReduction.html
+@@ -485,4 +485,4 @@ href="CookBooksu61.html" >front</a>] [<a
+ href="CookBookse15.html#CookBooksu61.html" >up</a>] </p></div>
+ <!--l. 2486--><p class="noindent" ><a
+ id="tailCookBooksu61.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/DisparityMapToElevationMap.html
++++ b/python/plugins/processing/otb/description/doc/DisparityMapToElevationMap.html
+@@ -610,4 +610,4 @@ href="CookBooksu73.html" >front</a>] [<a
+ href="CookBookse17.html#CookBooksu73.html" >up</a>] </p></div>
+ <!--l. 3640--><p class="noindent" ><a
+ id="tailCookBooksu73.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/EdisonMeanShiftSegmentation.html
++++ b/python/plugins/processing/otb/description/doc/EdisonMeanShiftSegmentation.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/EdisonMeanShiftSegmentationVector.html
++++ b/python/plugins/processing/otb/description/doc/EdisonMeanShiftSegmentationVector.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/MeanShiftSegmentation.html
++++ b/python/plugins/processing/otb/description/doc/MeanShiftSegmentation.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/MeanShiftSegmentationVector.html
++++ b/python/plugins/processing/otb/description/doc/MeanShiftSegmentationVector.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/MeanShiftSmoothing.html
++++ b/python/plugins/processing/otb/description/doc/MeanShiftSmoothing.html
+@@ -418,4 +418,4 @@ href="CookBooksu63.html" >front</a>] [<a
+ href="CookBookse15.html#CookBooksu63.html" >up</a>] </p></div>
+ <!--l. 2613--><p class="noindent" ><a
+ id="tailCookBooksu63.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentation.html
++++ b/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentation.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</html>
+--- a/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentationVector.html
++++ b/python/plugins/processing/otb/description/doc/SimpleConnectedComponentsSegmentationVector.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/VectorDataReprojection.html
++++ b/python/plugins/processing/otb/description/doc/VectorDataReprojection.html
+@@ -486,4 +486,4 @@ href="CookBooksu47.html" >front</a>] [<a
+ href="CookBookse12.html#CookBooksu47.html" >up</a>] </p></div>
+ <!--l. 1079--><p class="noindent" ><a
+ id="tailCookBooksu47.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/WatershedSegmentation.html
++++ b/python/plugins/processing/otb/description/doc/WatershedSegmentation.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
+--- a/python/plugins/processing/otb/description/doc/WatershedSegmentationVector.html
++++ b/python/plugins/processing/otb/description/doc/WatershedSegmentationVector.html
+@@ -1037,4 +1037,4 @@ number.
+ <!--l. 4732-->
+ <!--l. 4732--><p class="noindent" ><a
+ id="tailCookBooksu84.html"></a>
+- <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"> try { var pageTracker = _gat._getTracker("UA-7072990-1"); pageTracker._trackPageview(); } catch(err) {}</script></body></html>
++</body></html>
diff --git a/debian/patches/series b/debian/patches/series
index fba6b68..f0dd215 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ translation-update-id.patch
composer-fix-python-bindings-for-attribute-table.patch
increase-decimaps-for-gdal-contour.patch
ogr-only-call-repack-when-closing-a-data-provider.patch
+remove-google-adsense.patch
--
The Quantum GIS in Debian project
More information about the Pkg-grass-devel
mailing list