[Git][debian-gis-team/doris][master] 3 commits: Compatibility with gcc-9

[Antonio Valentino]

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


Commits:
e4d3bb12 by Antonio Valentino at 2019-08-24T07:15:43Z
Compatibility with gcc-9

- - - - -
0f5509b1 by Antonio Valentino at 2019-08-24T07:15:59Z
Remove obsolete fields Name from debian/upstream/metadata.
- - - - -
1605c968 by Antonio Valentino at 2019-08-24T07:32:17Z
Set distribution to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0012-fix-default-params-in-friend-functions.patch
- debian/patches/series
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,13 @@
-doris (5.0.3~beta+dfsg-12) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-12) unstable; urgency=medium
 
   * debian/test/control:
     - mark test as superficial using Restrictions
+  * debian/patches:
+    - new 0012-fix-default-params-in-friend-functions.patch
+      (compatibiloty with gcc-9)
+  * Remove obsolete fields Name from debian/upstream/metadata.
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 21 Aug 2019 16:25:39 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 24 Aug 2019 07:31:50 +0000
 
 doris (5.0.3~beta+dfsg-11) unstable; urgency=medium
 


=====================================
debian/patches/0012-fix-default-params-in-friend-functions.patch
=====================================
@@ -0,0 +1,101 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 24 Aug 2019 09:14:03 +0200
+Subject: fix default params in friend functions
+
+---
+ doris_core/orbitbk.hh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 67 insertions(+), 1 deletion(-)
+
+diff --git a/doris_core/orbitbk.hh b/doris_core/orbitbk.hh
+index 6a296a3..07e93c0 100755
+--- a/doris_core/orbitbk.hh
++++ b/doris_core/orbitbk.hh
+@@ -139,6 +139,7 @@ class orbit
+     cn getxyzdot    (real8 time);
+     cn getxyzddot   (real8 time);
+ 
++    /*
+     // ====== Conversion between coordinate systems ======
+     // ______ radar coordinate line/pixel to xyz on ellipsoid ______
+     friend int32 lp2xyz(
+@@ -205,7 +206,7 @@ class orbit
+         real8           &returnheight,
+         int32            MAXITER=10,
+         real8            CRITERPOS=1e-6);   // meter
+-
++    */
+     // ====== Information/debugging ======
+     // ______ dump computed coeffs, interpolated orbit, etc. ______
+     void dumporbit(
+@@ -222,6 +223,71 @@ class orbit
+ 
+   }; // END class orbit
+ 
++int32 lp2xyz(
++    real8            line,
++    real8            pixel,
++    const input_ell &ell,
++    const slcimage  &image,
++    orbit           &orb,
++    cn              &returnpos,
++    int32            MAXITER=10,            // [.] defaults
++    real8            CRITERPOS=1e-6);       // [m]
++
++// ______ xyz cartesian on ellipsoid to orbital coord. ______
++int32 xyz2orb(
++    cn              &returnpossat,
++    const slcimage  &image,
++    orbit           &orb,
++    const cn        &pointonellips,
++    int32            MAXITER=10,            // [.] defaults
++    real8            CRITERTIM=1e-10);      // [s]
++
++// ______ xyz cartesian on ellipsoid to azimuth/range time ______
++int32 xyz2t(
++    real8           &returntazi,            // azimuth
++    real8           &returntran,            // and range time
++    const slcimage  &image,
++    orbit           &orb,
++    const cn        &pos,
++    int32            MAXITER=10,            // [.] defaults
++    real8            CRITERTIM=1e-10);      // [s]
++
++// ______ convert xyz-ellipsoid to line/pixel ______
++int32 xyz2lp(
++    real8           &returnline,
++    real8           &returnpixel,
++    const slcimage  &image,
++    orbit           &orb,
++    const cn        &pos,
++    int32            MAXITER=10,             // defaults
++    real8            CRITERTIM=1e-10);       // seconds
++
++// ______ Convert ellipsoid to radar coordinates ______
++int32 ell2lp(
++    real8           &returnline,
++    real8           &returnpixel,
++    const input_ell &ell,
++    const slcimage  &image,
++    orbit           &orb,
++    real8            phi,
++    real8            lambda,
++    real8            height,
++    int32            MAXITER=10,
++    real8            CRITERTIM=1e-10);  // seconds
++
++// ______ Convert radar coordinates to ellipsoidal coordinates ______
++int32 lp2ell(
++    real8            line,
++    real8            pixel,
++    const input_ell &ell,
++    const slcimage  &image,
++    orbit           &orb,
++    real8           &returnphi,
++    real8           &returnlambda,
++    real8           &returnheight,
++    int32            MAXITER=10,
++    real8            CRITERPOS=1e-6);   // meter
++
+ #endif // ORBITBK_H guard
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
 0009-Python-doris-package.patch
 0010-Use-sys.executable.patch
 0011-Fix-doris_config.xml-path.patch
+0012-fix-default-params-in-friend-functions.patch


=====================================
debian/upstream/metadata
=====================================
@@ -1,6 +1,4 @@
----
 Bug-Database: https://github.com/TUDelftGeodesy/Doris/issues
 Bug-Submit: https://github.com/TUDelftGeodesy/Doris/issues/new
-Name: Doris
 Repository: https://github.com/TUDelftGeodesy/Doris.git
 Repository-Browse: https://github.com/TUDelftGeodesy/Doris



View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/082110d2e32ac67d3944ce9945b3a321d06ad485...1605c968b5c1e1a4fbe7df19c6241819077caf8c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/compare/082110d2e32ac67d3944ce9945b3a321d06ad485...1605c968b5c1e1a4fbe7df19c6241819077caf8c
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/20190824/cffb2fcd/attachment-0001.html>