[doris] 14/14: Fix installation directories

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Mon Aug 7 17:57:36 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 14f158d7f41303c1f3a26819ada7685a8616dfa8
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Aug 7 07:49:58 2017 +0000

    Fix installation directories
---
 debian/README.Debian |  5 +---
 debian/links         | 66 ++++++++++++++++++++++++----------------------------
 debian/overrides     | 38 +++++++++++++++---------------
 debian/rules         |  6 ++---
 4 files changed, 53 insertions(+), 62 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 87b48c7..4150ae0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,7 +18,4 @@ and a wrapper script for the doris executable.
 The wrapper script set some environment variable (numeric and time locale) and
 extend the PATH to include DORISBIN and /usr/lib/gmt/bin (for GMT tools).
 
-NOTE: currently the debian package of DORIS uses the system epr-api library
-      that doesn't provide support for reading ERS products in ENVISAT format.
-
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 10 Mar 2011 22:37:17 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 07 Aug 2017 07:34:47 +0000
diff --git a/debian/links b/debian/links
index 28c5bd3..42cb16b 100644
--- a/debian/links
+++ b/debian/links
@@ -1,37 +1,31 @@
 usr/lib/doris/run                            usr/bin/rundoris
-usr/share/doris/editor_support/README        usr/share/doc/doris/README_editor_support.txt
-usr/share/doris/bin/envisat_dump_header2doris.csh usr/lib/doris/envisat_dump_header2doris.csh
-usr/share/doris/bin/ascii2ascii_UTM          usr/lib/doris/ascii2ascii_UTM
-usr/share/doris/bin/ascii2ps                 usr/lib/doris/ascii2ps
-usr/share/doris/bin/baseline.doris.sh        usr/lib/doris/baseline.doris.sh
-usr/share/doris/bin/construct_dem.sh         usr/lib/doris/construct_dem.sh
-usr/share/doris/bin/coregpm.doris            usr/lib/doris/coregpm.doris
-usr/share/doris/bin/cpx2ps                   usr/lib/doris/cpx2ps
-usr/share/doris/bin/csk_dump_data.py         usr/lib/doris/csk_dump_data.py
-usr/share/doris/bin/csk_dump_header2doris.py usr/lib/doris/csk_dump_header2doris.py
-usr/share/doris/bin/doris.rmstep.sh          usr/lib/doris/doris.rmstep.sh
-usr/share/doris/bin/gammaReadfiles.csh       usr/lib/doris/gammaReadfiles.csh
-usr/share/doris/bin/heightamb                usr/lib/doris/heightamb
-usr/share/doris/bin/helpdoris                usr/lib/doris/helpdoris
-usr/share/doris/bin/hhmmss2sec.py            usr/lib/doris/hhmmss2sec.py
-usr/share/doris/bin/lonlathei2ascii          usr/lib/doris/lonlathei2ascii
-usr/share/doris/bin/phasefilt.doris          usr/lib/doris/phasefilt.doris
-usr/share/doris/bin/plotcpm                  usr/lib/doris/plotcpm
-usr/share/doris/bin/plotcpm.erroffsets       usr/lib/doris/plotcpm.erroffsets
-usr/share/doris/bin/plotoffsets              usr/lib/doris/plotoffsets
-usr/share/doris/bin/rs2_dump_data.py         usr/lib/doris/rs2_dump_data.py
-usr/share/doris/bin/rs2_dump_header2doris.py usr/lib/doris/rs2_dump_header2doris.py
-usr/share/doris/bin/run                      usr/lib/doris/run
-usr/share/doris/bin/sec2hhmmss.py            usr/lib/doris/sec2hhmmss.py
-usr/share/doris/bin/tsx_dump_data.py         usr/lib/doris/tsx_dump_data.py
-usr/share/doris/bin/tsx_dump_header2doris.py usr/lib/doris/tsx_dump_header2doris.py
-usr/share/doris/bin/viewanddel               usr/lib/doris/viewanddel
-#usr/share/doris/bin/plotoffsets.bruno       usr/lib/doris/plotoffsets.bruno
-#usr/share/doris/bin/plotoffsets_cc          usr/lib/doris/plotoffsets_cc
-#usr/share/doris/bin/tsx_dump_header2doris_noxpath.py usr/lib/doris/tsx_dump_header2doris_noxpath.py
-#usr/share/doris/bin/ascii2ps.gmt-v3         usr/lib/doris/ascii2ps.gmt-v3
-#usr/share/doris/bin/baseline.doris.csh      usr/lib/doris/baseline.doris.csh
-usr/share/doris/bin/ascii2grdAutoMinMaxHDR   usr/lib/doris/ascii2grdAutoMinMaxHDR
-usr/share/doris/bin/doris.slant2h4master.sh  usr/lib/doris/doris.slant2h4master.sh
-usr/share/doris/bin/getorb_rs2.py            usr/lib/doris/getorb_rs2.py
-usr/share/doris/bin/lonlatCoh2ascii          usr/lib/doris/lonlatCoh2ascii
+usr/share/doris/envisat_dump_header2doris.csh usr/lib/doris/envisat_dump_header2doris.csh
+usr/share/doris/ascii2ascii_UTM          usr/lib/doris/ascii2ascii_UTM
+usr/share/doris/ascii2grdAutoMinMaxHDR   usr/lib/doris/ascii2grdAutoMinMaxHDR
+usr/share/doris/ascii2ps                 usr/lib/doris/ascii2ps
+usr/share/doris/baseline.doris.sh        usr/lib/doris/baseline.doris.sh
+usr/share/doris/coregpm.doris            usr/lib/doris/coregpm.doris
+usr/share/doris/cpx2ps                   usr/lib/doris/cpx2ps
+usr/share/doris/csk_dump_data.py         usr/lib/doris/csk_dump_data.py
+usr/share/doris/csk_dump_header2doris.py usr/lib/doris/csk_dump_header2doris.py
+usr/share/doris/doris.rmstep.sh          usr/lib/doris/doris.rmstep.sh
+usr/share/doris/doris.slant2h4master.sh  usr/lib/doris/doris.slant2h4master.sh
+usr/share/doris/gammaReadfiles.csh       usr/lib/doris/gammaReadfiles.csh
+usr/share/doris/getorb_rs2.py            usr/lib/doris/getorb_rs2.py
+usr/share/doris/heightamb                usr/lib/doris/heightamb
+usr/share/doris/helpdoris                usr/lib/doris/helpdoris
+usr/share/doris/hhmmss2sec.py            usr/lib/doris/hhmmss2sec.py
+usr/share/doris/lonlatCoh2ascii          usr/lib/doris/lonlatCoh2ascii
+usr/share/doris/lonlathei2ascii          usr/lib/doris/lonlathei2ascii
+usr/share/doris/phasefilt.doris          usr/lib/doris/phasefilt.doris
+usr/share/doris/plotcpm                  usr/lib/doris/plotcpm
+usr/share/doris/plotcpm.erroffsets       usr/lib/doris/plotcpm.erroffsets
+usr/share/doris/plotoffsets              usr/lib/doris/plotoffsets
+usr/share/doris/rs2_dump_data.py         usr/lib/doris/rs2_dump_data.py
+usr/share/doris/rs2_dump_header2doris.py usr/lib/doris/rs2_dump_header2doris.py
+usr/share/doris/run                      usr/lib/doris/run
+usr/share/doris/sec2hhmmss.py            usr/lib/doris/sec2hhmmss.py
+usr/share/doris/tsx_dump_data.py         usr/lib/doris/tsx_dump_data.py
+usr/share/doris/tsx_dump_header2doris.py usr/lib/doris/tsx_dump_header2doris.py
+usr/share/doris/viewanddel               usr/lib/doris/viewanddel
+
diff --git a/debian/overrides b/debian/overrides
index 0b1914b..e50fdff 100644
--- a/debian/overrides
+++ b/debian/overrides
@@ -1,21 +1,21 @@
 # c-shell scripts come from upstream.
 
