[Python-modules-commits] r30518 - in packages/deap/trunk/debian (7 files)

Sun Sep 7 17:07:16 UTC 2014

Date: Sunday, September 7, 2014 @ 17:07:15
  Author: danstender-guest
Revision: 30518

reduced rules, fix-privacy-breach.patch

Added:
  packages/deap/trunk/debian/patches/fix-privacy-breach.patch
  packages/deap/trunk/debian/python-deap-doc.examples
    (from rev 30514, packages/deap/trunk/debian/python-deap-doc.docs)
Modified:
  packages/deap/trunk/debian/changelog
  packages/deap/trunk/debian/patches/series
  packages/deap/trunk/debian/rules
Deleted:
  packages/deap/trunk/debian/python-deap-doc.docs
  packages/deap/trunk/debian/remove_ga.awk

Modified: packages/deap/trunk/debian/changelog
===================================================================

--- packages/deap/trunk/debian/changelog	2014-09-07 15:34:06 UTC (rev 30517)
+++ packages/deap/trunk/debian/changelog	2014-09-07 17:07:15 UTC (rev 30518)
@@ -1,4 +1,4 @@
-deap (1.0.1-2) UNRELEASED; urgency=low
+deap (1.0.1-2) UNRELEASED; urgency=medium
 
   * deb/control:
     + Transferred package to individual maintenance.
@@ -8,14 +8,14 @@
     + Removed redundant paragraph.
   * deb/rules:
     + Added export lines for DH_VERBOSE and DEB_BUILD_OPTIONS.
-    + Reduced to build with Pybuild.
-    + Building with dh_sphinxdoc.
-    + Prevent compression for scripts in examples.
-  * Changed python-deap-doc.install to python-deap-doc.docs.
-  * Added Forwarded info line to doc.patch.
-  * Removed source/option, README.source (obsolete).
+    + Build with Pybuild and dh_sphinxdoc, reduced.
+  * Dropped deb/python-deap-doc.install, added deb/python-deap-doc.examples.
+  * Patches:
+    + added fix-privacy-breach.patch (dropped deb/remove_ga.awk).
+    + doc.patch: added Forwarded info line.
+  * Removed deb/source/options and deb/README.source (obsolete).
 
- -- Daniel Stender <debian at danielstender.com>  Mon, 28 Jul 2014 15:43:40 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sun, 07 Sep 2014 19:01:59 +0200
 
 deap (1.0.1-1) unstable; urgency=low
 

Added: packages/deap/trunk/debian/patches/fix-privacy-breach.patch
===================================================================
--- packages/deap/trunk/debian/patches/fix-privacy-breach.patch	                        (rev 0)
+++ packages/deap/trunk/debian/patches/fix-privacy-breach.patch	2014-09-07 17:07:15 UTC (rev 30518)
@@ -0,0 +1,49 @@
+Description: fix lintian complaints on privacy breach
+Author: Daniel Stender <debian at danielstender.com>
+Forwarded: not-needed
+Last-Update: 2014-09-07
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -25,13 +25,5 @@
+     <br />
+     Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version|e }}.
+ </div>
+-<script type="text/javascript">
+-  (function() {
+-     var ga = document.createElement('script');
+-         ga.src = ('https:' == document.location.protocol ?
+-                'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+-    ga.setAttribute('async', 'true');
+-    document.documentElement.firstChild.appendChild(ga);
+-  })();
+-</script>
++
+ {% endblock %}
+--- a/doc/examples/pso_basic.rst
++++ b/doc/examples/pso_basic.rst
+@@ -97,25 +97,6 @@
+ 
+ The full PSO basic example can be found here : :example:`pso/basic`.
+ 
+-This is a video of the algorithm in action, plotted with matplotlib_. 
+-The red dot represents the best solution found so far.
+-
+-.. _matplotlib: http://matplotlib.org/
+-
+-.. raw:: html
+-
+-	<center>
+-	<object style="height: 390px; width: 640px">
+-	<param name="movie" value="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage">
+-	<param name="allowFullScreen" value="true">
+-	<param name="allowScriptAccess" value="always">
+-	<embed src="http://www.youtube.com/v/f3MW2krobpo?version=3&feature=player_detailpage" 
+-		   type="application/x-shockwave-flash" allowfullscreen="true" 
+-		   allowScriptAccess="always" 
+-		   width="640" height="360">
+-	</object>
+-	</center>
+-
+ References
+ ==========
+ 

Modified: packages/deap/trunk/debian/patches/series
===================================================================
--- packages/deap/trunk/debian/patches/series	2014-09-07 15:34:06 UTC (rev 30517)
+++ packages/deap/trunk/debian/patches/series	2014-09-07 17:07:15 UTC (rev 30518)
@@ -1 +1,2 @@
+fix-privacy-breach.patch
 doc.patch

Deleted: packages/deap/trunk/debian/python-deap-doc.docs
===================================================================
--- packages/deap/trunk/debian/python-deap-doc.docs	2014-09-07 15:34:06 UTC (rev 30517)
+++ packages/deap/trunk/debian/python-deap-doc.docs	2014-09-07 17:07:15 UTC (rev 30518)
@@ -1,2 +0,0 @@
-doc/_build/html
-examples

Copied: packages/deap/trunk/debian/python-deap-doc.examples (from rev 30514, packages/deap/trunk/debian/python-deap-doc.docs)
===================================================================
--- packages/deap/trunk/debian/python-deap-doc.examples	                        (rev 0)
+++ packages/deap/trunk/debian/python-deap-doc.examples	2014-09-07 17:07:15 UTC (rev 30518)
@@ -0,0 +1 @@
+examples/*

Deleted: packages/deap/trunk/debian/remove_ga.awk
===================================================================
--- packages/deap/trunk/debian/remove_ga.awk	2014-09-07 15:34:06 UTC (rev 30517)
+++ packages/deap/trunk/debian/remove_ga.awk	2014-09-07 17:07:15 UTC (rev 30518)
@@ -1,19 +0,0 @@
-BEGIN {
-	BEFORE = 4
-	AFTER = 4
-}
-/google-analytics.com/ {
-	delete buf
-	deleteThrough = NR + AFTER
-	next
-}
-{start = NR - BEFORE}
-NR > deleteThrough {
-	buf[NR] = $0
-	delete buf[start - 1]
-}
-start in buf {print buf[start]}
-END {
-	for (i = start + 1; i <= NR; i++)
-		if (i in buf) print buf[i]
-}

Modified: packages/deap/trunk/debian/rules
===================================================================
--- packages/deap/trunk/debian/rules	2014-09-07 15:34:06 UTC (rev 30517)
+++ packages/deap/trunk/debian/rules	2014-09-07 17:07:15 UTC (rev 30518)
@@ -4,23 +4,13 @@
 export PYBUILD_NAME=deap
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_clean:
-	rm -rf doc/_build
-	dh_auto_clean
-
 override_dh_installdocs:
-	cd doc && $(MAKE) html
-	find doc/_build/html -name "*.html" | while read F; do \
-	   echo Removing google-analytics from $$F; \
-	   cp "$$F" tmp.html; \
-	   printf "\n\n" >> tmp.html; \
-	   awk -f "$(CURDIR)/debian/remove_ga.awk" tmp.html > "$$F"; \
-	   rm tmp.html; \
-	done
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N doc debian/python-deap-doc/usr/share/doc/python-deap-doc/html
+endif
 	dh_installdocs
-	dh_sphinxdoc
 
 override_dh_compress:
-	dh_compress -X.py
+	dh_compress -X.py -X.json -X.csv -X.cpp # save examples


