[SCM] doris branch, master, updated. debian/4.06_beta2+dfsg-2-2-g121a3d7
Antonio Valentino
antonio.valentino at tiscali.it
Tue Nov 26 10:02:07 UTC 2013
The following commit has been merged in the master branch:
commit 889c044953cd48a7a2e07f9961b95aaa2f67f4c2
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Tue Nov 26 09:33:52 2013 +0000
All patches have been refreshed using gbp-pq
diff --git a/debian/changelog b/debian/changelog
index 3273682..5fe4b0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+doris (4.06~beta2+dfsg-3) UNRELEASED; urgency=low
+
+ * All patches have been refreshed using gbp-pq
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Tue, 26 Nov 2013 09:18:12 +0000
+
doris (4.06~beta2+dfsg-2) unstable; urgency=low
* Use canonical URLs in VSC fields
diff --git a/debian/patches/spelling.patch b/debian/patches/0001-spelling.patch
similarity index 72%
rename from debian/patches/spelling.patch
rename to debian/patches/0001-spelling.patch
index 96c3f1b..50cc139 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/0001-spelling.patch
@@ -1,18 +1,19 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Tue, 26 Nov 2013 09:08:12 +0000
+Subject: spelling
+
Fix spelling errors
---- a/src/processor.cc
-+++ b/src/processor.cc
-@@ -3830,7 +3830,7 @@
- "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].",
-- "In mathematics you dont understand things, you just get used to them [Neumann].",
-+ "In mathematics you don't understand things, you just get used to them [Neumann].",
- "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\".",
+---
+ src/geocode.cc | 2 +-
+ src/processor.cc | 2 +-
+ src/readinput.cc | 2 +-
+ 3 files changed, 3 insertions(+), 3 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 @@
+@@ -360,7 +360,7 @@ void slant2hschwabisch(
<< 100*(buffer-1)/(FULLBUFFERS+EXTRABUFFER) << "%";
PROGRESS.print();
@@ -21,9 +22,24 @@ Fix spelling errors
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()
+ "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].",
+- "In mathematics you dont understand things, you just get used to them [Neumann].",
++ "In mathematics you don't understand things, you just get used to them [Neumann].",
+ "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 @@
+@@ -1352,7 +1352,7 @@ void readinput(
else if (!strcmp(keyword,"XV"))
{
generalinput.preview = 2;
diff --git a/debian/patches/configure.patch b/debian/patches/0002-configure.patch
similarity index 77%
rename from debian/patches/configure.patch
rename to debian/patches/0002-configure.patch
index 81a8043..fbb8fb2 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/0002-configure.patch
@@ -1,7 +1,18 @@
+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(-)
+
+diff --git a/src/configure b/src/configure
+index 0835c10..076fa34 100755
--- a/src/configure
+++ b/src/configure
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ set FFTWLIBDIR = ""
set FFTWINCLDIR = ""
set VECLIBDIR = ""
set LAPACKDIR = ""
@@ -10,7 +21,7 @@ Fix configure script and use system libtirangle
### 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"
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@ cat << __EOFHD >> $MAKEFILE
### Library locations flag ###
### -lcl : used for veclib
### -lm : used for fftw
@@ -19,7 +30,7 @@ Fix configure script and use system libtirangle
#####################################################
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ default: \$(EXECUTABLE)
### how to compile object code .o from C++ source files .cc (general rule) ###
# space between -o and filename for SUN make (BK 7 july 2000)
.cc.o:
@@ -28,7 +39,7 @@ Fix configure script and use system libtirangle
#####################################################
### Make object code from source ###
-@@ -670,9 +670,8 @@
+@@ -670,9 +670,8 @@ swobjs: \$(SWOBJS)
### here, since compilers treat the template class differently than normal classes.
### BK 07-Feb-2002
\$(EXECUTABLE): \$(SWOBJS) tmp_strptime.cc slcimage.cc productinfo.cc orbitbk.cc
@@ -39,7 +50,7 @@ Fix configure script and use system libtirangle
slcimage.cc productinfo.cc orbitbk.cc\
\$(LFLAGS) -o \$@
@echo " "
-@@ -685,6 +684,7 @@
+@@ -685,6 +684,7 @@ swobjs: \$(SWOBJS)
### Install executable in installdir ###
install: \$(EXECUTABLE)
@echo "* Installing \$(EXECUTABLE) in: \$(INSTALLDIR)"
@@ -47,6 +58,8 @@ Fix configure script and use system libtirangle
@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
@@ -57,8 +57,9 @@
diff --git a/debian/patches/tools-build.patch b/debian/patches/0003-tools-build.patch
similarity index 83%
rename from debian/patches/tools-build.patch
rename to debian/patches/0003-tools-build.patch
index ac91c5b..3ad9f56 100644
--- a/debian/patches/tools-build.patch
+++ b/debian/patches/0003-tools-build.patch
@@ -1,4 +1,19 @@
+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(-)
+
+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 @@
@@ -14,7 +29,7 @@ Fix tools buiding and use system epr-api
INSTALL_DIR = /usr/local/bin
-@@ -47,35 +47,34 @@
+@@ -47,35 +47,34 @@ LIB_SRC = epr_api-2.2/src/epr_api.c \
epr_api-2.2/src/epr_typconv.c
### targets ###
@@ -67,7 +82,7 @@ Fix tools buiding and use system epr-api
### create object code BEST library functions ###
-@@ -88,6 +87,7 @@
+@@ -88,6 +87,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..."
@@ -75,7 +90,7 @@ Fix tools buiding and use system epr-api
cp -f $(PROGS) $(SCRIPTS) $(INSTALL_DIR)/.
#if test -d /cygdrive/c/cygwin; then \
# echo "* cygwin detected"; \
-@@ -96,7 +96,6 @@
+@@ -96,7 +96,6 @@ install: $(PROGS) $(SCRIPTS)
# cp -f envisat_dump_header.exe $(INSTALL_DIR)/.; \
# cp -f envisat_dump_data.exe $(INSTALL_DIR)/.; \
#fi;
@@ -83,7 +98,7 @@ Fix tools buiding and use system epr-api
@echo " "
@echo "------------------------------------"
@echo "FINISHED INSTALLING ENVISAT TOOLS..."
-@@ -109,9 +108,9 @@
+@@ -109,9 +108,9 @@ uninstall: cleaner
@echo "now you can rm this directory yourself"
@echo "for a full uninstall"
@echo " "
@@ -95,103 +110,8 @@ Fix tools buiding and use system epr-api
rm -f *.o
cleaner: clean
rm -f $(PROGS)
---- a/SARtools/Makefile
-+++ b/SARtools/Makefile
-@@ -26,7 +26,7 @@
-
- ### GCC compiler
- CC = g++
--CFLAGS = -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE #-m32 to force 32bit on 64bit platform
-+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 @@
- dateconv
-
- # usedin install:
--SCRIPTS =
-+SCRIPTS =
- #SCRIPTS = cpx2ps \
- # philamh2ps
-
-@@ -65,27 +65,27 @@
-
- # the utilities.
- bkconvert: bkconvert.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- wrap: wrap.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- cpxmult: cpxmult.o
-- $(CC) $(CFLAGS) $@.o -o $@
--cpxdiv: cpxdiv.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
-+cpxdiv: cpxdiv.o
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- cpxconj: cpxconj.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- cpxfiddle: cpxfiddle.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- flapjack: flapjack.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- floatmult: floatmult.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- readrasterheader: readrasterheader.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- rasterheader: rasterheader.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
- dateconv: dateconv.o
-- $(CC) $(CFLAGS) $@.o -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
-
-
- ### Install in CB_INSTALL by linking/copying executables ###
-@@ -99,15 +99,11 @@
-
- ### Use symbolic links at our system, copy to /usr/local/bin on other.
- definstall: $(PROGS)
-- dir=$(INSTALL_DIR); \
-- if test ! -d $$dir; then \
-- echo "Sorry, dir $(INSTALL_DIR) does not exist, exiting..."; exit; fi; \
-- echo Installing in directory: $$dir; \
-+ mkdir -p $(INSTALL_DIR)
- list='$(PROGS) $(SCRIPTS)'; for p in $$list; do \
- echo "Installing (copy): $$p"; \
- cp -f $$p $(INSTALL_DIR)/$$p; \
- done
-- $(MAKE) cleaner
-
- ### Use symbolic links at our system, copy to /usr/local/bin on other.
- cbinstall:
-@@ -134,7 +130,7 @@
- $(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 @@
- 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 $(@) $<
-
- ### EOF.
-
+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 @@
@@ -200,7 +120,7 @@ Fix tools buiding and use system epr-api
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 @@
+@@ -12,13 +12,13 @@ THIS program is not really good, but a fast hack for Z.Perksi..
#include <string.h>
#include <math.h>
#include <time.h>
@@ -216,7 +136,7 @@ Fix tools buiding and use system epr-api
{
const char* product_file_path;
const char* outfile;
-@@ -145,22 +145,22 @@
+@@ -145,22 +145,22 @@ int main(int argc, char** argv)
/* --- Check if input as acceptable ---------------------------- */
@@ -243,6 +163,8 @@ Fix tools buiding and use system epr-api
{
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 @@
@@ -251,7 +173,7 @@ Fix tools buiding and use system epr-api
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 @@
+@@ -12,13 +12,13 @@ THIS program is not really good, but a fast hack for Z.Perksi..
#include <string.h>
#include <math.h>
#include <time.h>
@@ -267,7 +189,7 @@ Fix tools buiding and use system epr-api
{
const char* product_file_path;
const char* outfile;
-@@ -139,22 +139,22 @@
+@@ -139,22 +139,22 @@ int main(int argc, char** argv)
/* --- Check if input as acceptable ---------------------------- */
@@ -294,6 +216,8 @@ Fix tools buiding and use system epr-api
{
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 @@
@@ -318,7 +242,7 @@ Fix tools buiding and use system epr-api
{
const char* product_file_path;
const char* outfile;
-@@ -126,22 +126,22 @@
+@@ -126,22 +126,22 @@ int main(int argc, char** argv)
/* --- Check if input as acceptable ---------------------------- */
@@ -345,6 +269,8 @@ Fix tools buiding and use system epr-api
{
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 @@
@@ -371,7 +297,7 @@ Fix tools buiding and use system epr-api
{
EPR_SProductId* product_id;
EPR_SDatasetId* MDS1_SQ_ADS;
-@@ -73,7 +73,7 @@
+@@ -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();
@@ -380,7 +306,7 @@ Fix tools buiding and use system epr-api
{
printf("envisat_dump_header: fatal error in epr_open_product\n");
printf("exiting.\n");
-@@ -89,7 +89,7 @@
+@@ -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();
@@ -389,7 +315,7 @@ Fix tools buiding and use system epr-api
{
epr_print_record(mph, stdout);
}
-@@ -107,7 +107,7 @@
+@@ -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();
@@ -398,3 +324,102 @@ Fix tools buiding and use system epr-api
{
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
+
+ ### GCC compiler
+ CC = g++
+-CFLAGS = -O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE #-m32 to force 32bit on 64bit platform
++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:
+
+ # the utilities.
+ bkconvert: bkconvert.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ wrap: wrap.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ cpxmult: cpxmult.o
+- $(CC) $(CFLAGS) $@.o -o $@
+-cpxdiv: cpxdiv.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
++cpxdiv: cpxdiv.o
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ cpxconj: cpxconj.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ cpxfiddle: cpxfiddle.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ flapjack: flapjack.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ floatmult: floatmult.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ readrasterheader: readrasterheader.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ rasterheader: rasterheader.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+ dateconv: dateconv.o
+- $(CC) $(CFLAGS) $@.o -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $@.o -o $@
+
+
+ ### Install in CB_INSTALL by linking/copying executables ###
+@@ -99,15 +99,11 @@ install: $(PROGS)
+
+ ### Use symbolic links at our system, copy to /usr/local/bin on other.
+ definstall: $(PROGS)
+- dir=$(INSTALL_DIR); \
+- if test ! -d $$dir; then \
+- echo "Sorry, dir $(INSTALL_DIR) does not exist, exiting..."; exit; fi; \
+- echo Installing in directory: $$dir; \
++ mkdir -p $(INSTALL_DIR)
+ list='$(PROGS) $(SCRIPTS)'; for p in $$list; do \
+ echo "Installing (copy): $$p"; \
+ cp -f $$p $(INSTALL_DIR)/$$p; \
+ done
+- $(MAKE) cleaner
+
+ ### 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
+ 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 $(@) $<
+
+ ### EOF.
+
diff --git a/debian/patches/0004-csh-path.patch b/debian/patches/0004-csh-path.patch
new file mode 100644
index 0000000..f892077
--- /dev/null
+++ b/debian/patches/0004-csh-path.patch
@@ -0,0 +1,19 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Tue, 26 Nov 2013 09:08:12 +0000
+Subject: csh-path
+
+Fix csh path
+---
+ bin/heightamb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/heightamb b/bin/heightamb
+index 474c890..3d0bd05 100755
+--- a/bin/heightamb
++++ b/bin/heightamb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/csh -f
++#!/bin/csh -f
+ #%// BK 25-May-2000
+ #%// $Revision: 1.1 $ $Date: 2005/07/28 09:27:00 $
+
diff --git a/debian/patches/csh-path.patch b/debian/patches/csh-path.patch
deleted file mode 100644
index 4424f30..0000000
--- a/debian/patches/csh-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix csh path
---- a/bin/heightamb
-+++ b/bin/heightamb
-@@ -1,4 +1,4 @@
--#!/usr/bin/csh -f
-+#!/bin/csh -f
- #%// BK 25-May-2000
- #%// $Revision: 1.1 $ $Date: 2005/07/28 09:27:00 $
-
diff --git a/debian/patches/series b/debian/patches/series
index 625e533..b47f13a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-spelling.patch
-configure.patch
-tools-build.patch
-csh-path.patch
+0001-spelling.patch
+0002-configure.patch
+0003-tools-build.patch
+0004-csh-path.patch
--
Packaging for DORIS (InSAR processor)
More information about the Pkg-grass-devel
mailing list