[Git][debian-gis-team/doris][master] 2 commits: Improve 0008-python3.patch

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / doris


Commits:
c1e1b1a7 by Antonio Valentino at 2021-09-04T10:54:54+00:00
Improve 0008-python3.patch

- - - - -
520ef170 by Antonio Valentino at 2021-09-04T10:58:46+00:00
Set distribution to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/0008-python3.patch
- debian/patches/0011-Fix-doris_config.xml-path.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-doris (5.0.3~beta+dfsg-15) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-15) unstable; urgency=medium
 
   [ Bas Couwenberg ]
   * Bump Standards-Version to 4.5.1, no changes.
@@ -8,9 +8,9 @@ doris (5.0.3~beta+dfsg-15) UNRELEASED; urgency=medium
   * Depend on non-dummpy h5py packages.
   * debian/patches:
     - update 0002-configure.patch for lapack library search path
-    - improve 0003-tools-build.patch
+    - improve 0003-tools-build.patch and 0008-python3.patch
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Tue, 08 Dec 2020 09:12:57 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 04 Sep 2021 10:58:28 +0000
 
 doris (5.0.3~beta+dfsg-14) unstable; urgency=medium
 


=====================================
debian/patches/0008-python3.patch
=====================================
@@ -38,14 +38,14 @@ Forwarded: https://github.com/TUDelftGeodesy/Doris/issues/8
  doris_stack/main_code/single_master_stack.py       | 98 +++++++++++-----------
  doris_stack/main_code/stack.py                     | 14 ++--
  doris_stack/main_code/swath.py                     |  4 +-
- install/init_cfg.py                                | 14 ++--
+ install/init_cfg.py                                | 16 ++--
  prepare_stack/create_datastack_bash.py             |  6 +-
  prepare_stack/create_dem.py                        | 18 ++--
  prepare_stack/create_doris_input_xml.py            | 28 +++----
  prepare_stack/download_sentinel_data_orbits.py     | 48 +++++------
  prepare_stack/prepare_datastack.py                 |  8 +-
  prepare_stack/prepare_datastack_main.py            |  2 +-
- 41 files changed, 380 insertions(+), 379 deletions(-)
+ 41 files changed, 381 insertions(+), 380 deletions(-)
 
 diff --git a/bin/csk_dump_data.py b/bin/csk_dump_data.py
 index ba54ada..f201650 100755
@@ -1948,9 +1948,15 @@ index 6db92e3..5447a91 100644
          if type(xml) is str:
              xml = [xml]
 diff --git a/install/init_cfg.py b/install/init_cfg.py
-index 29bf004..eb68d4f 100644
+index 29bf004..df4bfa5 100644
 --- a/install/init_cfg.py
 +++ b/install/init_cfg.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import xml.etree.ElementTree as ET
+ import os
 @@ -13,7 +13,7 @@ def init_cfg():
  
      input = False


=====================================
debian/patches/0011-Fix-doris_config.xml-path.patch
=====================================
@@ -46,7 +46,7 @@ index 80e61fc..0d13a7a 100644
          settings = tree.getroot()
  
 diff --git a/install/init_cfg.py b/install/init_cfg.py
-index eb68d4f..46df5bf 100644
+index df4bfa5..151b752 100644
 --- a/install/init_cfg.py
 +++ b/install/init_cfg.py
 @@ -5,7 +5,7 @@ import os



View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/6d03341e68a20af8561443ff516b2a34df2cd200...520ef1703c2c146371fc13c23882e04b566b472c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/6d03341e68a20af8561443ff516b2a34df2cd200...520ef1703c2c146371fc13c23882e04b566b472c
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/20210904/a51ad195/attachment-0001.htm>