[Git][debian-gis-team/jeolib-miallib][master] 3 commits: Fix control file format.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Tue Jul 2 08:06:56 BST 2024



Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-miallib


Commits:
90d7f071 by Bas Couwenberg at 2024-07-02T08:58:57+02:00
Fix control file format.

- - - - -
0b78d1fc by Bas Couwenberg at 2024-07-02T09:03:50+02:00
Fix copyright format.

- - - - -
69edc4da by Bas Couwenberg at 2024-07-02T09:06:07+02:00
Align paths.

- - - - -


3 changed files:

- debian/control
- debian/copyright
- debian/libmiallib-dev.install


Changes:

=====================================
debian/control
=====================================
@@ -1,37 +1,36 @@
 Source: jeolib-miallib
-Section: libs
-Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Rules-Requires-Root: no
-Build-Depends:
- debhelper-compat (= 13)
- ,cmake
- ,libgsl-dev
- ,libfann-dev
- ,libgeotiff-dev
- ,libfftw3-dev
- ,libproj-dev
- ,libjsoncpp-dev
- ,libgdal-dev
- ,libssl-dev
- ,swig
- ,uthash-dev
- ,libopenblas-dev
- ,libshp-dev
- ,libopenblas-dev
- ,pkgconf
+Section: libs
+Priority: optional
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               libfann-dev,
+               libfftw3-dev,
+               libgdal-dev,
+               libgeotiff-dev,
+               libgsl-dev,
+               libjsoncpp-dev,
+               libopenblas-dev,
+               libproj-dev,
+               libshp-dev,
+               libssl-dev,
+               pkgconf,
+               swig,
+               uthash-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/jeolib-miallib
 Vcs-Git: https://salsa.debian.org/debian-gis-team/jeolib-miallib.git
 Homepage: https://github.com/ec-jrc/jeolib-miallib
+Rules-Requires-Root: no
 
 Package: libmiallib-dev
-Section: libdevel
 Architecture: any
 Multi-Arch: same
+Section: libdevel
+Depends: libmiallib1 (= ${binary:Version}),
+         ${misc:Depends}
 Recommends: pkgconf
-Depends: libmiallib1 (= ${binary:Version}), ${misc:Depends}
 Description: JRC morphological and image processing library - Development files
  Miallib is a C library including image processing and 
  mathematical morphology algorithms used by Join Research Center
@@ -44,7 +43,8 @@ Description: JRC morphological and image processing library - Development files
 Package: libmiallib1
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: JRC morphological and image processing library
  Miallib is a C library including image processing and 
  mathematical morphology algorithms used by Join Research Center


=====================================
debian/copyright
=====================================
@@ -1,16 +1,68 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://github.com/ec-jrc/jeolib-miallib
 Upstream-Name: jeolib-mialib
 Upstream-Contact: Pierre Soille
+Source: https://github.com/ec-jrc/jeolib-miallib
 
 Files: *
-Copyright:
-  2000-2020, European Union (Joint Research Centre)
-License: GPL-3.0+
+Copyright: 2000-2020, European Union (Joint Research Centre)
+License: GPL-3+
 
 Files: core/doc/doxy2swig.py
 Copyright: Prabhu Ramachandran
-           2015, Michael Thon
+     2015, Michael Thon
+License: BSD-2-clause
+
+Files: CMakeLists.txt
+       core/c/*
+Copyright: 2000-2023, European Union (Joint Research Centre).
+                2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink.
+                2000, Pierre Soille.
+License: GPL-3+
+
+Files: core/c/uswilk.c
+Copyright: 2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink
+           2000, Arnold Meijster, Michael Wilkinson
+License: GPL-3+
+
+Files: core/c/chull.c
+Copyright: 2001, softSurfer (www.softsurfer.com)
+License: liberal
+ This code may be freely used and modified for any purpose
+ providing that this copyright notice is included with it.
+ SoftSurfer makes no warranty for this code, and cannot be held
+ liable for any real or imagined damage resulting from its use.
+ Users of this code must verify correctness for their application.
+
+Files: cmake/modules/FindPROJ.cmake
+Copyright: 2009, Mateusz Loskot <mateusz at loskot.net>
+           2015, NextGIS <info at nextgis.com>
+           2018, Hiroshi Miura
+License: BSD-3-clause
+
+Files: cmake/modules/FindGeoTIFF.cmake
+Copyright: 2005-2019, Centre National d'Etudes Spatiales (CNES)
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2024, Francesco Paolo Lovergine <frankie at debian.org>
+License: GPL-3+
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License can
+ be found in `/usr/share/common-licenses/Apache-2.0'.
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -33,35 +85,6 @@ License: BSD-2-clause
  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.
 
-Files:
- CMakeLists.txt
- core/c/*
-Copyright: 
- 2000-2023, European Union (Joint Research Centre).
- 2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink.
- 2000- Pierre Soille.
-License: GPL-3.0+
-
-Files: core/c/uswilk.c
-Copyright: 
-  2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink
-  2000, Arnold Meijster, Michael Wilkinson
-License: GPL-3.0+
-
-Files: core/c/chull.c
-Copyright: 2001, softSurfer (www.softsurfer.com)
-License: liberal
- This code may be freely used and modified for any purpose
- providing that this copyright notice is included with it.
- SoftSurfer makes no warranty for this code, and cannot be held
- liable for any real or imagined damage resulting from its use.
- Users of this code must verify correctness for their application.
-
-Files: cmake/modules/FindPROJ.cmake
-Copyright: 
-  2009, Mateusz Loskot <mateusz at loskot.net>
-  2015, NextGIS <info at nextgis.com>
-  2018, Hiroshi Miura
 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:
@@ -89,31 +112,7 @@ License: BSD-3-clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: cmake/modules/FindGeoTIFF.cmake
-Copyright: 2005-2019 Centre National d'Etudes Spatiales (CNES)
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
-Comment: On Debian systems, the complete text of the Apache License can 
- be found in `/usr/share/common-licenses/Apache-2.0'.
-
-Files:
- debian/*
-Copyright:
- 2024 Francesco Paolo Lovergine <frankie at debian.org>
-License: GPL-3.0+
-
-License: GPL-3.0+
+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
@@ -126,7 +125,6 @@ License: GPL-3.0+
  .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <https://www.gnu.org/licenses/>.
-Comment:
+ .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-


=====================================
debian/libmiallib-dev.install
=====================================
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.so usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/lib*.so              usr/lib/${DEB_HOST_MULTIARCH}
 usr/lib/pkgconfig/miallib.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 usr/lib/*/cmake/miallib/miallib-config.cmake
 usr/lib/*/cmake/miallib/miallib-config-version.cmake



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/f1760fd8c98e329b5801aa85d8e28c0655cea47f...69edc4da11781321203fec4d492ebc40adc9caff

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/f1760fd8c98e329b5801aa85d8e28c0655cea47f...69edc4da11781321203fec4d492ebc40adc9caff
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/20240702/8a0948b1/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list