[Git][debian-gis-team/doris][master] 4 commits: Add Forwarded field to all patches

Antonio Valentino gitlab at salsa.debian.org
Sat Oct 24 14:39:45 BST 2020 


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


Commits:
83047c6e by Antonio Valentino at 2020-10-24T13:32:17+00:00
Add Forwarded field to all patches

- - - - -
7a4a929e by Antonio Valentino at 2020-10-24T13:32:24+00:00
Lintian overrides

- - - - -
f10d3a5a by Antonio Valentino at 2020-10-24T13:36:21+00:00
Fix install file

- - - - -
815d7f55 by Antonio Valentino at 2020-10-24T13:36:36+00:00
Set distribution to unstable

- - - - -


15 changed files:

- debian/changelog
- debian/lintian-overrides
- debian/patches/0001-spelling.patch
- debian/patches/0002-configure.patch
- debian/patches/0003-tools-build.patch
- debian/patches/0004-csh-path.patch
- debian/patches/0005-fix-build.patch
- debian/patches/0006-remove-osr-from-dependencies.patch
- debian/patches/0007-drop-the-install-package.patch
- debian/patches/0009-Python-doris-package.patch
- debian/patches/0010-Use-sys.executable.patch
- debian/patches/0011-Fix-doris_config.xml-path.patch
- debian/patches/0012-fix-default-params-in-friend-functions.patch
- debian/python3-doris.install
- + debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,16 @@
-doris (5.0.3~beta+dfsg-14) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-14) unstable; urgency=medium
 
+  [ Bas Couwenberg ]
   * Bump Standards-Version to 4.5.0, no changes.
+
+  [ Antonio Valentino ]
   * debian/control:
     - explicitly set Rules-Requires-Root: no
+  * debian/patches:
+    - add Forwarded field to all patches
+  * Update lintian overrides
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Sep 2019 18:51:39 +0200
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 24 Oct 2020 13:36:26 +0000
 
 doris (5.0.3~beta+dfsg-13) unstable; urgency=medium
 


=====================================
debian/lintian-overrides
=====================================
@@ -19,3 +19,77 @@ csh-considered-harmful usr/share/doris/plotoffsets.bruno
 csh-considered-harmful usr/share/doris/plotoffsets_cc
 csh-considered-harmful usr/share/doris/viewanddel
 
