[Python-modules-commits] r33966 - in packages/scipy/trunk/debian (changelog rules)

[varun at users.alioth.debian.org]

    Date: Monday, August 24, 2015 @ 04:03:55
  Author: varun
Revision: 33966

ready for push

Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/rules

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2015-08-23 23:09:56 UTC (rev 33965)
+++ packages/scipy/trunk/debian/changelog	2015-08-24 04:03:55 UTC (rev 33966)
@@ -11,7 +11,7 @@
 
   [ Jean-Christophe Jaskula ]
   * Pointed debian/watch to github.com (cleaner sources)
-  * d/control: 
+  * d/control:
     - Added dh_python to B-d
     - Removed unnecessary XS-Testsuite field
   * Linking to local javascript libraries
@@ -20,7 +20,7 @@
     - use_local_objects.patch
   * Cleaned debian/copyright
 
- -- Varun Hiremath <varun at debian.org>  Mon, 17 Aug 2015 19:27:21 -0400
+ -- Varun Hiremath <varun at debian.org>  Sun, 23 Aug 2015 23:01:46 -0400
 
 python-scipy (0.14.1-1) unstable; urgency=medium
 

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2015-08-23 23:09:56 UTC (rev 33965)
+++ packages/scipy/trunk/debian/rules	2015-08-24 04:03:55 UTC (rev 33966)
@@ -64,15 +64,7 @@
 	  ln -sf /usr/lib/python$$py/dist-packages/decorator.py $(BASE)/python-scipy/usr/lib/python$$py/dist-packages/scipy/_lib/decorator.py; \
 	done
 	ln -sf /usr/lib/python3/dist-packages/decorator.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/_lib/decorator.py
-	
-	# Using the local python-six
-	#ln -sf /usr/lib/python$$py/dist-packages/six.py $(BASE)/python-scipy/usr/lib/python$$py/dist-packages/scipy/_lib/six.py; \
-	#ln -sf /usr/lib/python3/dist-packages/six.py $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/_lib/six.py
 
-	# not ported to py3 in 0.10.1
-	# Let's try to build weave for python3, it might be ok by now
-	#rm -rf $(BASE)/python3-scipy/usr/lib/python3/dist-packages/scipy/weave
-        #call dh_numpy
 	dh_numpy
 	dh_numpy3
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -103,7 +95,7 @@
 	#replace all the usr/bin/env python
 	find $(BASE)/python3-scipy/usr/lib/python3/ -name "*.py" -type f | xargs sed -i -e "1s#usr/bin/env\s\+python\s*\$$#usr/bin/env python3#"
 
-	# .Mat files should not be executable 
+	# .Mat files should not be executable
 	find $(BASE)/python*-scipy/usr/lib/python*/dist-packages/scipy/io/matlab/tests/data/ -executable -type f | xargs chmod -x
 
 override_dh_strip:
@@ -120,10 +112,6 @@
 	dh_link -ppython-scipy-doc /usr/share/javascript/mathjax/MathJax.js /usr/share/doc/python-scipy-doc/html/_static/MathJax.js
 	dh_sphinxdoc
 
-#override_dh_installdocs-indep:
-#	dh_installdocs -i
-#	dh_sphinxdoc -i
-
 get-orig-source:
 	-uscan --force-download --download-version $(UVER) --rename