Bas Couwenberg pushed to branch experimental at Debian GIS Project / grass


Commits:
19952548 by Bas Couwenberg at 2022-01-21T07:22:22+01:00
Update upstream branch in gbp.conf.

- - - - -
32183b5b by Bas Couwenberg at 2022-01-21T07:28:33+01:00
New upstream version 7.8.7~rc1
- - - - -
fdc642af by Bas Couwenberg at 2022-01-21T07:32:32+01:00
Update upstream source from tag 'upstream/7.8.7_rc1'

Update to upstream version '7.8.7~rc1'
with Debian dir 0eaeb4a676d814c5a5aed893bced3e3ad541c4b5
- - - - -
1656d3e1 by Bas Couwenberg at 2022-01-21T07:44:51+01:00
New upstream release candidate.

- - - - -
c1d530fd by Bas Couwenberg at 2022-01-21T07:45:02+01:00
Update copyright file.

- - - - -
8e569bd2 by Bas Couwenberg at 2022-01-21T08:47:31+01:00
Update lintian overrides.

- - - - -
f4268c8c by Bas Couwenberg at 2022-01-21T08:47:31+01:00
Set distribution to experimental.

- - - - -
4264ccc6 by Bas Couwenberg at 2022-02-23T18:44:01+01:00
New upstream version 7.8.7
- - - - -
bdee0480 by Bas Couwenberg at 2022-02-23T18:47:45+01:00
Update upstream source from tag 'upstream/7.8.7'

Update to upstream version '7.8.7'
with Debian dir f0e630045254ac7d32d1c039f133c1baf0f046a7
- - - - -
4e446e94 by Bas Couwenberg at 2022-02-23T18:49:55+01:00
New upstream release.

- - - - -
cb5440cd by Bas Couwenberg at 2022-02-23T19:03:12+01:00
Drop pdal support.

- - - - -
46237fca by Bas Couwenberg at 2022-02-23T19:03:24+01:00
Set distribution to unstable.

- - - - -
489c5d89 by Bas Couwenberg at 2022-02-24T16:04:30+01:00
Simplify dh overrides.

- - - - -
f77b2d58 by Bas Couwenberg at 2022-02-24T16:11:24+01:00
Merge tag 'debian/7.8.7-1' into experimental

releasing package grass version 7.8.7-1

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/grass-core.lintian-overrides
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -7,9 +7,26 @@ grass (8.0.1~rc1-1) UNRELEASED; urgency=medium
   * Use usr/bin/grass instead of usr/bin/grass<XY>.
   * Update install files for tools to utils renaming.
   * Update lintian overrides.
+  * Simplify dh overrides.
 
  -- Bas Couwenberg <[email protected]>  Sat, 12 Feb 2022 18:30:16 +0100
 
+grass (7.8.7-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop pdal support.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <[email protected]>  Wed, 23 Feb 2022 18:50:44 +0100
+
+grass (7.8.7~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Update copyright file.
+  * Update lintian overrides.
+
+ -- Bas Couwenberg <[email protected]>  Fri, 21 Jan 2022 07:45:47 +0100
+
 grass (7.8.6-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -25,7 +25,6 @@ Build-Depends: bison,
        default-libmysqlclient-dev,
                libncurses5-dev,
                libnetcdf-dev,
-               libpdal-dev,
                libpng-dev,
                libpq-dev,
                libproj-dev,


=====================================
debian/grass-core.lintian-overrides
=====================================
@@ -23,6 +23,3 @@ package-contains-empty-directory 
usr/lib/grass*/demolocation/PERMANENT/*
 # Not a problem
 library-not-linked-against-libc usr/lib/grass*/lib/libgrass_dbstubs*.so
 
-# False positive, part of NormalX, NormalY, NormalZ
-spelling-error-in-binary usr/lib/grass*/bin/r.in.pdal NormalY Normally
-


=====================================
debian/rules
=====================================
@@ -49,7 +49,7 @@ templates:
        dh $@ --with python3
 
 override_dh_clean:
-       dh_clean build-arch-stamp install-arch-stamp 
debian/grass-gui.image-file-in-usr-lib.list
+       dh_clean debian/grass-gui.image-file-in-usr-lib.list
 
        $(RM) lib/proj/nad2bin
        $(RM) utils/timer/main.o
@@ -106,7 +106,6 @@ override_dh_auto_configure: templates
                     --with-nls \
                     --with-odbc \
                     --with-openmp \
-                    --with-pdal \
                     --with-postgres \
                     --with-postgres-includes=$(shell pg_config --includedir) \
                     --with-proj-share=/usr/share/proj \
@@ -117,15 +116,10 @@ override_dh_auto_configure: templates
                     --with-x \
                     --with-zstd
 
-# This target generates arch-dep stuff, unfortunately most doc requires 
working bins to
-# be properly generated...
-override_dh_auto_build-arch: build-arch-stamp
-build-arch-stamp:
+override_dh_auto_build:
        dh_auto_build
        chmod 755 debian/fixpaths.sh
-       touch $@
 
-override_dh_auto_build-indep: build-arch-stamp
        # generate the Programmers' manual (in HTML)
        $(MAKE) htmldocs-single
 
@@ -134,8 +128,7 @@ override_dh_auto_build-indep: build-arch-stamp
        ##      optipng -o5 $$file ; \
        ##done
 
-override_dh_auto_install-arch: install-arch-stamp
-install-arch-stamp:
+override_dh_auto_install:
        # install grass core into debian/tmp
        dh_auto_install -- \
                INST_DIR=/usr/lib/$(BASE_NAME) \
@@ -227,29 +220,23 @@ install-arch-stamp:
        # Remove empty files
        find debian/tmp/ -type f -empty -name "class_graphical*" -print -delete
 
-       touch $@
-
-override_dh_auto_install-indep: install-arch-stamp
        install -m 644 -d debian/tmp
        install -m 644 -d debian/tmp/programming-manual/html
        cp -r lib/html/* debian/tmp/programming-manual/html/
        rm -f debian/tmp/programming-manual/html/*.md5
 
-override_dh_install-arch:
+override_dh_install:
        # Strip binaries
        strip --strip-unneeded --remove-section=.comment --remove-section=.note 
debian/tmp/usr/lib/$(BASE_NAME)/bin/r.in.png
        strip --strip-unneeded --remove-section=.comment --remove-section=.note 
debian/tmp/usr/lib/$(BASE_NAME)/bin/r.out.png
 
-       dh_install --arch
+       dh_install
 
        # delete duplicated grass-gui stuff from grass-core package
        for COMPONENT in gui wxpython; do \
                rm -rf 
debian/$(PKG_NAME)-core/usr/lib/$(BASE_NAME)/$$COMPONENT; \
        done
 
-override_dh_install-indep:
-       dh_install --indep
-
 override_dh_installchangelogs:
        dh_installchangelogs CHANGES
 



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/grass/-/compare/1d56e5e2a7dfc77da16832d4d9bdf5a79e561717...f77b2d588480ab82f769467ab2d863d689d3b329

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/grass/-/compare/1d56e5e2a7dfc77da16832d4d9bdf5a79e561717...f77b2d588480ab82f769467ab2d863d689d3b329
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to