+# need to preserve the upstream directory layout
+breakout-link usr/lib/doris/ascii2ascii_UTM -> usr/share/doris/ascii2ascii_UTM
+breakout-link usr/lib/doris/ascii2grdAutoMinMaxHDR -> usr/share/doris/ascii2grdAutoMinMaxHDR
+breakout-link usr/lib/doris/ascii2ps -> usr/share/doris/ascii2ps
+breakout-link usr/lib/doris/baseline.doris.sh -> usr/share/doris/baseline.doris.sh
+breakout-link usr/lib/doris/coregpm.doris -> usr/share/doris/coregpm.doris
+breakout-link usr/lib/doris/cpx2ps -> usr/share/doris/cpx2ps
+breakout-link usr/lib/doris/csk_dump_data.py -> usr/share/doris/csk_dump_data.py
+breakout-link usr/lib/doris/csk_dump_header2doris.py -> usr/share/doris/csk_dump_header2doris.py
+breakout-link usr/lib/doris/doris.rmstep.sh -> usr/share/doris/doris.rmstep.sh
+breakout-link usr/lib/doris/doris.slant2h4master.sh -> usr/share/doris/doris.slant2h4master.sh
+breakout-link usr/lib/doris/envisat_dump_header2doris.csh -> usr/share/doris/envisat_dump_header2doris.csh
+breakout-link usr/lib/doris/gammaReadfiles.csh -> usr/share/doris/gammaReadfiles.csh
+breakout-link usr/lib/doris/getorb_rs2.py -> usr/share/doris/getorb_rs2.py
+breakout-link usr/lib/doris/heightamb -> usr/share/doris/heightamb
+breakout-link usr/lib/doris/helpdoris -> usr/share/doris/helpdoris
+breakout-link usr/lib/doris/hhmmss2sec.py -> usr/share/doris/hhmmss2sec.py
+breakout-link usr/lib/doris/lonlatCoh2ascii -> usr/share/doris/lonlatCoh2ascii
+breakout-link usr/lib/doris/lonlathei2ascii -> usr/share/doris/lonlathei2ascii
+breakout-link usr/lib/doris/phasefilt.doris -> usr/share/doris/phasefilt.doris
+breakout-link usr/lib/doris/plotcpm -> usr/share/doris/plotcpm
+breakout-link usr/lib/doris/plotcpm.erroffsets -> usr/share/doris/plotcpm.erroffsets
+breakout-link usr/lib/doris/plotoffsets -> usr/share/doris/plotoffsets
+breakout-link usr/lib/doris/rs2_dump_data.py -> usr/share/doris/rs2_dump_data.py
+breakout-link usr/lib/doris/rs2_dump_header2doris.py -> usr/share/doris/rs2_dump_header2doris.py
+breakout-link usr/lib/doris/run -> usr/share/doris/run
+breakout-link usr/lib/doris/sec2hhmmss.py -> usr/share/doris/sec2hhmmss.py
+breakout-link usr/lib/doris/tsx_dump_data.py -> usr/share/doris/tsx_dump_data.py
+breakout-link usr/lib/doris/tsx_dump_header2doris.py -> usr/share/doris/tsx_dump_header2doris.py
+breakout-link usr/lib/doris/viewanddel -> usr/share/doris/viewanddel
+
+# executables are in usr/lib/doris
+spare-manual-page usr/share/man/man1/ascii2ascii_UTM.1.gz
+spare-manual-page usr/share/man/man1/ascii2grdAutoMinMaxHDR.1.gz
+spare-manual-page usr/share/man/man1/ascii2ps.1.gz
+spare-manual-page usr/share/man/man1/coregpm.doris.1.gz
+spare-manual-page usr/share/man/man1/cpx2ps.1.gz
+spare-manual-page usr/share/man/man1/gammaReadfiles.csh.1.gz
+spare-manual-page usr/share/man/man1/heightamb.1.gz
+spare-manual-page usr/share/man/man1/lonlatCoh2ascii.1.gz
+spare-manual-page usr/share/man/man1/lonlathei2ascii.1.gz
+spare-manual-page usr/share/man/man1/phasefilt.doris.1.gz
+spare-manual-page usr/share/man/man1/plotcpm.1.gz
+spare-manual-page usr/share/man/man1/plotcpm.erroffsets.1.gz
+spare-manual-page usr/share/man/man1/plotoffsets.1.gz
+spare-manual-page usr/share/man/man1/viewanddel.1.gz
+spare-manual-page usr/share/man/py/man1/getorb_rs2.1.gz
+spare-manual-page usr/share/man/py/man1/rs2_dump_data.1.gz
+spare-manual-page usr/share/man/py/man1/rs2_dump_header2doris.1.gz
+spare-manual-page usr/share/man/py/man1/tsx_dump_data.1.gz
+spare-manual-page usr/share/man/py/man1/tsx_dump_header2doris.1.gz
+spare-manual-page usr/share/man/sh/man1/baseline.doris.1.gz
+spare-manual-page usr/share/man/sh/man1/doris.adddummystep.1.gz
+spare-manual-page usr/share/man/sh/man1/doris.rmstep.1.gz
+spare-manual-page usr/share/man/sh/man1/doris.slant2h4master.1.gz
+
+# do not spam usr/bin
+executable-in-usr-lib usr/lib/doris/bkconvert
+executable-in-usr-lib usr/lib/doris/cpxconj
+executable-in-usr-lib usr/lib/doris/cpxdiv
+executable-in-usr-lib usr/lib/doris/cpxfiddle
+executable-in-usr-lib usr/lib/doris/cpxmult
+executable-in-usr-lib usr/lib/doris/dateconv
+executable-in-usr-lib usr/lib/doris/doris
+executable-in-usr-lib usr/lib/doris/envisat_dump_HH
+executable-in-usr-lib usr/lib/doris/envisat_dump_VV
+executable-in-usr-lib usr/lib/doris/envisat_dump_data
+executable-in-usr-lib usr/lib/doris/envisat_dump_header
+executable-in-usr-lib usr/lib/doris/flapjack
+executable-in-usr-lib usr/lib/doris/floatmask
+executable-in-usr-lib usr/lib/doris/floatmult
+executable-in-usr-lib usr/lib/doris/rasterheader
+executable-in-usr-lib usr/lib/doris/readrasterheader
+executable-in-usr-lib usr/lib/doris/wrap


=====================================
debian/patches/0001-spelling.patch
=====================================
@@ -3,6 +3,8 @@ Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: spelling
 
 Fix spelling errors
+
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  doris_core/coregistration.cc | 14 +++++++-------
  doris_core/exceptions.cc     |  4 ++--


=====================================
debian/patches/0002-configure.patch
=====================================
@@ -2,6 +2,7 @@ From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: configure
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  doris_core/configure         | 42 +++++++++++++++++++++---------------------
  doris_core/referencephase.cc |  3 ++-


=====================================
debian/patches/0003-tools-build.patch
=====================================
@@ -2,6 +2,7 @@ From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: tools-build
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  envisat_tools/Makefile              | 38 ++++++++++++++++++-------------------
  envisat_tools/envisat_dump_HH.c     |  2 +-


