[Git][debian-gis-team/doris][master] 4 commits: Update python3.patch to fix more issues.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / doris


Commits:
a335cec0 by Bas Couwenberg at 2019-07-26T08:30:21Z
Update python3.patch to fix more issues.

- - - - -
138bd0f0 by Bas Couwenberg at 2019-07-26T08:40:45Z
Redirect STDERR correctly in tests control.

- - - - -
146bad41 by Bas Couwenberg at 2019-07-26T08:42:22Z
Set distribution to unstable.

- - - - -
ead88fb3 by Bas Couwenberg at 2019-07-26T09:51:56Z
Mark python3.patch as Forwarded.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/python3.patch
- debian/tests/control


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-doris (5.0.3~beta+dfsg-9) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-9) unstable; urgency=medium
 
   * Team upload.
   * Add patch to fix Python 3 support.
+  * Redirect STDERR correctly in tests control.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 22 Jul 2019 06:41:39 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Jul 2019 10:42:09 +0200
 
 doris (5.0.3~beta+dfsg-8) unstable; urgency=medium
 


=====================================
debian/patches/python3.patch
=====================================
@@ -1,5 +1,6 @@
 Description: Fix support for Python 3.
 Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/TUDelftGeodesy/Doris/issues/8
 
 --- a/bin/csk_dump_data.py
 +++ b/bin/csk_dump_data.py
@@ -54,6 +55,41 @@ Author: Bas Couwenberg <sebastic at debian.org>
  data = array('h')
  data = sbi[:,:,:]
  Number_of_lines_original = sbi.shape[0]
+@@ -69,7 +69,7 @@ elif len(sys.argv) > 3 and len(sys.argv)
+     outputWinFirstPix  = int(sys.argv[5])-1    # gdal srcwin starting at 0
+     outputWinLastPix   = int(sys.argv[6])      # Lastpix  --> yoff  (later)
+ elif len(sys.argv) > 3 and len(sys.argv) < 7:
+-    print 'Unrecognized input'
++    print('Unrecognized input')
+     usage()
+     sys.exit(1)
+ else:
+@@ -86,13 +86,13 @@ else:
+ #    outputWinLastLine  = Number_of_lines_original-1
+ #    outputWinFirstPix = 0
+ #    outputWinLastPix  = Number_of_pixels_original-1
+-#    print 'crop parameters not provided,so cropping the whole image'
++#    print('crop parameters not provided,so cropping the whole image')
+ if outputWinFirstLine == None or outputWinLastLine == None or outputWinFirstPix == None or outputWinLastPix == None :
+-    print '%s: running failed: crop size unknown !' % (sys.argv[0])
++    print('%s: running failed: crop size unknown !' % (sys.argv[0]))
+     sys.exit(1)
+ 
+ if outputWinLastLine-outputWinFirstLine+1 <0  or outputWinLastPix-outputWinFirstPix+1 <=0 :
+-    print '%s running failed: crop dimensions are not invalid !' % (sys.argv[0])
++    print('%s running failed: crop dimensions are not invalid !' % (sys.argv[0]))
+     sys.exit(1)
+ 
+ # compute crop dimensions
+@@ -142,7 +142,7 @@ headerFileStream.write('END\n')
+ 
+ # check whether the resfile exist!!!
+ if resFile is not None:
+-    print resFile
++    print(resFile)
+     # load header
+     headerFileStream = open(os.path.splitext(outputFileName)[0]+'.hdr','r')
+     for line in headerFileStream:
 --- a/bin/csk_dump_header2doris.py
 +++ b/bin/csk_dump_header2doris.py
 @@ -14,18 +14,18 @@ import numpy, h5py, sys, math, time, str


=====================================
debian/tests/control
=====================================
@@ -1,2 +1,2 @@
-Test-Command: doris -h 2>&1 > /dev/null
+Test-Command: doris -h > /dev/null 2>&1
 Depends: @ 



View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/c160b9abaca565038a82a30691cb2bc095e70132...ead88fb30e7a0ec4e5e1cc2be39cd2258dd50f43

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/c160b9abaca565038a82a30691cb2bc095e70132...ead88fb30e7a0ec4e5e1cc2be39cd2258dd50f43
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190726/be64db80/attachment-0001.html>