[Git][debian-gis-team/qgis][experimental] 5 commits: Drop rules and install files for unsupported oracle provider.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Feb 18 20:11:55 GMT 2023
Bas Couwenberg pushed to branch experimental at Debian GIS Project / qgis
Commits:
3b02234f by Bas Couwenberg at 2023-02-18T13:52:56+01:00
Drop rules and install files for unsupported oracle provider.
- - - - -
5c90ef64 by Bas Couwenberg at 2023-02-18T14:04:59+01:00
Drop rules for unused test target.
- - - - -
124f5d25 by Bas Couwenberg at 2023-02-18T14:06:10+01:00
Use cmake+ninja buildsystem.
- - - - -
3cf3cf20 by Bas Couwenberg at 2023-02-18T15:15:15+01:00
Use dh_python3 to fix python3 shebang instead of a patch.
- - - - -
066b00cb by Bas Couwenberg at 2023-02-18T15:34:06+01:00
Append space to ninja status output.
- - - - -
5 changed files:
- debian/changelog
- − debian/patches/python-env.patch
- debian/patches/series
- − debian/qgis-oracle-provider.install
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -6,6 +6,11 @@ qgis (3.28.3+dfsg-1) UNRELEASED; urgency=medium
* Update copyright file.
* Update symbols for amd64.
* Update lintian overrides.
+ * Drop rules and install files for unsupported oracle provider.
+ * Drop rules for unused test target.
+ * Use cmake+ninja buildsystem.
+ * Use dh_python3 to fix python3 shebang instead of a patch.
+ * Append space to ninja status output.
-- Bas Couwenberg <sebastic at debian.org> Fri, 17 Feb 2023 11:48:51 +0100
=====================================
debian/patches/python-env.patch deleted
=====================================
@@ -1,157 +0,0 @@
-Description: Use /usr/bin/python<VERSION> explicitly
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/729495
-Forwarded: not-needed
-
---- a/src/plugins/grass/qgis_grass_test.py
-+++ b/src/plugins/grass/qgis_grass_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- # -----------------------------------------------------------
- #
---- a/src/plugins/grass/scripts/db.connect-login.pg.py
-+++ b/src/plugins/grass/scripts/db.connect-login.pg.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/src/plugins/grass/scripts/qgis.v.kernel.rast.py
-+++ b/src/plugins/grass/scripts/qgis.v.kernel.rast.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/src/plugins/grass/scripts/r.external.all.py
-+++ b/src/plugins/grass/scripts/r.external.all.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/src/plugins/grass/scripts/v.out.ogr.pg.py
-+++ b/src/plugins/grass/scripts/v.out.ogr.pg.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/scripts/random_vector.py
-+++ b/scripts/random_vector.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
-
- # Generates random shapefile which may be used for benchmarks
-
---- a/scripts/widgets_tree.py
-+++ b/scripts/widgets_tree.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/scripts/generate_test_mask_image.py
-+++ b/scripts/generate_test_mask_image.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/src/plugins/grass/scripts/qgis.v.upgrade.py
-+++ b/src/plugins/grass/scripts/qgis.v.upgrade.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/scripts/2to3
-+++ b/scripts/2to3
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- import sys, os
-
- from lib2to3.main import main
---- a/scripts/appinfo2ui.py
-+++ b/scripts/appinfo2ui.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- """
- /***************************************************************************
---- a/scripts/mkuidefaults.py
-+++ b/scripts/mkuidefaults.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/scripts/parse_dash_results.py
-+++ b/scripts/parse_dash_results.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
---- a/scripts/symbol_xml2db.py
-+++ b/scripts/symbol_xml2db.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- """
- /***************************************************************************
- symbol_xml2db.py
---- a/scripts/ts2appinfo.py
-+++ b/scripts/ts2appinfo.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- """
- /***************************************************************************
---- a/src/plugins/grass/scripts/t.rast.what.qgis.py
-+++ b/src/plugins/grass/scripts/t.rast.what.qgis.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- ############################################################################
- #
---- a/src/plugins/grass/scripts/v.class.mlpy.qgis.py
-+++ b/src/plugins/grass/scripts/v.class.mlpy.qgis.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- ############################################################################
- #
---- a/tests/src/python/qgis_wrapped_server.py
-+++ b/tests/src/python/qgis_wrapped_server.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
- """
- QGIS Server HTTP wrapper for testing purposes
---- a/scripts/dump_babel_formats.py
-+++ b/scripts/dump_babel_formats.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # -*- coding: utf-8 -*-
-
- """
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-python-env.patch
developersmap-use-debian-package.patch
exclude-elvensword-resources.patch
exclude-cc-by-nc-resources.patch
=====================================
debian/qgis-oracle-provider.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/qgis/plugins/libprovider_oracle.so
-usr/lib/*/qt?/plugins/sqldrivers/libqsqlocispatial.so
=====================================
debian/rules
=====================================
@@ -19,8 +19,6 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-DEB_TEST_TARGET ?= Experimental
-
QGIS_BUILDDIR ?= debian/build
export QT_SELECT=5
@@ -33,11 +31,6 @@ else
DISTRIBUTION := $(DIST)
endif
-ifneq (,$(findstring -oracle,$(DISTRIBUTION)))
- DISTRIBUTION := $(subst -oracle,,$(DISTRIBUTION))
- WITH_ORACLE=1
-endif
-
QT_PLUGINS_DIR = lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"bullseye focal jammy"))
@@ -46,9 +39,6 @@ endif
DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)
-# Don't build tests, running them requires network
-DEB_BUILD_OPTIONS += nocheck
-
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/ip' CMakeLists.txt)
QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/ip' CMakeLists.txt)
QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/ip' CMakeLists.txt)
@@ -58,23 +48,7 @@ GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
GRASSABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/'))
# Include percentage of started edges
-export NINJA_STATUS=[%f/%t %p]
-
-ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
- NINJA_OPTS += -v
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
- NINJA_OPTS += -j$(NUMJOBS)
-endif
-
-ifeq (,$(DISPLAY))
-TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" ninja $(NINJA_OPTS)
-else
-TESTMAKE=ninja $(NINJA_OPTS)
-endif
+export NINJA_STATUS=[%f/%t %p]
CMAKE_OPTS := \
-G Ninja \
@@ -120,31 +94,10 @@ ifneq (0,$(.SHELLSTATUS))
-DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so
endif
-ifneq (,$(WITH_ORACLE))
-ifeq ($(DEB_BUILD_ARCH),amd64)
- ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client64/
- ORACLE_LIBDIR=/usr/lib/oracle/18.5/client64/lib/
-endif
-ifeq ($(DEB_BUILD_ARCH),i386)
- ORACLE_INCLUDEDIR=/usr/include/oracle/18.5/client/
- ORACLE_LIBDIR=/usr/lib/oracle/18.5/client/lib/
-endif
- CMAKE_OPTS += \
- -DWITH_ORACLE=TRUE \
- -DORACLE_LIBDIR=$(ORACLE_LIBDIR) \
- -DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
-endif
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CMAKE_OPTS += -DCMAKE_BUILD_TYPE=Debug
endif
-ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- CMAKE_OPTS += -DENABLE_TESTS=FALSE
-else
- CMAKE_OPTS += -DENABLE_TESTS=TRUE -DDART_TESTING_TIMEOUT=60
-endif
-
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -178,7 +131,7 @@ ifeq ($(DEB_BUILD_ARCH),mips64el)
endif
%:
- dh $@ --with pkgkde_symbolshelper,python3 --builddirectory=$(QGIS_BUILDDIR)
+ dh $@ --with pkgkde_symbolshelper,python3 --builddirectory=$(QGIS_BUILDDIR) --buildsystem=cmake+ninja
override_dh_clean:
dh_clean qgis.bin.1
@@ -188,38 +141,11 @@ override_dh_clean:
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS)
-override_dh_auto_build:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Build
- ! grep -q "<Error>" $(QGIS_BUILDDIR)/Testing/$$(head -1 $(QGIS_BUILDDIR)/Testing/TAG)/Build.xml || { \
- cat $(QGIS_BUILDDIR)/Testing/Temporary/LastBuild_$$(head -1 $(QGIS_BUILDDIR)/Testing/TAG).log; \
- ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit; \
- false; }
-else
- ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR)
-endif
-
override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # Code to run the package test suite
- rm -f $(QGIS_BUILDDIR)/.error
- mkdir -p debian/tmp/locale/
- localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
- LOCPATH=$(CURDIR)/debian/tmp/locale/ \
- LC_ALL=en_US.UTF-8 \
- LD_LIBRARY_PATH=$(CURDIR)/$(QGIS_BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
- PATH=/usr/sbin:$(PATH) \
- $(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Test || touch $(QGIS_BUILDDIR)/.error
- # ignore submission errors
- -$(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)Submit
- # ignore the test outcome for now
- # ! [ -f $(QGIS_BUILDDIR)/.error ]
-else
@echo Skipping tests.
-endif
override_dh_auto_install:
- DESTDIR=$(CURDIR)/debian/tmp ninja $(NINJA_OPTS) -C $(QGIS_BUILDDIR) install
+ dh_auto_install
# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
@@ -284,25 +210,18 @@ override_dh_installmime:
dh_installmime -pqgis
override_dh_python3:
- dh_python3
- dh_python3 usr/share/qgis/grass/scripts
+ dh_python3 --shebang=/usr/bin/python3
+ dh_python3 --shebang=/usr/bin/python3 /usr/share/qgis/grass/scripts
+ dh_python3 --shebang=/usr/bin/python3 /usr/share/qgis/python
override_dh_compress:
dh_compress --exclude=pdf
override_dh_makeshlibs:
-ifneq (,$(WITH_ORACLE))
- dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -Xqgis-provider-oracle -- -c0 -v$(QGIS_VERSION)
-else
dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -- -c0 -v$(QGIS_VERSION)
-endif
override_dh_shlibdeps:
-ifneq (,$(WITH_ORACLE))
- dh_shlibdeps -l/usr/lib/$(GRASS)/lib -l$(ORACLE_LIBDIR)
-else
dh_shlibdeps -l/usr/lib/$(GRASS)/lib
-endif
override_dh_gencontrol:
dh_gencontrol -- -Vgrass:Depends="grass$(GRASSABI)"
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/aeb352a909ce13d8357808a7095515b6b23c2822...066b00cbcd962a0b6714964966555a633177c5df
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/compare/aeb352a909ce13d8357808a7095515b6b23c2822...066b00cbcd962a0b6714964966555a633177c5df
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/20230218/a225fde2/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list