[Git][debian-gis-team/doris][master] 6 commits: New 0013-Fix-tempaletes-declaration.patch
Antonio Valentino (@antonio.valentino)
gitlab at salsa.debian.org
Thu Dec 30 18:22:36 GMT 2021
Antonio Valentino pushed to branch master at Debian GIS Project / doris
Commits:
758ffe02 by Antonio Valentino at 2021-12-30T18:14:15+00:00
New 0013-Fix-tempaletes-declaration.patch
- - - - -
82be0465 by Antonio Valentino at 2021-12-30T18:14:49+00:00
New 0014-Fix-shebang-string-in-helpdoris.patch
- - - - -
074407c1 by Antonio Valentino at 2021-12-30T18:14:55+00:00
Update lintian-overrides
- - - - -
f4cf3176 by Antonio Valentino at 2021-12-30T18:14:55+00:00
Update d/copyright
- - - - -
7143b6dc by Antonio Valentino at 2021-12-30T18:14:56+00:00
New executable-in-usr-lib file
- - - - -
ef8673e2 by Antonio Valentino at 2021-12-30T18:21:41+00:00
Set distribution to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/copyright
- debian/lintian-overrides → debian/doris.lintian-overrides
- + debian/patches/0013-Fix-tempaletes-declaration.patch
- + debian/patches/0014-Fix-shebang-string-in-helpdoris.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,21 @@
-doris (5.0.3~beta+dfsg-16) UNRELEASED; urgency=medium
+doris (5.0.3~beta+dfsg-16) unstable; urgency=medium
- * Team upload.
+ [ Bas Couwenberg ]
* Bump Standards-Version to 4.6.0, no changes.
* Drop undefined substitution variables.
* Update watch file to use tags instead of releases.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:19:48 +0200
+ [ Antonio Valentino ]
+ * debian/rules:
+ - new 0013-Fix-tempaletes-declaration.patch
+ - new 0014-Fix-shebang-string-in-helpdoris.patch
+ * Update d/lintian-overrides.
+ * Update d/copyright.
+ * d/lintian-overrides renamed into d/doris.lintian-overrides.
+ * debian/doris.lintian-overrides:
+ - add override for executable-in-usr-lib.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Thu, 30 Dec 2021 18:21:19 +0000
doris (5.0.3~beta+dfsg-15) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -66,7 +66,7 @@ Copyright: 2004 Bert Kampes
License: GPL-2+
Files: debian/*
-Copyright: 2010-2017 Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2010-2021 Antonio Valentino <antonio.valentino at tiscali.it>
License: GPL-2+
Files: debian/watch
=====================================
debian/lintian-overrides → debian/doris.lintian-overrides
=====================================
@@ -1,11 +1,10 @@
# Upstream strongly relies on csh (no alternative available at the moment)
csh-considered-harmful usr/share/doris/*
-# need to preserve the upstream directory layout
-breakout-link usr/lib/doris/* -> usr/share/doris/*
-
# executables are in usr/lib/doris
spare-manual-page usr/share/man/man1/*
spare-manual-page usr/share/man/py/man1/*
spare-manual-page usr/share/man/sh/man1/*
+# executables are in usr/lib/doris
+executable-in-usr-lib usr/lib/doris/*
=====================================
debian/patches/0013-Fix-tempaletes-declaration.patch
=====================================
@@ -0,0 +1,110 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Thu, 30 Dec 2021 17:18:02 +0000
+Subject: Fix tempaletes declaration
+
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
+---
+ doris_core/matrixspecs.cc | 69 ++++++-----------------------------------------
+ 1 file changed, 8 insertions(+), 61 deletions(-)
+
+diff --git a/doris_core/matrixspecs.cc b/doris_core/matrixspecs.cc
+index fa4c1b8..7aa672f 100755
+--- a/doris_core/matrixspecs.cc
++++ b/doris_core/matrixspecs.cc
+@@ -3250,22 +3250,8 @@ matrix<complr4> mat2cr4(
+ * C *= A; pointwise multiplication, CR4 R4 *
+ #%// BK 26-Oct-2000
+ ****************************************************************/
+-#if __GNUC__ < 4
+-//template<> // essential for specialization
+-//template<class> // seems not allowed for g++2.95
+-//#if __GNUC_MINOR__ < 95
+-//#endif
+-//
+-#else
+-#if __GNUC_MINOR__ > 0
+-template<> // essential for specialization
+-template<> // seems required for specialization g++-4.0 upwards
+-#else
+-template<> // essential for specialization
+-template<class> // seems required for specialization g++-4.0 upwards
+-#endif
+-#endif
+-// ****************************************************************
++template <>
++template <>
+ matrix<complr4>& matrix<complr4>::operator *= (const matrix<real4> &A)
+ {
+ #ifdef __DEBUGMAT2
+@@ -3293,21 +3279,8 @@ matrix<complr4>& matrix<complr4>::operator *= (const matrix<real4> &A)
+ * C /= A; pointwise division, CR4 R4 *
+ #%// BK 27-Oct-2000 *
+ ****************************************************************/
+-#if __GNUC__ < 4
+-//template<> // essential for specialization
+-//template<class> // seems not allowed for g++2.95
+-//#if __GNUC_MINOR__ < 95
+-//#endif
+-//
+-#else /* g++-4.0 upwards */
+-#if __GNUC_MINOR__ > 0
+-template<> // essential for specialization
+-template<> // seems required for specialization g++-4.0 upwards
+-#else
+-template<> // essential for specialization
+-template<class> // seems required for specialization g++-4.0 upwards
+-#endif
+-#endif
++template <>
++template <>
+ matrix<complr4>& matrix<complr4>::operator /= (const matrix<real4> &A)
+ {
+ #ifdef __DEBUGMAT2
+@@ -3335,21 +3308,8 @@ matrix<complr4>& matrix<complr4>::operator /= (const matrix<real4> &A)
+ * C += A; pointwise addition, CR4 R4 *
+ #%// BK 27-Oct-2000 *
+ ****************************************************************/
+-#if __GNUC__ < 4
+-//template<> // essential for specialization
+-//template<class> // seems not allowed for g++2.95
+-//#if __GNUC_MINOR__ < 95
+-//#endif
+-//
+-#else /* g++-4.0 upwards */
+-#if __GNUC_MINOR__ > 0
+-template<> // essential for specialization
+-template<> // seems required for specialization g++-4.0 upwards
+-#else
+-template<> // essential for specialization
+-template<class> // seems required for specialization g++-4.0 upwards
+-#endif
+-#endif
++template <>
++template <>
+ matrix<complr4>& matrix<complr4>::operator += (const matrix<real4> &A)
+ {
+ #ifdef __DEBUGMAT2
+@@ -3377,21 +3337,8 @@ matrix<complr4>& matrix<complr4>::operator += (const matrix<real4> &A)
+ * C -= A; pointwise subtraction, CR4 R4 *
+ #%// BK 27-Oct-2000 *
+ ****************************************************************/
+-#if __GNUC__ < 4
+-//template<> // essential for specialization
+-//template<class> // seems not allowed for g++2.95
+-//#if __GNUC_MINOR__ < 95
+-//#endif
+-//
+-#else /* g++-4.0 upwards */
+-#if __GNUC_MINOR__ > 0
+-template<> // essential for specialization
+-template<> // seems required for specialization g++-4.0 upwards
+-#else
+-template<> // essential for specialization
+-template<class> // seems required for specialization g++-4.0 upwards
+-#endif
+-#endif
++template <>
++template <>
+ matrix<complr4>& matrix<complr4>::operator -= (const matrix<real4> &A)
+ {
+ #ifdef __DEBUGMAT2
=====================================
debian/patches/0014-Fix-shebang-string-in-helpdoris.patch
=====================================
@@ -0,0 +1,19 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Thu, 30 Dec 2021 17:30:23 +0000
+Subject: Fix shebang string in helpdoris
+
+Forwarded: https://github.com/TUDelftGeodesy/Doris/pull/5
+---
+ bin/helpdoris | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/helpdoris b/bin/helpdoris
+index f281caf..ed3bcfc 100755
+--- a/bin/helpdoris
++++ b/bin/helpdoris
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ ##!/bin/ksh
+ # processor.helpfile
+ # simulate man like help for processor options
=====================================
debian/patches/series
=====================================
@@ -10,3 +10,5 @@
0010-Use-sys.executable.patch
0011-Fix-doris_config.xml-path.patch
0012-fix-default-params-in-friend-functions.patch
+0013-Fix-tempaletes-declaration.patch
+0014-Fix-shebang-string-in-helpdoris.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/28018f1a65cce0de2559ed3365df7b1f63534c8f...ef8673e20e3ecaba7f2df204efc0fb81330a01cb
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/doris/-/compare/28018f1a65cce0de2559ed3365df7b1f63534c8f...ef8673e20e3ecaba7f2df204efc0fb81330a01cb
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/20211230/1888c384/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list