Bas Couwenberg pushed to branch master at Debian GIS Project / qgis
Commits:
f94ed902 by Bas Couwenberg at 2023-08-13T12:03:01+02:00
Use execute_after instead of override in rules file.
- - - - -
2fc7103a by Bas Couwenberg at 2023-08-13T14:29:22+02:00
Use mktemp for crssync temp dir.
- - - - -
4 changed files:
- debian/changelog
- + debian/clean
- debian/qgis-providers.postinst
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ qgis (3.28.9+dfsg-2) UNRELEASED; urgency=medium
* Set HOME=/tmp for crssync in qgis-providers.postinst.
(closes: #1042725)
+ * Use execute_after instead of override in rules file.
-- Bas Couwenberg <[email protected]> Mon, 31 Jul 2023 10:04:03 +0200
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+qgis.bin.1
=====================================
debian/qgis-providers.postinst
=====================================
@@ -3,7 +3,9 @@ set -e
if [ "$1" = "triggered" ] || [ "$1" = "configure" ]; then
if [ -w /usr/share/qgis/resources/srs.db ] && [ -x
/usr/lib/qgis/crssync ]; then
- HOME=/tmp XDG_DATA_HOME="" XDG_CONFIG_HOME="" XDG_STATE_HOME=""
XDG_CACHE_HOME="" /usr/lib/qgis/crssync
+ TEMPDIR=$(mktemp -d)
+ HOME="${TEMPDIR}" XDG_DATA_HOME="" XDG_CONFIG_HOME=""
XDG_STATE_HOME="" XDG_CACHE_HOME="" /usr/lib/qgis/crssync
+ rm -rf "${TEMPDIR}"
fi
fi
=====================================
debian/rules
=====================================
@@ -135,9 +135,7 @@ endif
%:
dh $@ --with pkgkde_symbolshelper,python3
--builddirectory=$(QGIS_BUILDDIR) --buildsystem=cmake+ninja
-override_dh_clean:
- dh_clean qgis.bin.1
-
+execute_after_dh_clean:
-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/
override_dh_auto_configure:
@@ -146,9 +144,7 @@ override_dh_auto_configure:
override_dh_auto_test:
@echo Skipping tests.
-override_dh_auto_install:
- dh_auto_install
-
+execute_after_dh_auto_install:
# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
View it on GitLab:
https://salsa.debian.org/debian-gis-team/qgis/-/compare/e2ccc469f043a1fc9dbc922d244708955ef9b53e...2fc7103a8891d05f2286789d44cd9e29e4682be3
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/qgis/-/compare/e2ccc469f043a1fc9dbc922d244708955ef9b53e...2fc7103a8891d05f2286789d44cd9e29e4682be3
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