-doris: csh-considered-harmful usr/share/doris/bin/ascii2ascii_UTM
-doris: csh-considered-harmful usr/share/doris/bin/ascii2ps
-doris: csh-considered-harmful usr/share/doris/bin/ascii2ps.gmt-v3
-doris: csh-considered-harmful usr/share/doris/bin/baseline.doris.csh
-doris: csh-considered-harmful usr/share/doris/bin/coregpm.doris
-doris: csh-considered-harmful usr/share/doris/bin/cpx2ps
-doris: csh-considered-harmful usr/share/doris/bin/envisat_dump_header2doris.csh
-doris: csh-considered-harmful usr/share/doris/bin/gammaReadfiles.csh
-doris: csh-considered-harmful usr/share/doris/bin/heightamb
-doris: csh-considered-harmful usr/share/doris/bin/lonlathei2ascii
-doris: csh-considered-harmful usr/share/doris/bin/phasefilt.doris
-doris: csh-considered-harmful usr/share/doris/bin/plotcpm
-doris: csh-considered-harmful usr/share/doris/bin/plotcpm.erroffsets
-doris: csh-considered-harmful usr/share/doris/bin/plotoffsets
-doris: csh-considered-harmful usr/share/doris/bin/plotoffsets.bruno
-doris: csh-considered-harmful usr/share/doris/bin/plotoffsets_cc
-doris: csh-considered-harmful usr/share/doris/bin/viewanddel
-doris: csh-considered-harmful usr/share/doris/bin/ascii2grdAutoMinMaxHDR
-doris: csh-considered-harmful usr/share/doris/bin/lonlatCoh2ascii
+doris: csh-considered-harmful usr/share/doris/ascii2ascii_UTM
+doris: csh-considered-harmful usr/share/doris/ascii2ps
+doris: csh-considered-harmful usr/share/doris/ascii2ps.gmt-v3
+doris: csh-considered-harmful usr/share/doris/baseline.doris.csh
+doris: csh-considered-harmful usr/share/doris/coregpm.doris
+doris: csh-considered-harmful usr/share/doris/cpx2ps
+doris: csh-considered-harmful usr/share/doris/envisat_dump_header2doris.csh
+doris: csh-considered-harmful usr/share/doris/gammaReadfiles.csh
+doris: csh-considered-harmful usr/share/doris/heightamb
+doris: csh-considered-harmful usr/share/doris/lonlathei2ascii
+doris: csh-considered-harmful usr/share/doris/phasefilt.doris
+doris: csh-considered-harmful usr/share/doris/plotcpm
+doris: csh-considered-harmful usr/share/doris/plotcpm.erroffsets
+doris: csh-considered-harmful usr/share/doris/plotoffsets
+doris: csh-considered-harmful usr/share/doris/plotoffsets.bruno
+doris: csh-considered-harmful usr/share/doris/plotoffsets_cc
+doris: csh-considered-harmful usr/share/doris/viewanddel
+doris: csh-considered-harmful usr/share/doris/ascii2grdAutoMinMaxHDR
+doris: csh-considered-harmful usr/share/doris/lonlatCoh2ascii
diff --git a/debian/rules b/debian/rules
index b26df81..277afaf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,15 +54,15 @@ override_dh_auto_install:
 	dh_auto_install --sourcedirectory=envisat_tools -- INSTALL_DIR=../debian/doris/usr/lib/doris
 	rm -f debian/doris/usr/lib/doris/*.csh
 	install -D --mode=0755 envisat_tools/envisat_dump_header2doris.csh \
-		debian/doris/usr/share/doris/bin/envisat_dump_header2doris.csh
+		debian/doris/usr/share/doris/envisat_dump_header2doris.csh
 	install -D --mode=0644 envisat_tools/README \
 		debian/doris/usr/share/doc/doris/README_envisat_tools.txt
 
 	#dh_auto_install --sourcedirectory=doris_core -- INSTALLDIR=../debian/doris/usr/lib/doris
 	install -D --mode=0755 doris_core/doris debian/doris/usr/lib/doris
-	cp -R bin debian/doris/usr/share/doris
+	cp bin/* debian/doris/usr/share/doris
 	chmod 0755 debian/doris/usr/share/doris/*
-	rm -f debian/doris/usr/share/doris/bin/README*
+	rm -f debian/doris/usr/share/doris/README*
 	install -D --mode=0644 bin/README \
 		debian/doris/usr/share/doc/doris/README_bin.txt
 	install -D --mode=0644 bin/README_CSK.txt \

-- 
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