[Git][debian-gis-team/saga][experimental] 4 commits: Fix dh-python use.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Apr 26 09:38:41 BST 2022
Bas Couwenberg pushed to branch experimental at Debian GIS Project / saga
Commits:
3c22984c by Bas Couwenberg at 2022-04-26T09:50:35+02:00
Fix dh-python use.
- - - - -
8a37cc03 by Bas Couwenberg at 2022-04-26T09:57:16+02:00
Fix rapidjson licese & copyright.
- - - - -
abd80a5e by Bas Couwenberg at 2022-04-26T10:37:01+02:00
Fix imagery license & copyright.
- - - - -
c288d7d1 by Bas Couwenberg at 2022-04-26T10:38:33+02:00
Add lintian override for package-contains-documentation-outside-usr-share-doc.
- - - - -
4 changed files:
- debian/control
- debian/copyright
- debian/rules
- + debian/saga-common.lintian-overrides
Changes:
=====================================
debian/control
=====================================
@@ -12,12 +12,12 @@ Build-Depends: cmake,
libgdal-dev,
libhpdf-dev,
libproj-dev,
- libpython3-dev,
libqhull-dev,
libsvm-dev,
libvigraimpex-dev,
libwxgtk3.0-gtk3-dev,
pkg-config,
+ python3-dev,
swig
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
=====================================
debian/copyright
=====================================
@@ -77,6 +77,11 @@ Files: saga-gis/src/tools/db/*
Copyright: 2004-2013, Olaf Conrad
License: GPL-2+
+Files: saga-gis/src/tools/db/db_mysql/*
+Copyright: 2004, Olaf Conrad
+ 2009, Fergat Bingol
+License: GPL-2
+
Files: saga-gis/src/tools/db/db_odbc/otlv4.h
Copyright: 1996-2010, Sergei Kuchin <skuchin at gmail.com>
License: OpenBSD-License
@@ -108,14 +113,6 @@ Copyright: 2005, Victor Olaya
2005, Olaf Conrad
License: LGPL-2.1
-Files: saga-gis/src/tools/imagery/*
-Copyright: 2019, D.N.Karger
- Olaf Conrad
- 2016-2018, L.Landschreiber
-
-Files: saga-gis/src/tools/db/db_mysql/
-Copyright: 2009, Fergat Bingol
-
Files: saga-gis/src/tools/garden/*
Copyright: 2003-2018, Olaf Conrad
2006, Victor Olaya
@@ -140,13 +137,22 @@ Copyright: 2000-2008, Pavel Sakov and CSIRO
License: BSD-2-clause
Files: saga-gis/src/tools/imagery/*
-Copyright: 2003-2016, Olaf Conrad
- 2008, 2012-2013, Benjamin Bechtel
+Copyright: 2021, Volker Wichmann
+ 2003-2019, Olaf Conrad
+ 2017, Marvin Ambrosi
2013, HfT Stuttgart
+ 2012-2013, Benjamin Bechtel
2009, SAGA User Group Assoc.
+ 2008, Benni Bechtel
+ Luca Piras
Victor Olaya
License: GPL-2+
+Files: saga-gis/src/tools/imagery/imagery_isocluster/MLB_Interface.cpp
+ saga-gis/src/tools/imagery/imagery_isocluster/cluster_isodata.cpp
+Copyright: 2016, Olaf Conrad
+License: GPL-3+
+
Files: saga-gis/src/tools/imagery/imagery_maxent/me.cpp
saga-gis/src/tools/imagery/imagery_maxent/me.h
Copyright: 2003, Dekang Lin <lindek at cs.ualberta.ca>
@@ -165,11 +171,6 @@ Copyright: 2000-2005, Liam Girdwood
Comment: Contains code modified from libnova-0.12, grass
License: GPL-2+
-Files: saga-gis/src/tools/io/io_riegl_rdb/rapidjson/*
-Copyright: Copyright (C) 2011-2014 Milo Yip
-License: Expat
-
-
Files: saga-gis/src/tools/io/*
Copyright: 2003-2018, Olaf Conrad
2009-2014, Volker Wichmann
@@ -207,6 +208,16 @@ License: e00compr
profits or consequential damages, arising out of the use of the
Software.
+Files: saga-gis/src/tools/io/io_riegl_rdb/rapidjson/*
+Copyright: 2015, Milo Yip
+ 2015, THL A29 Limited, a Tencent company
+License: Expat
+
+Files: saga-gis/src/tools/io/io_riegl_rdb/rapidjson/msinttypes/inttypes.h
+ saga-gis/src/tools/io/io_riegl_rdb/rapidjson/msinttypes/stdint.h
+Copyright: 2006-2013, Alexander Chemeris
+License: BSD-3-clause
+
Files: saga-gis/src/tools/pointcloud/*
Copyright: 2003-2009, Olaf Conrad
2012, Magnus Bremer
@@ -307,6 +318,21 @@ License: GPL-2+
On Debian systems, the complete text of version 2 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
License: LGPL-2.1
This library is free software; you can redistribute
it and/or modify it under the terms of the GNU Lesser
@@ -373,6 +399,32 @@ License: BSD-2-clause
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the product nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
License: BSL-1.0
Boost Software License - Version 1.0 - August 17th, 2003
.
=====================================
debian/rules
=====================================
@@ -10,7 +10,7 @@ include /usr/share/dpkg/pkg-info.mk
UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
%:
- dh $@ --buildsystem=cmake --sourcedirectory=saga-gis
+ dh $@ --with python3 --buildsystem=cmake --sourcedirectory=saga-gis
override_dh_clean:
dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
@@ -32,3 +32,13 @@ override_dh_auto_install:
# Remove executable bit from resource files
chmod -x debian/*/usr/share/saga/*.*
+
+ # Explicitly remove files not to be installed
+ find $(CURDIR)/debian/tmp/usr/lib -name "*.pyc" -delete
+ find $(CURDIR)/debian/tmp/usr/lib -name "*.pyo" -delete
+
+override_dh_python3:
+ dh_python3 --no-ext-rename
+
+override_dh_makeshlibs:
+ dh_makeshlibs -Xpython3-saga
=====================================
debian/saga-common.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# It's a data file
+package-contains-documentation-outside-usr-share-doc usr/share/saga/saga_tip.txt
+
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/7cb63e76a9610759b80b0d57ed60fa194d2e417f...c288d7d1f535dc664112cf0745c78ecaf78129a5
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/7cb63e76a9610759b80b0d57ed60fa194d2e417f...c288d7d1f535dc664112cf0745c78ecaf78129a5
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/20220426/f878cc3b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list