[doris] 07/14: Refresh all patches

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Mon Aug 7 17:57:35 UTC 2017


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

a_valentino-guest pushed a commit to branch master
in repository doris.

commit 94469c92fe2d4dc79a0b3000d16f42691109d62e
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Aug 6 21:36:05 2017 +0200

    Refresh all patches
---
 debian/changelog                                   |   3 +
 debian/patches/0001-spelling.patch                 | 282 +++++++++++++++--
 debian/patches/0002-configure.patch                | 145 ++++++++-
 debian/patches/0003-tools-build.patch              | 338 +++++----------------
 .../0005-compatibility-with-gcc-4.8.x.patch        |  26 --
 debian/patches/series                              |   2 -
 6 files changed, 472 insertions(+), 324 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed16475..26cd0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ doris (5.0.3~beta+dfsg-1) UNRELEASED; urgency=medium
     - add new files (GPL-3+)
   * debian/control
     - standard version bumped to v4.0.0 (no change)
+  * debiam/patches
+    - drop 0005-compatibility-with-gcc-4.8.x.patch (applied upstream)
+    - refresh remaining patches
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Jan 2017 15:48:04 +0100
 
diff --git a/debian/patches/0001-spelling.patch b/debian/patches/0001-spelling.patch
index 50cc139..58bec40 100644
--- a/debian/patches/0001-spelling.patch
+++ b/debian/patches/0001-spelling.patch
@@ -4,16 +4,115 @@ Subject: spelling
 
 Fix spelling errors
 ---
- src/geocode.cc   | 2 +-
- src/processor.cc | 2 +-
- src/readinput.cc | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ doris_core/coregistration.cc | 14 +++++++-------
+ doris_core/exceptions.cc     |  4 ++--
+ doris_core/filtering.cc      |  2 +-
+ doris_core/geocode.cc        |  2 +-
+ doris_core/processor.cc      |  2 +-
+ doris_core/readdata.cc       |  4 ++--
+ doris_core/readinput.cc      | 32 ++++++++++++++++----------------
+ 7 files changed, 30 insertions(+), 30 deletions(-)
 
