[Git][debian-gis-team/stactools][master] 3 commits: Use standalone license paragraphs in d/copyright

Antonio Valentino (@antonio.valentino) gitlab at salsa.debian.org
Sat Nov 25 20:04:34 GMT 2023



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


Commits:
4bfc3216 by Antonio Valentino at 2023-11-25T19:57:42+00:00
Use standalone license paragraphs in d/copyright

- - - - -
e1385e1b by Antonio Valentino at 2023-11-25T19:59:19+00:00
Sort dependencies

- - - - -
d6f716b3 by Antonio Valentino at 2023-11-25T20:02:22+00:00
Override dh_python3

- - - - -


3 changed files:

- debian/control
- debian/copyright
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -66,9 +66,9 @@ Description: ${source:Synopsis} (documentation)
 Package: stactools
 Section: utils
 Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         python3-stactools (= ${source:Version})
+Depends: python3-stactools (= ${source:Version}),
+         ${misc:Depends},
+         ${python3:Depends}
 Suggests: python-stactools-doc
 Description: ${source:Synopsis} (CLI)
  ${source:Extended-Description}


=====================================
debian/copyright
=====================================
@@ -29,6 +29,56 @@ Files: tests/data-files/training/acc/665946-labels/665946-labels.json
        tests/data-files/training/ptn/abe1a3-labels/abe1a3-labels.json
        tests/data-files/training/ptn/f49f31-labels/f49f31-labels.json
 Copyright: 2020-2023, Azavea
+License: ODbL-1.0
+
+Files: tests/data-files/training/acc/665946/665946.json
+       tests/data-files/training/acc/a42435/a42435.json
+       tests/data-files/training/acc/ca041a/ca041a.json
+       tests/data-files/training/acc/d41d81/d41d81.json
+       tests/data-files/training/dar/353093/353093.json
+       tests/data-files/training/dar/a017f9/a017f9.json
+       tests/data-files/training/dar/b15fce/b15fce.json
+       tests/data-files/training/kam/4e7c7f/4e7c7f.json
+       tests/data-files/training/mon/207cc7/207cc7.json
+       tests/data-files/training/mon/401175/401175.json
+       tests/data-files/training/mon/493701/493701.json
+       tests/data-files/training/mon/f15272/f15272.json
+       tests/data-files/training/nia/825a50/825a50.json
+       tests/data-files/training/ptn/abe1a3/abe1a3.json
+       tests/data-files/training/ptn/f49f31/f49f31.json
+       tests/data-files/training/znz/collection.json
+Copyright: 2020-2023, Azavea
+License: CC-BY-4.0
+
+Files: tests/data-files/planet-disaster-v1.0.0-beta.2/collection.json
+       tests/data-files/planet-disaster/collection.json
+Copyright: 2020-2023, Azavea
+License: CC-BY-SA-4.0
+
+Files: tests/data-files/core/simple-item.json
+Copyright: 2020-2023, Azavea
+License: PDDL-1.0
+
+Files: debian/*
+Copyright: 2023, Antonio Valentino <antonio.valentino at tiscali.it>
+License: Apache-2.0
+
+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,
+ Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
+
 License: ODbL-1.0
  ## ODC Open Database License (ODbL)
  .
@@ -570,23 +620,6 @@ License: ODbL-1.0
  these additional rights are granted in this License in order to meet the
  terms of this License.
 
-Files: tests/data-files/training/acc/665946/665946.json
-       tests/data-files/training/acc/a42435/a42435.json
-       tests/data-files/training/acc/ca041a/ca041a.json
-       tests/data-files/training/acc/d41d81/d41d81.json
-       tests/data-files/training/dar/353093/353093.json
-       tests/data-files/training/dar/a017f9/a017f9.json
-       tests/data-files/training/dar/b15fce/b15fce.json
-       tests/data-files/training/kam/4e7c7f/4e7c7f.json
-       tests/data-files/training/mon/207cc7/207cc7.json
-       tests/data-files/training/mon/401175/401175.json
-       tests/data-files/training/mon/493701/493701.json
-       tests/data-files/training/mon/f15272/f15272.json
-       tests/data-files/training/nia/825a50/825a50.json
-       tests/data-files/training/ptn/abe1a3/abe1a3.json
-       tests/data-files/training/ptn/f49f31/f49f31.json
-       tests/data-files/training/znz/collection.json
-Copyright: 2020-2023, Azavea
 License: CC-BY-4.0
  Creative Commons Attribution 4.0 International Public License
  .
@@ -898,9 +931,6 @@ License: CC-BY-4.0
      that apply to the Licensor or You, including from the legal
      processes of any jurisdiction or authority.
 
-Files: tests/data-files/planet-disaster-v1.0.0-beta.2/collection.json
-       tests/data-files/planet-disaster/collection.json
-Copyright: 2020-2023, Azavea
 License: CC-BY-SA-4.0
  Attribution-ShareAlike 4.0 International
  .
@@ -1320,8 +1350,6 @@ License: CC-BY-SA-4.0
  .
  Creative Commons may be contacted at creativecommons.org.
 
-Files: tests/data-files/core/simple-item.json
-Copyright: 2020-2023, Azavea
 License: PDDL-1.0
  Public Domain Dedication and License (PDDL)
  .
@@ -1631,23 +1659,3 @@ License: PDDL-1.0
  under applicable law in the relevant jurisdiction includes additional
  rights not waived or granted under this Document, these additional rights
  are included in this Document in order to meet the intent of this Document.
-
-Files: debian/*
-Copyright: 2023, Antonio Valentino <antonio.valentino at tiscali.it>
-License: Apache-2.0
-
-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,
- Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.


=====================================
debian/rules
=====================================
@@ -22,3 +22,6 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 	sed -i 's%https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js%file:///usr/share/javascript/requirejs/require.min.js%' \
 	`find $(CURDIR)/.pybuild/docs/html -type f -name '*.html'`
 endif
+
+override_dh_python3:
+	dh_python3 -N python-stactools-doc



View it on GitLab: https://salsa.debian.org/debian-gis-team/stactools/-/compare/3a1832345f436a9b7fccf1fb6be86d414c023eda...d6f716b3dc2a35c66436e3dc57fc46ca8eb302b3

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/stactools/-/compare/3a1832345f436a9b7fccf1fb6be86d414c023eda...d6f716b3dc2a35c66436e3dc57fc46ca8eb302b3
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/20231125/add84ac5/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list