=====================================
debian/patches/0004-csh-path.patch
=====================================
@@ -3,6 +3,8 @@ Date: Tue, 26 Nov 2013 09:08:12 +0000
 Subject: csh-path
 
 Fix csh path
+
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  bin/heightamb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)


=====================================
debian/patches/0005-fix-build.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 7 Aug 2017 06:32:29 +0000
 Subject: fix build
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  doris_core/bk_messages.hh | 2 +-
  sar_tools/cpxfiddle.cc    | 2 +-


=====================================
debian/patches/0006-remove-osr-from-dependencies.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 7 Aug 2017 08:09:04 +0000
 Subject: remove osr form dependencies
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  install/INSTALL.txt | 4 ++--
  setup.py            | 2 +-


=====================================
debian/patches/0007-drop-the-install-package.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 7 Aug 2017 20:55:03 +0000
 Subject: drop the install package
 
+Forwarded: not-needed
 ---
  install/init_cfg.py | 2 ++
  setup.py            | 2 +-


=====================================
debian/patches/0009-Python-doris-package.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Tue, 6 Aug 2019 11:34:27 +0000
 Subject: Python doris package
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/25
 ---
  setup.py | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)


=====================================
debian/patches/0010-Use-sys.executable.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 12 Aug 2019 15:51:00 +0000
 Subject: Use sys.executable
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  doris_stack/main_code/single_master_stack.py | 21 +++++++++++----------
  doris_stack/main_code/stack.py               |  4 ++--


=====================================
debian/patches/0011-Fix-doris_config.xml-path.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Mon, 12 Aug 2019 18:36:46 +0200
 Subject: Fix doris_config.xml path
 
+Forwarded: not-needed
 ---
  doris_stack/main_code/doris_config.py          | 5 ++++-
  doris_stack/main_code/grs_config.py            | 5 ++++-


=====================================
debian/patches/0012-fix-default-params-in-friend-functions.patch
=====================================
@@ -2,6 +2,7 @@ From: Antonio Valentino <antonio.valentino at tiscali.it>
 Date: Sat, 24 Aug 2019 09:14:03 +0200
 Subject: fix default params in friend functions
 
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
 ---
  doris_core/orbitbk.hh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 67 insertions(+), 1 deletion(-)


=====================================
debian/python3-doris.install
=====================================
@@ -1,4 +1,4 @@
 usr/lib/python*
 install/init_cfg.py usr/share/doris
 install/*.xml usr/share/doris
-debian/doris_config.xml /etc
+debian/doris_config.xml etc


=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,25 @@
+maintainer-manual-page debian/man/ascii2ascii_UTM.1
+maintainer-manual-page debian/man/ascii2grdAutoMinMaxHDR.1
+maintainer-manual-page debian/man/ascii2ps.1
+maintainer-manual-page debian/man/baseline.doris.sh.1
+maintainer-manual-page debian/man/coregpm.doris.1
+maintainer-manual-page debian/man/cpx2ps.1
+maintainer-manual-page debian/man/doris.1
+maintainer-manual-page debian/man/doris.adddummystep.sh.1
+maintainer-manual-page debian/man/doris.rmstep.sh.1
+maintainer-manual-page debian/man/doris.slant2h4master.sh.1
+maintainer-manual-page debian/man/gammaReadfiles.csh.1
+maintainer-manual-page debian/man/getorb_rs2.py.1
+maintainer-manual-page debian/man/heightamb.1
+maintainer-manual-page debian/man/lonlatCoh2ascii.1
+maintainer-manual-page debian/man/lonlathei2ascii.1
+maintainer-manual-page debian/man/phasefilt.doris.1
+maintainer-manual-page debian/man/plotcpm.1
+maintainer-manual-page debian/man/plotcpm.erroffsets.1
+maintainer-manual-page debian/man/plotoffsets.1
+maintainer-manual-page debian/man/rs2_dump_data.py.1
+maintainer-manual-page debian/man/rs2_dump_header2doris.py.1
+maintainer-manual-page debian/man/rundoris.1
+maintainer-manual-page debian/man/tsx_dump_data.py.1
+maintainer-manual-page debian/man/tsx_dump_header2doris.py.1
+maintainer-manual-page debian/man/viewanddel.1



View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/95b209f604e2b81da6341d43685caaa80c364a0b...815d7f55f4bdc21aef621324d673a1abae5abfab

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/95b209f604e2b81da6341d43685caaa80c364a0b...815d7f55f4bdc21aef621324d673a1abae5abfab
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/20201024/6534b786/attachment-0001.html>

More information about the Pkg-grass-devel mailing list