[Python-modules-commits] [python-pysolar] 04/04: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-pysolar.

commit d30d6df786dd1f014f2ddf7a265accd4e6780616
Merge: 6365653 de9ba16
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Oct 11 02:23:33 2015 +0200

    merge patched into master

 Pysolar/rest.py                                 |  2 +-
 debian/.git-dpm                                 |  4 ++--
 debian/patches/0001-Use-print-as-function.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 11579cb,0000000..7dfa4b3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 37fcbf1551ea55216b02c5f99b3e7c579f878e85
- 37fcbf1551ea55216b02c5f99b3e7c579f878e85
++de9ba16836f3468190e9d38fd4d9ad858fe40aba
++de9ba16836f3468190e9d38fd4d9ad858fe40aba
 +37fcbf1551ea55216b02c5f99b3e7c579f878e85
 +37fcbf1551ea55216b02c5f99b3e7c579f878e85
 +python-pysolar_0.6.orig.tar.gz
 +8edade774b1b96811fd6438b922ef084841286f1
 +2018742
diff --cc debian/patches/0001-Use-print-as-function.patch
index 0000000,0000000..af69945
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-print-as-function.patch
@@@ -1,0 -1,0 +1,24 @@@
++From de9ba16836f3468190e9d38fd4d9ad858fe40aba Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Sun, 11 Oct 2015 02:23:21 +0200
++Subject: Use print as function
++
++Origin: vendor
++Last-Update: 2014-10-03
++---
++ Pysolar/rest.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/Pysolar/rest.py b/Pysolar/rest.py
++index d08efb5..f64338e 100644
++--- a/Pysolar/rest.py
+++++ b/Pysolar/rest.py
++@@ -36,7 +36,7 @@ def GetAerosolForwardScatteranceFactor(altitude_deg):
++ def GetAerosolOpticalDepth(turbidity_beta, effective_wavelength, turbidity_alpha):
++ 	# returns tau_a
++ 	print("effective_wavelength: ")
++-	print effective_wavelength
+++	print(effective_wavelength)
++ 	return turbidity_beta * effective_wavelength ** -turbidity_alpha
++ 
++ def GetAerosolScatteringCorrectionFactor(band, ma, tau_a):
diff --cc debian/patches/series
index 0000000,0000000..408ec4e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-print-as-function.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pysolar.git