-diff --git a/src/geocode.cc b/src/geocode.cc
-index 648fe72..03666d7 100755
---- a/src/geocode.cc
-+++ b/src/geocode.cc
-@@ -360,7 +360,7 @@ void slant2hschwabisch(
+diff --git a/doris_core/coregistration.cc b/doris_core/coregistration.cc
+index c316cf6..fa59bc6 100644
+--- a/doris_core/coregistration.cc
++++ b/doris_core/coregistration.cc
+@@ -1363,7 +1363,7 @@ void mtiming_correl(
+   int32 offsetLines  = -999; // NaN
+   int32 offsetPixels = -999;
+   //getoffset(Result,offsetLines,offsetPixels);   // getoffsets based on Mean
+-  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurence
++  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurrence
+ 
+ 
+   // ______ Convert offsets to seconds and write  master time offset to res file ______
+@@ -1727,7 +1727,7 @@ void mtiming_correlfft(
+   int32 offsetLines  = -999; // NaN
+   int32 offsetPixels = -999;
+   //getoffset(Result,offsetLines,offsetPixels);   // getoffsets based on Mean
+-  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurence
++  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurrence
+ 
+ 
+   // ______ Convert offsets to seconds and write master time offset to res file ______
+@@ -2377,7 +2377,7 @@ cerr << endl;
+                  << "\n* MTIMING_CORRELATION: Offset Frequency Table"
+                  << "\n*******************************************************************"
+                  << "\nUsing following data to determine coarse image offset:"
+-                 << "\navg. coh    offset_L    offset_P  occurence  index"
++                 << "\navg. coh    offset_L    offset_P  occurrence  index"
+                  << "\n------------------------------------------------------";  // TODO not yet: scratchlogfile << INFO
+ 
+    // _____ Mode of offsets _____  [MA]
+@@ -2385,7 +2385,7 @@ cerr << endl;
+   PROGRESS << "Using as threshold:  " << thresh_coh << " and checking for mode value";
+   PROGRESS.print();
+   INFO.print("Using following data to determine coarse image offset:");
+-  INFO.print("avg. coh    offset_L    offset_P  occurence  index");
++  INFO.print("avg. coh    offset_L    offset_P  occurrence  index");
+   INFO.print("------------------------------------------------------");
+ 
+   mysort231(sortResult);                        // re-sort on 2nd, 3rd than 1st column
+@@ -2412,7 +2412,7 @@ cerr << endl;
+          }
+       offset_freq=0;   // reset
+       offset_mcoh=0;
+-      for (register uint j=0; j<nW; j++)           // scan data for occurences of an offset
++      for (register uint j=0; j<nW; j++)           // scan data for occurrences of an offset
+         {                                          // for all offsets
+          if ( L == int32(rint(sortResult(j,1))) && P == int32(rint(sortResult(j,2))) )
+            {
+@@ -2449,7 +2449,7 @@ cerr << endl;
+     scratchlogfile << "\n\n*******************************************************************";
+     scratchlogfile.close();  // close scratchlogmtiminghtr
+ 
+-    // _____ Even occurence check _____
++    // _____ Even occurrence check _____
+     if (mode_val == evenmode_val) // there are even values of mode.
+       {
+         WARNING << "There are " << nEven << " offset pairs which has equal mode values are equal.";
+@@ -2471,7 +2471,7 @@ cerr << endl;
+     }
+   if (mode_val == 1)
+     {
+-    WARNING.print("getmodeoffset: all the offset occurence == 1. There is no mode value. ");
++    WARNING.print("getmodeoffset: all the offset occurrence == 1. There is no mode value. ");
+     WARNING.print("(please check bottom of LOGFILE to see if offset is OK or change window size.)");
+     }
+   if (nW < 6)
+diff --git a/doris_core/exceptions.cc b/doris_core/exceptions.cc
+index 1855ca1..3c8905a 100755
+--- a/doris_core/exceptions.cc
++++ b/doris_core/exceptions.cc
+@@ -107,8 +107,8 @@ void handle_signal(int signum)
+       break;
+ #endif
+     case SIGINT:
+-      cout << "Caught SIGINT: User interupt signal." << endl;
+-      cerr << "Caught SIGINT: User interupt signal." << endl;
++      cout << "Caught SIGINT: User interrupt signal." << endl;
++      cerr << "Caught SIGINT: User interrupt signal." << endl;
+       exit(1);
+       break;
+     case SIGFPE:
+diff --git a/doris_core/filtering.cc b/doris_core/filtering.cc
+index 7cc2063..eb8fa83 100755
+--- a/doris_core/filtering.cc
++++ b/doris_core/filtering.cc
+@@ -2010,7 +2010,7 @@ void azimuthfilter(
+     {
+     INFO << "Variation of fDC for master and slave < " << max_fdc_change;
+     INFO.print();
+-    INFO.print("Reseting Doppler polynomial to constant of center crop:");
++    INFO.print("Resetting Doppler polynomial to constant of center crop:");
+     master.f_DC_a0 = master_fdc_p05;
+     master.f_DC_a1 = 0.0;
+     master.f_DC_a2 = 0.0;
+diff --git a/doris_core/geocode.cc b/doris_core/geocode.cc
+index a32ef6f..8dbf1f8 100755
+--- a/doris_core/geocode.cc
++++ b/doris_core/geocode.cc
+@@ -362,7 +362,7 @@ void slant2hschwabisch(
           << 100*(buffer-1)/(FULLBUFFERS+EXTRABUFFER) << "%";
      PROGRESS.print();
  
@@ -22,11 +121,11 @@ index 648fe72..03666d7 100755
      const real8 firstline = veryfirstline + (buffer-1) * bufferlines * multiL;
  
      // ______ Set indices for loading / check last buffer ______
-diff --git a/src/processor.cc b/src/processor.cc
-index fcd107e..3917d13 100755
---- a/src/processor.cc
-+++ b/src/processor.cc
-@@ -3830,7 +3830,7 @@ void quote()
+diff --git a/doris_core/processor.cc b/doris_core/processor.cc
+index 9ce084a..6badd70 100755
+--- a/doris_core/processor.cc
++++ b/doris_core/processor.cc
+@@ -3926,7 +3926,7 @@ void quote()
      "Beauty can be perceived but not explained.", // 130
      "Programming is like sex: one mistake and you have to\n\tsupport it for the rest of your life. [Michael Sinz]",
      "I wish you were here and I was there [me].",
@@ -35,11 +134,120 @@ index fcd107e..3917d13 100755
      "A man is incomplete until he is married. After that, he is finished [Zsa Zsa Gabor].",
      "Unlikely children's book title:\n\t\"The Kids' Guide to Hitchhiking\".", // 138
      "Unlikely children's book title:\n\t\"Whining, Kicking and Crying to Get Your Way\".",
-diff --git a/src/readinput.cc b/src/readinput.cc
-index 477cf8b..2525d0a 100755
---- a/src/readinput.cc
-+++ b/src/readinput.cc
-@@ -1352,7 +1352,7 @@ void readinput(
+diff --git a/doris_core/readdata.cc b/doris_core/readdata.cc
+index 00627d5..487d9da 100755
+--- a/doris_core/readdata.cc
++++ b/doris_core/readdata.cc
+@@ -1708,7 +1708,7 @@ else//RSAT method specified
+   // to what (time) does the annotated GMHA refer?
+   DEBUG << "GMHA [rad]: " << GMHA;
+   DEBUG.print();
+-  DEBUG << "Convertion from inertial to earth fixed [1/-1]: " << csi2cse;
++  DEBUG << "Conversion from inertial to earth fixed [1/-1]: " << csi2cse;
+   DEBUG.print();
+   DEBUG << "earthrot [rad/s]: " << earthrot;
+   DEBUG.print();
+@@ -2355,7 +2355,7 @@ if (readfiles_arg.sensor_id==SLC_RSAT && readfiles_arg.sar_processor==SARPR_ATL)
+   scratchresfile
+     << "Leader file:                                 \t"
+     <<  readfiles_arg.leaderfile
+-    << "\nSensor platform mission identifer:         \t"
++    << "\nSensor platform mission identifier:        \t"
+     <<  c32sensorid
+     << "\nScene_centre_latitude:                     \t"
+     <<  c16centerlat
+diff --git a/doris_core/readinput.cc b/doris_core/readinput.cc
+index 2c45931..57d7c94 100755
+--- a/doris_core/readinput.cc
++++ b/doris_core/readinput.cc
+@@ -197,7 +197,7 @@ void readinput(
+   //char                  filename[4*ONE27];            // string for filenames // [MA] changed EIGHTY --> 2*ONE27, due to comments line gets longer
+   char                  eachline[4*ONE27];           // assuming maximum char lenght of the line is 4*ONE27. It should be sufficient.
+ 
+-  // ______ Check (multiple) occurence of cards ______
++  // ______ Check (multiple) occurrence of cards ______
+   bool                  priorscreen     = false;     // no screen card present
+   bool                  priormemory     = false;     // check if present for info
+   bool                  priorbatch      = false;     // check if present for info
+@@ -747,7 +747,7 @@ void readinput(
+         {
+         case true:
+           WARNING << "SCREEN: line " << linecnt << ": stdout: "
+-               << " ignored due to prior occurence.";
++               << " ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+ 
+@@ -846,7 +846,7 @@ void readinput(
+         {
+         case true:
+           WARNING << "MEMORY: line " << linecnt
+-               << ": ignored due to prior occurence.";
++               << ": ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+ 
+@@ -879,11 +879,11 @@ void readinput(
+         {
+         case true:
+           WARNING << "BATCH: line: " << linecnt << ": "
+-               << "ignored due to prior occurence.";
++               << "ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+         default:
+-          priorbatch = true;                            // flag for occurence
++          priorbatch = true;                            // flag for occurrence
+          // keyword =  word[1] ;        // pass keyword                 // argument
+           keyword = word[1];                  // pass next word       (the argument)
+           writearg(keyword);
+@@ -913,11 +913,11 @@ void readinput(
+         {
+         case true:
+           WARNING << "OVERWRITE: line: " << linecnt << ": "
+-               << "ignored due to prior occurence.";
++               << "ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+         default:
+-          prioroverwrite = true;                                // flag for occurence
++          prioroverwrite = true;                                // flag for occurrence
+           keyword = word[1];                  // pass next word       (the argument)
+           writearg(keyword);
+           toupper(keyword);
+@@ -946,11 +946,11 @@ void readinput(
+         {
+         case true:
+           WARNING << "LISTINPUT: line: " << linecnt << ": "
+-               << "ignored due to prior occurence.";
++               << "ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+         default:
+-          priorlistinput = true;                                // flag for occurence
++          priorlistinput = true;                                // flag for occurrence
+           keyword = word[1];                  // pass next word       (the argument)
+           writearg(keyword);
+           toupper(keyword);
+@@ -979,7 +979,7 @@ void readinput(
+       //  the flag input array 'process[NUMPROCESSES]' after reading reset input
+       //  to avoid interference with PROCESS cards (ONLYPROCESS overrides)
+       //
+-      if (onlyprocess == -1)                             // check multiple occurences
++      if (onlyprocess == -1)                             // check multiple occurrences
+         {
+           keyword = word[1];                  // pass next word       (the argument)
+         writearg(keyword);
+@@ -1079,7 +1079,7 @@ void readinput(
+         }
+       else
+         {
+-        WARNING << "ONLYPROCESS: more than one occurence of card, ignored line: "
++        WARNING << "ONLYPROCESS: more than one occurrence of card, ignored line: "
+                    << linecnt << ".";
+         WARNING.print();
+ 
+@@ -1375,7 +1375,7 @@ void readinput(
        else if (!strcmp(keyword,"XV"))
          {
          generalinput.preview = 2;
@@ -48,3 +256,39 @@ index 477cf8b..2525d0a 100755
          }
        else if (!strcmp(keyword,"ON")    ||
                 !strncmp(keyword,"//",2) ||              // comment
+@@ -1705,7 +1705,7 @@ void readinput(
+     else if (!strcmp(keyword,"M_ORBDIR"))             // orbitfile filename
+       {                                               
+       if (specified(porbitsinput.m_orbdir))
+-               WARNING.print("Prior occurence of M_ORBDIR ignored.");
++               WARNING.print("Prior occurrence of M_ORBDIR ignored.");
+       strcpy(porbitsinput.m_orbdir,  word[1] );         // pass keyword
+       writearg(porbitsinput.m_orbdir);
+       }
+@@ -1762,7 +1762,7 @@ void readinput(
+     else if (!strcmp(keyword,"S_ORBDIR"))             // orbitfile filename
+       {                                               
+       if (specified(porbitsinput.s_orbdir))
+-              WARNING.print("Prior occurence of S_ORBDIR ignored.");
++              WARNING.print("Prior occurrence of S_ORBDIR ignored.");
+       strcpy(porbitsinput.s_orbdir,  word[1] );         // pass keyword
+       writearg(porbitsinput.s_orbdir);
+       }
+@@ -3446,7 +3446,7 @@ void readinput(
+         {
+         case true:
+           WARNING << "RS_OUT_FILE: line: " << linecnt << ": "
+-              << "ignored due to prior occurence.";
++              << "ignored due to prior occurrence.";
+           WARNING.print();
+           break;
+         default:
+@@ -5785,7 +5785,7 @@ void checkunwrap(
+ 
+     case uw_method2:
+       INFO.print("Method 2: SNAPHU is used for unwrapping.");
+-      INFO.print("Please make sure snaphu is installed.  check results carefuly.");
++      INFO.print("Please make sure snaphu is installed.  check results carefully.");
+       INFO << "UW_SNAPHU_LOG: \tOutput log file of snaphu: "
+            << unwrapinput.snaphu_log;
+       INFO.print();
diff --git a/debian/patches/0002-configure.patch b/debian/patches/0002-configure.patch
index fbb8fb2..0430fdc 100644
--- a/debian/patches/0002-configure.patch
+++ b/debian/patches/0002-configure.patch
@@ -2,16 +2,24 @@ From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: configure
 
-Fix configure script and use system libtirangle
 ---
- src/configure         | 10 +++++-----
- src/referencephase.cc |  3 ++-
- 2 files changed, 7 insertions(+), 6 deletions(-)
+ doris_core/configure         | 42 +++++++++++++++++++++---------------------
+ doris_core/referencephase.cc |  3 ++-
+ 2 files changed, 23 insertions(+), 22 deletions(-)
 
-diff --git a/src/configure b/src/configure
-index 0835c10..076fa34 100755
---- a/src/configure
-+++ b/src/configure
+diff --git a/doris_core/configure b/doris_core/configure
+index 0835c10..3bee0e0 100755
+--- a/doris_core/configure
++++ b/doris_core/configure
+@@ -50,7 +50,7 @@ set key = $<
+ 
+ 
+ # Declare variables.
+-set CC          = ""
++set CXX         = ""
+ set GppCOMPILER = n
+ set FFTW        = n
+ set VECLIB      = n
 @@ -61,7 +61,7 @@ set FFTWLIBDIR  = ""
  set FFTWINCLDIR = ""
  set VECLIBDIR   = ""
@@ -21,6 +29,97 @@ index 0835c10..076fa34 100755
  ### for fftw include dirs, assume they installed it with doris distributed.
  ### by doing what we said in install.
  set INCLDIRS    = "../fftw-3.2.1/include ../../fftw-3.2.1/include /include /usr/include /usr/local/include"
+@@ -76,12 +76,12 @@ echo "   Using temp dir: $TMPDIR"
+ 
+ 
+ # Get most likely compiler, first check g++
+-foreach TMPCC ( g++ g++-3.4 g++-4.0 g++-4.1 g++-4.2 g++-4.3 CC aCC icpc )
++foreach TMPCC ( g++ g++-3.4 g++-4.0 g++-4.1 g++-4.2 g++-4.3 CXX CC aCC icpc )
+   echo Checking compiler: \"$TMPCC\"...
+   $TMPCC -v > & /dev/null
+   if ( ! $status ) then
+     echo "   I found a working(?) compiler: $TMPCC"
+-    set CC = "$TMPCC"
++    set CXX = "$TMPCC"
+     break
+   endif
+ end
+@@ -91,7 +91,7 @@ end
+ # Set flag for g++, this define enables some functions like sqr(int)
+ # that are not standard C++, but were provided with, e.g., HP aCC compiler.
+ #
+-if ( "$CC" == "g++" ) set GppCOMPILER = "y"
++if ( "$CXX" == "g++" ) set GppCOMPILER = "y"
+ 
+ 
+ #
+@@ -119,7 +119,7 @@ int main()
+   }
+ __EOFDH
+ echo "Compiling test program: $TSTPRG"
+-$CC $TSTPRG.cc -o $TSTPRG > & /dev/null
++$CXX $TSTPRG.cc -o $TSTPRG > & /dev/null
+ if ( $status != 0 ) then
+   echo "   ---------------------------------------------------------------"
+   echo "   Sorry, could not compile test program, continuing."
+@@ -175,7 +175,7 @@ int main()
+   }
+ __EOFDH
+ echo "Compiling test program: $TSTPRG"
+-$CC $TSTPRG.cc -o $TSTPRG > & /dev/null
++$CXX $TSTPRG.cc -o $TSTPRG > & /dev/null
+ if ( $status != 0 ) then
+   echo "   function strptime not found in library, using internal definition."
+   echo "   by define -D__NO_STRPTIME (change by editing DEF8 in $MAKEFILE)"
+@@ -264,10 +264,10 @@ echo " "
+ #
+ # Interactive questions/check by user:
+ #
+-echo "===> What is your C++ compiler? [$CC] "
++echo "===> What is your C++ compiler? [$CXX] "
+ set key = $<
+-if ( "X$key" != "X" ) set CC = "$key"
+-if ( "$CC" == "g++" ) set GppCOMPILER = y
++if ( "X$key" != "X" ) set CXX = "$key"
++if ( "$CXX" == "g++" ) set GppCOMPILER = y
+ 
+ echo "===> Do you have the FFTW library (y/n)? [$FFTW] "
+ set key = $<
+@@ -390,7 +390,7 @@ end
+ ###################################################
+ echo " "
+ echo " Creating Makefile for:"
+-echo " compiler:       $CC"
++echo " compiler:       $CXX"
+ echo " fftw:           $FFTW"
+ if ( "$FFTW" == "y" ) echo " FFTW LIB DIR:     $FFTWLIBDIR"
+ if ( "$FFTW" == "y" ) echo " FFTW INCLUDE DIR: $FFTWINCLDIR"
+@@ -488,7 +488,7 @@ cat << __EOFHD > $MAKEFILE
+ # If this does not work, try a more controlled approach by:		#
+ #									#
+ # 0. inspect set up of this Makefile					#
+-# 1. set CC DEFS LIBS etc., first set these to debug values		#
++# 1. set CXX DEFS LIBS etc., first set these to debug values		#
+ #    (read NOTE there if problems)					#
+ # 2. compile software sources to *.o:     "make swobjs"			#
+ # 3. link object together to executable:  "make doris"			#
+@@ -511,14 +511,14 @@ cat << __EOFHD > $MAKEFILE
+ #########################################################################
+ ###################################################################
+ ###################################################################
+-# Please change if required: DEF[1-6], CC, CFLAGS, LIBDIR,      ###
++# Please change if required: DEF[1-6], CXX, CFLAGS, LIBDIR,     ###
+ ###################################################################
+ ### The shell used by this makefile ###
+ SHELL   = /bin/sh
+ 
+ ### Specify compiler/installation directory ###
+ INSTALLDIR = $INSTALLDIR
+-CC	   = $CC
++CXX	   = $CXX
+ SCRIPTSDIR = ../bin
+ 
+ ### Define statements controlling compilation ###
 @@ -594,7 +594,7 @@ cat << __EOFHD >> $MAKEFILE
  ### Library locations flag ###
  ### -lcl : used for veclib 
@@ -35,7 +134,7 @@ index 0835c10..076fa34 100755
  # space between -o and filename for SUN make (BK 7 july 2000)
  .cc.o:		
 -		\$(CC) \$(CFLAGS) -c -o \$(@) \$<
-+		\$(CC) \$(CPPFLAGS) \$(CFLAGS) -c -o \$(@) \$<
++		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) -c -o \$(@) \$<
  
  #####################################################
  ### Make object code from source ###
@@ -44,8 +143,9 @@ index 0835c10..076fa34 100755
  ### BK 07-Feb-2002
  \$(EXECUTABLE):	\$(SWOBJS) tmp_strptime.cc slcimage.cc productinfo.cc orbitbk.cc
 -		\$(CC) \$(CFLAGS) -c -o triangle.o -DTRILIBRARY -DANSI_DECLARATORS triangle.c
- 		\$(CC) \$(CFLAGS)\
+-		\$(CC) \$(CFLAGS)\
 -		tmp_strptime.cc \$(SWOBJS) triangle.o\
++		\$(CXX) \$(CPPFLAGS)\ \$(CFLAGS)\
 +		tmp_strptime.cc \$(SWOBJS) -ltriangle\
  		slcimage.cc productinfo.cc orbitbk.cc\
  		\$(LFLAGS) -o \$@
@@ -58,10 +158,27 @@ index 0835c10..076fa34 100755
  		@cp -f \$(EXECUTABLE) \$(INSTALLDIR)/.
  		( cd \$(SCRIPTSDIR); cp -f \$(SCRIPTS) \$(INSTALLDIR)/. )
  		\$(MAKE) cleaner
-diff --git a/src/referencephase.cc b/src/referencephase.cc
-index 862c9c4..223787d 100755
---- a/src/referencephase.cc
-+++ b/src/referencephase.cc
+@@ -721,14 +721,14 @@ testdoris:	\$(EXECUTABLE)
+ 
+ ### Orbit test program for debugging ###
+ test-orbit:	ioroutines.o matrixspecs.o utilities.o exceptions.cc slcimage.cc orbitbk.cc matrixbk.cc bk_messages.hh
+-		\$(CC) \$(CFLAGS) -D__TESTMAIN__ \
++		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) -D__TESTMAIN__ \
+ 		ioroutines.o matrixspecs.o utilities.o exceptions.cc slcimage.cc orbitbk.cc \
+ 		\$(LFLAGS) \
+ 		-o \$@
+ ### Matrix test program for debugging ###
+ ### fast_sin defined in utilities.cc, which requires ioroutines, which, etc.
+ test-matrix:  matrix_test.cc matrixspecs.o utilities.o utilities.o ioroutines.o matrixbk.cc
+-		\$(CC) \$(CFLAGS) matrix_test.cc matrixspecs.o \
++		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) matrix_test.cc matrixspecs.o \
+ 		utilities.o ioroutines.o exceptions.cc orbitbk.cc \
+ 		\$(LFLAGS) \
+ 		-o \$@
+diff --git a/doris_core/referencephase.cc b/doris_core/referencephase.cc
+index 9f1b728..84271fa 100755
+--- a/doris_core/referencephase.cc
++++ b/doris_core/referencephase.cc
 @@ -57,8 +57,9 @@
  #define VOID int
  #define REAL double
diff --git a/debian/patches/0003-tools-build.patch b/debian/patches/0003-tools-build.patch
index 3ad9f56..d6203f0 100644
--- a/debian/patches/0003-tools-build.patch
+++ b/debian/patches/0003-tools-build.patch
@@ -2,21 +2,20 @@ From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: tools-build
 
-Fix tools buiding and use system epr-api
 ---
- ENVISAT_TOOLS/Makefile              | 45 ++++++++++++++++++-------------------
- ENVISAT_TOOLS/envisat_dump_HH.c     | 14 ++++++------
- ENVISAT_TOOLS/envisat_dump_VV.c     | 14 ++++++------
- ENVISAT_TOOLS/envisat_dump_data.c   | 14 ++++++------
- ENVISAT_TOOLS/envisat_dump_header.c | 12 +++++-----
- SARtools/Makefile                   | 40 +++++++++++++++------------------
- 6 files changed, 67 insertions(+), 72 deletions(-)
+ envisat_tools/Makefile              | 38 ++++++++++++++++++-------------------
+ envisat_tools/envisat_dump_HH.c     |  2 +-
+ envisat_tools/envisat_dump_VV.c     |  2 +-
+ envisat_tools/envisat_dump_data.c   |  2 +-
+ envisat_tools/envisat_dump_header.c |  2 +-
+ sar_tools/Makefile                  | 38 +++++++++++++++++--------------------
+ 6 files changed, 40 insertions(+), 44 deletions(-)
 
-diff --git a/ENVISAT_TOOLS/Makefile b/ENVISAT_TOOLS/Makefile
-index b5a1760..6de1cff 100755
---- a/ENVISAT_TOOLS/Makefile
-+++ b/ENVISAT_TOOLS/Makefile
-@@ -17,10 +17,10 @@
+diff --git a/envisat_tools/Makefile b/envisat_tools/Makefile
+index 9126dff..3aca074 100755
+--- a/envisat_tools/Makefile
++++ b/envisat_tools/Makefile
+@@ -17,7 +17,7 @@
  ### Check if you agree with the options below (install_dir OK?)
  ### then simply type: "make install"
  SHELL = 	/bin/sh
@@ -24,65 +23,57 @@ index b5a1760..6de1cff 100755
 +#CC = 		gcc
  #CFLAGS =	-O3
  #CFLAGS =        -m32         # for 64-bit systems, it requires compatibility lib32, no need for epr_api v2.2
--LFLAGS =	-lm
-+LFLAGS =	-lm $(LDFLAGS)
- INSTALL_DIR =	/usr/local/bin
- 
- 
-@@ -47,35 +47,34 @@ LIB_SRC = 	epr_api-2.2/src/epr_api.c \
- 		epr_api-2.2/src/epr_typconv.c
- 
+ LFLAGS =	-lm
+@@ -49,32 +49,32 @@ LIB_SRC = 	epr_api-2.2/src/epr_api.c \
  ### targets ###
--default: 	envisat_dump_header envisat_dump_data envisat_dump_HH envisat_dump_VV  
-+default: 	envisat_dump_header envisat_dump_data envisat_dump_HH envisat_dump_VV
+ default: 	envisat_dump_header envisat_dump_data envisat_dump_HH envisat_dump_VV  
  ### compile envisat_dump_header program (dumps envisat header info to stdout) ###
 -envisat_dump_header:	BEST
 -		$(CC) $(CFLAGS) $(LFLAGS) \
 +envisat_dump_header:
-+		$(CC) $(CPPFLAGS) $(CFLAGS) $(LFLAGS) \
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
  		-o envisat_dump_header \
 -		epr_api-2.2/src/*.o \
 -		envisat_dump_header.c
 +		envisat_dump_header.c \
-+		-lepr_api
++		-lepr_api $(LFLAGS)
  
  ### compile envisat_dump_data program (dumps envisat slc short int data to file) ###
 -envisat_dump_data:	BEST
 -		$(CC) $(CFLAGS) $(LFLAGS) \
 +envisat_dump_data:
-+		$(CC) $(CPPFLAGS) $(CFLAGS) $(LFLAGS) \
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
  		-o envisat_dump_data \
 -		epr_api-2.2/src/*.o \
 -		envisat_dump_data.c
 +		envisat_dump_data.c \
-+		-lepr_api
++		-lepr_api $(LFLAGS)
  
  ### compile envisat_dump_data program (dumps envisat slc short int data to file) ###
 -envisat_dump_HH:  BEST
 -		$(CC) $(CFLAGS) $(LFLAGS) \
 +envisat_dump_HH:
-+		$(CC) $(CPPFLAGS) $(CFLAGS) $(LFLAGS) \
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
      -o envisat_dump_HH \
 -    epr_api-2.2/src/*.o \
 -    envisat_dump_HH.c
 +    envisat_dump_HH.c \
-+    -lepr_api
++		-lepr_api $(LFLAGS)
  
  ### compile envisat_dump_data program (dumps envisat slc short int data to file) ###
 -envisat_dump_VV:  BEST
 -		$(CC) $(CFLAGS) $(LFLAGS) \
 +envisat_dump_VV:
-+		$(CC) $(CPPFLAGS) $(CFLAGS) $(LFLAGS) \
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
      -o envisat_dump_VV \
 -    epr_api-2.2/src/*.o \
 -    envisat_dump_VV.c
--
 +    envisat_dump_VV.c \
-+    -lepr_api
++		-lepr_api $(LFLAGS)
  
  
- ### create object code BEST library functions ###
-@@ -88,6 +87,7 @@ PROGS =		envisat_dump_header envisat_dump_data envisat_dump_HH envisat_dump_VV
+ 
+@@ -88,6 +88,7 @@ PROGS =		envisat_dump_header envisat_dump_data envisat_dump_HH envisat_dump_VV
  SCRIPTS =	envisat_dump_header2doris.csh
  install:	$(PROGS) $(SCRIPTS)
  		@echo "installing envisat tools..."
@@ -90,7 +81,7 @@ index b5a1760..6de1cff 100755
  		cp -f $(PROGS) $(SCRIPTS) $(INSTALL_DIR)/.
  		#if test -d /cygdrive/c/cygwin; then \
                  #  echo "* cygwin detected"; \
-@@ -96,7 +96,6 @@ install:	$(PROGS) $(SCRIPTS)
+@@ -96,7 +97,6 @@ install:	$(PROGS) $(SCRIPTS)
  		#  cp -f envisat_dump_header.exe $(INSTALL_DIR)/.; \
  		#  cp -f envisat_dump_data.exe $(INSTALL_DIR)/.; \
  		#fi;
@@ -98,29 +89,20 @@ index b5a1760..6de1cff 100755
  		@echo " "
  		@echo "------------------------------------"
  		@echo "FINISHED INSTALLING ENVISAT TOOLS..."
-@@ -109,9 +108,9 @@ uninstall:	cleaner
- 		@echo "now you can rm this directory yourself"
- 		@echo "for a full uninstall"
+@@ -111,7 +111,7 @@ uninstall:	cleaner
  		@echo " "
--clean:		
-+clean:
+ clean:		
  		@echo "cleaning envisat tools..."
 -		(cd epr_api-2.2/src/; make clean)
 +		#(cd epr_api-2.2/src/; make clean)
  		rm -f *.o
  cleaner:	clean
  		rm -f $(PROGS)
-diff --git a/ENVISAT_TOOLS/envisat_dump_HH.c b/ENVISAT_TOOLS/envisat_dump_HH.c
-index b496abe..cef5caa 100755
---- a/ENVISAT_TOOLS/envisat_dump_HH.c
-+++ b/ENVISAT_TOOLS/envisat_dump_HH.c
-@@ -1,4 +1,4 @@
--/* BK: simple program to dump binary data for ENVISAT 
-+/* BK: simple program to dump binary data for ENVISAT
-    for alternating pol, HH channel.
-    #%// BK 24-Nov-2003
-    $Id: envisat_dump_HH.c,v 1.2 2004/05/13 18:13:39 kampes Exp $
-@@ -12,13 +12,13 @@ THIS program is not really good, but a fast hack for Z.Perksi..
+diff --git a/envisat_tools/envisat_dump_HH.c b/envisat_tools/envisat_dump_HH.c
+index b496abe..10cb548 100755
+--- a/envisat_tools/envisat_dump_HH.c
++++ b/envisat_tools/envisat_dump_HH.c
+@@ -12,7 +12,7 @@ THIS program is not really good, but a fast hack for Z.Perksi..
  #include <string.h>
  #include <math.h>
  #include <time.h>
@@ -129,51 +111,11 @@ index b496abe..cef5caa 100755
  #if defined(WIN32) && defined(_DEBUG)
  #include <crtdbg.h>
  #endif /* if defined(WIN32) && defined(_DEBUG) */
- 
- 
--int main(int argc, char** argv) 
-+int main(int argc, char** argv)
-   {
-   const char*     product_file_path;
-   const char*     outfile;
-@@ -145,22 +145,22 @@ int main(int argc, char** argv)
- 
- 
-   /* --- Check if input as acceptable ---------------------------- */
--  if (l0 < 1)  
-+  if (l0 < 1)
-     {
-     printf("l0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (p0 < 1)  
-+  if (p0 < 1)
-     {
-     printf("p0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (lN > numlines)  
-+  if (lN > numlines)
-     {
-     printf("lN>numlines not allowed.\n");
-     exit(1);
-     }
--  if (pN > numpixels)  
-+  if (pN > numpixels)
-     {
-     printf("pN>numpixels not allowed.\n");
-     exit(1);
-diff --git a/ENVISAT_TOOLS/envisat_dump_VV.c b/ENVISAT_TOOLS/envisat_dump_VV.c
-index eb5cca5..8b0f66a 100755
---- a/ENVISAT_TOOLS/envisat_dump_VV.c
-+++ b/ENVISAT_TOOLS/envisat_dump_VV.c
-@@ -1,4 +1,4 @@
--/* BK: simple program to dump binary data for ENVISAT 
-+/* BK: simple program to dump binary data for ENVISAT
-    for alternating pol, VV channel.
-    #%// BK 24-Nov-2003
-    $Id: envisat_dump_VV.c,v 1.2 2004/05/13 18:13:39 kampes Exp $
-@@ -12,13 +12,13 @@ THIS program is not really good, but a fast hack for Z.Perksi..
+diff --git a/envisat_tools/envisat_dump_VV.c b/envisat_tools/envisat_dump_VV.c
+index bb47a05..e983077 100755
+--- a/envisat_tools/envisat_dump_VV.c
++++ b/envisat_tools/envisat_dump_VV.c
+@@ -12,7 +12,7 @@ THIS program is not really good, but a fast hack for Z.Perksi..
  #include <string.h>
  #include <math.h>
  #include <time.h>
@@ -182,51 +124,11 @@ index eb5cca5..8b0f66a 100755
  #if defined(WIN32) && defined(_DEBUG)
  #include <crtdbg.h>
  #endif /* if defined(WIN32) && defined(_DEBUG) */
- 
- 
--int main(int argc, char** argv) 
-+int main(int argc, char** argv)
-   {
-   const char*     product_file_path;
-   const char*     outfile;
-@@ -139,22 +139,22 @@ int main(int argc, char** argv)
- 
- 
-   /* --- Check if input as acceptable ---------------------------- */
--  if (l0 < 1)  
-+  if (l0 < 1)
-     {
-     printf("l0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (p0 < 1)  
-+  if (p0 < 1)
-     {
-     printf("p0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (lN > numlines)  
-+  if (lN > numlines)
-     {
-     printf("lN>numlines not allowed.\n");
-     exit(1);
-     }
--  if (pN > numpixels)  
-+  if (pN > numpixels)
-     {
-     printf("pN>numpixels not allowed.\n");
-     exit(1);
-diff --git a/ENVISAT_TOOLS/envisat_dump_data.c b/ENVISAT_TOOLS/envisat_dump_data.c
-index 8535e77..385323f 100755
---- a/ENVISAT_TOOLS/envisat_dump_data.c
-+++ b/ENVISAT_TOOLS/envisat_dump_data.c
-@@ -1,4 +1,4 @@
--/* BK: simple program to dump binary data for ENVISAT 
-+/* BK: simple program to dump binary data for ENVISAT
-    08-July-2004
-    $Id: envisat_dump_data.c,v 1.5 2004/08/09 09:43:28 kampes Exp $
- */
-@@ -9,13 +9,13 @@
+diff --git a/envisat_tools/envisat_dump_data.c b/envisat_tools/envisat_dump_data.c
+index 8535e77..1572086 100755
+--- a/envisat_tools/envisat_dump_data.c
++++ b/envisat_tools/envisat_dump_data.c
+@@ -9,7 +9,7 @@
  #include <string.h>
  #include <math.h>
  #include <time.h>
@@ -235,53 +137,11 @@ index 8535e77..385323f 100755
  #if defined(WIN32) && defined(_DEBUG)
  #include <crtdbg.h>
  #endif /* if defined(WIN32) && defined(_DEBUG) */
- //#include <typeinfo>
- 
--int main(int argc, char** argv) 
-+int main(int argc, char** argv)
-   {
-   const char*     product_file_path;
-   const char*     outfile;
-@@ -126,22 +126,22 @@ int main(int argc, char** argv)
- 
- 
-   /* --- Check if input as acceptable ---------------------------- */
--  if (l0 < 1)  
-+  if (l0 < 1)
-     {
-     printf("l0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (p0 < 1)  
-+  if (p0 < 1)
-     {
-     printf("p0<1 not allowed.  first line is 1 not 0.\n");
-     exit(1);
-     }
--  if (lN > numlines)  
-+  if (lN > numlines)
-     {
-     printf("lN>numlines not allowed.\n");
-     exit(1);
-     }
--  if (pN > numpixels)  
-+  if (pN > numpixels)
-     {
-     printf("pN>numpixels not allowed.\n");
-     exit(1);
-diff --git a/ENVISAT_TOOLS/envisat_dump_header.c b/ENVISAT_TOOLS/envisat_dump_header.c
-index 7e9bce5..ea7b7b3 100755
---- a/ENVISAT_TOOLS/envisat_dump_header.c
-+++ b/ENVISAT_TOOLS/envisat_dump_header.c
-@@ -1,6 +1,6 @@
- /* BK: simple program to get header info for ENVISAT
- *   13-Jun-2003
--*   simply dumps all header info.  a unix script will be used to 
-+*   simply dumps all header info.  a unix script will be used to
- *   convert this to doris input
-     $Id: envisat_dump_header.c,v 1.4 2004/05/13 18:13:39 kampes Exp $
- */
-@@ -11,13 +11,13 @@
+diff --git a/envisat_tools/envisat_dump_header.c b/envisat_tools/envisat_dump_header.c
+index 7e9bce5..15c1376 100755
+--- a/envisat_tools/envisat_dump_header.c
++++ b/envisat_tools/envisat_dump_header.c
+@@ -11,7 +11,7 @@
  #include <string.h>
  #include <math.h>
  #include <time.h>
@@ -290,103 +150,64 @@ index 7e9bce5..ea7b7b3 100755
  #if defined(WIN32) && defined(_DEBUG)
  #include <crtdbg.h>
  #endif /* if defined(WIN32) && defined(_DEBUG) */
- 
- 
--int main(int argc, char** argv) 
-+int main(int argc, char** argv)
-   {
-   EPR_SProductId* product_id;
-   EPR_SDatasetId* MDS1_SQ_ADS;
-@@ -73,7 +73,7 @@ int main(int argc, char** argv)
-   printf("-------------------------------------------------\n");
-   product_id = epr_open_product(product_file_path);
-   err_code   = epr_get_last_err_code();
--  if (err_code != e_err_none) 
-+  if (err_code != e_err_none)
-     {
-     printf("envisat_dump_header: fatal error in epr_open_product\n");
-     printf("exiting.\n");
-@@ -89,7 +89,7 @@ int main(int argc, char** argv)
-   printf("-------------------------------------------------\n");
-   mph      = epr_get_mph(product_id);
-   err_code = epr_get_last_err_code();
--  if (err_code == e_err_none) 
-+  if (err_code == e_err_none)
-     {
-     epr_print_record(mph,  stdout);
-     }
-@@ -107,7 +107,7 @@ int main(int argc, char** argv)
-   printf("-------------------------------------------------\n");
-   sph      = epr_get_sph(product_id);
-   err_code = epr_get_last_err_code();
--  if (err_code == e_err_none) 
-+  if (err_code == e_err_none)
-     {
-     epr_print_record(sph,  stdout);
-     }
-diff --git a/SARtools/Makefile b/SARtools/Makefile
-index d4be559..6694c4c 100644
---- a/SARtools/Makefile
-+++ b/SARtools/Makefile
-@@ -26,7 +26,7 @@ INSTALL_DIR =	/usr/local/bin
+diff --git a/sar_tools/Makefile b/sar_tools/Makefile
+index fb3e1de..1123551 100644
+--- a/sar_tools/Makefile
++++ b/sar_tools/Makefile
+@@ -26,8 +26,8 @@ SHELL	=	/bin/sh
+ INSTALL_DIR =	/home/dlevelt/src/Doris_s1_git/bin
  
  ### GCC compiler
- CC 	=	g++
+-CC 	=	g++
 -CFLAGS  =       -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE  -D_LARGEFILE64_SOURCE #-m32 to force 32bit on 64bit platform
++#CC 	=	g++
 +CFLAGS  +=       -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE  -D_LARGEFILE64_SOURCE #-m32 to force 32bit on 64bit platform
  
  ### Intel compiler
  #CC	=	icpc
-@@ -52,7 +52,7 @@ PROGS	=	wrap \
- 		dateconv
- 
- # usedin install:
--SCRIPTS =	
-+SCRIPTS =
- #SCRIPTS =	cpx2ps \
- #		philamh2ps
- 
-@@ -65,27 +65,27 @@ dummy:
+@@ -67,29 +67,29 @@ dummy:
  
  # the utilities.
  bkconvert:	bkconvert.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  wrap:		wrap.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  cpxmult:	cpxmult.o
 -		$(CC) $(CFLAGS) $@.o -o $@
--cpxdiv: 	cpxdiv.o 
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ cpxdiv: 	cpxdiv.o 
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
-+cpxdiv: 	cpxdiv.o
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  cpxconj:	cpxconj.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  cpxfiddle:	cpxfiddle.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  flapjack:	flapjack.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ floatmask:	floatmask.o
+-		$(CC) $(CFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  floatmult:	floatmult.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  readrasterheader:	readrasterheader.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  rasterheader:	rasterheader.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  dateconv:	dateconv.o
 -		$(CC) $(CFLAGS) $@.o -o $@
-+		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++		$(CXX) $(CFLAGS) $(LDFLAGS) $@.o -o $@
  
  
  ### Install in CB_INSTALL by linking/copying executables ###
-@@ -99,15 +99,11 @@ install:	$(PROGS)
+@@ -103,15 +103,11 @@ install:	$(PROGS)
  
  ### Use symbolic links at our system, copy to /usr/local/bin on other.
  definstall:	$(PROGS)
@@ -403,23 +224,14 @@ index d4be559..6694c4c 100644
  
  ### Use symbolic links at our system, copy to /usr/local/bin on other.
  cbinstall:
-@@ -134,7 +130,7 @@ lninstall:
- 		$(MAKE) cleaner
- 
- ### Helpers ###
--clean:	
-+clean:
- 		@rm -f *.o *dummy* *.bak
- 		@echo "* Removed junk."
- ### some reason under cygwin progs are not removed without ".exe"???
-@@ -153,8 +149,8 @@ uninstall:	cleaner
+@@ -157,8 +153,8 @@ uninstall:	cleaner
  		  echo "* Removed executables in install dir: $(INSTALL_DIR)."; fi;
  
  ### How to make object files ###
 -.cc.o:		
 -	$(CC) $(CFLAGS) -c -o $(@) $<
 +.cc.o:
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $(@) $<
++	$(CXX) $(CPPFLAGS) $(CFLAGS) -c -o $(@) $<
  
  ### EOF.
  
diff --git a/debian/patches/0005-compatibility-with-gcc-4.8.x.patch b/debian/patches/0005-compatibility-with-gcc-4.8.x.patch
deleted file mode 100644
index 4600321..0000000
--- a/debian/patches/0005-compatibility-with-gcc-4.8.x.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 26 Nov 2013 09:14:36 +0000
-Subject: compatibility with g++4.8.x
-
----
- src/ioroutines.cc | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/ioroutines.cc b/src/ioroutines.cc
-index b36eed9..e01138a 100755
---- a/src/ioroutines.cc
-+++ b/src/ioroutines.cc
-@@ -2526,8 +2526,11 @@ void toupper(char *s)
-   #ifdef WIN32
-     s = _strupr(s);// Jia
-   #else
--  while (*s != '\0')
--    *s++ = toupper(*s);                 // cctype
-+  while (*s != '\0') {
-+    //*s++ = toupper(*s);  // [AV] do not works correctly with g++ 4.8 
-+    *s = std::toupper(*s);                 // cctype
-+    ++s;
-+  }
-   #endif
-   }
- 
diff --git a/debian/patches/series b/debian/patches/series
index f21d1a4..b47f13a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@
 0002-configure.patch
 0003-tools-build.patch
 0004-csh-path.patch
-0005-compatibility-with-gcc-4.8.x.patch
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/doris.git



More information about the Pkg-grass-devel mailing list