[med-svn] [pyscanfcs] 04/05: adapt quilt patch

Andreas Tille tille at debian.org
Thu Dec 7 15:39:49 UTC 2017


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

tille pushed a commit to branch master
in repository pyscanfcs.

commit 62af080777806d5cb60c6ffa314ec728cbb14ff8
Author: Andreas Tille <tille at debian.org>
Date:   Thu Dec 7 16:16:40 2017 +0100

    adapt quilt patch
---
 debian/changelog                                    |  2 +-
 debian/patches/Use-Astropy-in-place-of-Pyfits.patch | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2340de..3895403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 pyscanfcs (0.2.3+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Repack upstream source
+  * Repack upstream source + adapt quilt patch
     Closes: #883762
 
  -- Andreas Tille <tille at debian.org>  Thu, 07 Dec 2017 15:47:10 +0100
diff --git a/debian/patches/Use-Astropy-in-place-of-Pyfits.patch b/debian/patches/Use-Astropy-in-place-of-Pyfits.patch
index 9afdca9..ae6b664 100644
--- a/debian/patches/Use-Astropy-in-place-of-Pyfits.patch
+++ b/debian/patches/Use-Astropy-in-place-of-Pyfits.patch
@@ -12,21 +12,6 @@ replaced by Astropy which provides a drop-in-replacement as astropy.io.fits.
  setup.py                                          | 2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/freeze_pyinstaller/debian_ubuntu_bundle_script.sh b/freeze_pyinstaller/debian_ubuntu_bundle_script.sh
-index eaf835c..135b063 100755
---- a/freeze_pyinstaller/debian_ubuntu_bundle_script.sh
-+++ b/freeze_pyinstaller/debian_ubuntu_bundle_script.sh
-@@ -41,7 +41,7 @@ if ! [ -e $Env ]; then
-     # Pyinstaller
-     pip install git+git://github.com/pyinstaller/pyinstaller.git@779d07b236a943a4bf9d2b1a0ae3e0ebcc914798
-     # PyFITS
--    pip install pyfits
-+    pip install astropy
- fi
- source $Env"/bin/activate"
- 
-diff --git a/pyscanfcs/doc.py b/pyscanfcs/doc.py
-index 86131b5..ce05cc3 100755
 --- a/pyscanfcs/doc.py
 +++ b/pyscanfcs/doc.py
 @@ -25,7 +25,7 @@ import multipletau
@@ -47,8 +32,6 @@ index 86131b5..ce05cc3 100755
             "\n - SciPy "+scipy.__version__+\
             "\n - uilayer "+uilayer.__version__+\
             "\n - wxPython "+wx.__version__
-diff --git a/pyscanfcs/main.py b/pyscanfcs/main.py
-index 78c4f80..31e9da1 100755
 --- a/pyscanfcs/main.py
 +++ b/pyscanfcs/main.py
 @@ -57,7 +57,7 @@ import matplotlib.pyplot as plt
@@ -60,8 +43,6 @@ index 78c4f80..31e9da1 100755
  from scipy.fftpack import fft
  from scipy.fftpack import fftfreq
  # SFCSnumeric needs scipy.optimize
-diff --git a/setup.py b/setup.py
-index 46a8709..baa6337 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -65,7 +65,7 @@ setup(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pyscanfcs.git



More information about the debian-med-commit mailing list