[neon/forks/libgpgme/Neon/release] debian: sync more to salsa
Carlos De Maine
null at kde.org
Tue Jul 2 13:52:51 BST 2024
Git commit efb8eb6717fca5a837bf7cda424da600930697f9 by Carlos De Maine.
Committed on 02/07/2024 at 12:52.
Pushed by carlosdem into branch 'Neon/release'.
sync more to salsa
M +2 -81 debian/control
M +12 -25 debian/rules
https://invent.kde.org/neon/forks/libgpgme/-/commit/efb8eb6717fca5a837bf7cda424da600930697f9
diff --git a/debian/control b/debian/control
index 2f9d8132..f34c6e24 100644
--- a/debian/control
+++ b/debian/control
@@ -8,26 +8,15 @@ Build-Depends:
automake (>= 1.14),
debhelper-compat (= 13),
dh-python,
- doxygen,
dpkg-dev (>= 1.22.5),
gnupg-agent,
gnupg2 | gnupg (>= 2),
gpgsm,
- graphviz,
libassuan-dev (>= 2.4.2),
libgpg-error-dev (>= 1.36),
libpython3-all-dev,
pkgconf,
python3-all-dev:any,
- python3-build,
- python3-distlib,
- python3-distutils-extra,
- python3-installer,
- python3-pbr,
- python3-pyproject-hooks,
- python3-setuptools,
- python3-setuptools-scm,
- python3-setuptools-whl,
qtbase5-dev,
qt6-base-dev,
scdaemon,
@@ -117,18 +106,6 @@ Description: Python interface to the GPGME GnuPG encryption library (Python 3)
.
This is the official upstream Python 3 binding for GPGME.
-Package: lisp-gpg
-Architecture: any
-Section: lisp
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Description: Lisp interface to the GPGME GnuPG encryption library
- .
- This is the official upstream Lisp binding for GPGME.
-
-Package: libqgpgme15
Package: libqgpgme15t64
Provides:
${t64:Provides},
@@ -141,20 +118,7 @@ Multi-Arch: same
Depends:
${misc:Depends},
${shlibs:Depends},
-Description: library for GPGME integration with Qt5
- QGpgME is a library that provides GPGME integration with QEventLoop
- and some Qt datatypes (e.g. QByteArray).
- .
- This is the official upstream Qt binding for GPGME.
-
-Package: libqgpgme15-qt6
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Breaks: libqgpgme15 (<< ${source:Version}~ciBuild),
-Description: library for GPGME integration with Qt6
+Description: library for GPGME integration with Qt
QGpgME is a library that provides GPGME integration with QEventLoop
and some Qt datatypes (e.g. QByteArray).
.
@@ -195,8 +159,6 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
- libgpgmepp6 (= ${binary:Version}),
- libqgpgme15 (= ${binary:Version}),
libgpgmepp6t64 (= ${binary:Version}),
${misc:Depends},
Recommends:
@@ -223,47 +185,6 @@ Breaks:
libgpgmepp-dev (<< 1.23.2-1),
Replaces:
kdepimlibs5-dev,
-Description: C++ bindings for GPGME (development files)
- GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
- GnuPG project's GPGME (GnuPG Made Easy) library.
- .
- QGpgME is a library that provides GPGME integration with QEventLoop
- and some Qt datatypes (e.g. QByteArray).
- .
- This package contains the headers and other files needed to compile
- against either of these libraries.
-
-Package: libqgpgme-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends:
- libgpgmepp-dev (= ${binary:Version}),
- qtbase5-dev,
- ${misc:Depends},
-Breaks: libgpgmepp-dev (<< ${source:Version}~ciBuild),
-Description: Qt5 bindings for GPGME (development files)
- GpgME++ (aka GpgMEpp) is a C++ wrapper (or C++ bindings) for the
- GnuPG project's GPGME (GnuPG Made Easy) library.
- .
- QGpgME is a library that provides GPGME integration with QEventLoop
- and some Qt datatypes (e.g. QByteArray).
- .
- This package contains the headers and other files needed to compile
- against either of these libraries.
-
-Package: libqgpgme15-qt6-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends:
- libgpgmepp6 (= ${binary:Version}),
- libgpgmepp-dev (= ${binary:Version}),
- libqgpgme15-qt6 (= ${binary:Version}),
- qt6-base-dev,
- ${misc:Depends},
-Breaks: libgpgmepp-dev (<< ${source:Version}~ciBuild),
-Description: Qt6 bindings for GPGME (development files)
libgpgmepp-dev (<< 1.23.2-1),
libqgpgmeqt6-dev,
Recommends:
@@ -317,4 +238,4 @@ Description: C++ and Qt bindings for GPGME (documentation for developers)
and some Qt datatypes (e.g. QByteArray).
.
This package contains documentation for developers describing how to
- use these packages.
\ No newline at end of file
+ use these packages.
diff --git a/debian/rules b/debian/rules
index 63f3c1f8..d2afc7ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export QT_SELECT := qt5
include /usr/share/dpkg/architecture.mk
@@ -9,26 +10,15 @@ export _PYTHON_HOST_PLATFORM:=${DEB_HOST_ARCH_OS}-${DEB_HOST_ARCH}
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
export _PYTHON_SYSCONFIGDATA_NAME:=_sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}
endif
-export SETUPTOOLS_SCM_PRETEND_VERSION=$(DEB_VERSION_UPSTREAM)
%:
- dh $@ --with python3
-
-execute_after_dh_auto_clean:
- rm -rf build-qt6
- rm -rf build-qt5
+ dh $@ --builddirectory=build --with python3
override_dh_auto_configure:
- dh_auto_configure --builddirectory=build-qt6 -- --enable-static --enable-languages="python cpp qt6" --infodir=/usr/share/info
- dh_auto_configure --builddirectory=build-qt5 -- --enable-static --infodir=/usr/share/info
-
-override_dh_auto_build:
- dh_auto_build --builddirectory=build-qt6
- dh_auto_build --builddirectory=build-qt5
-
-override_dh_auto_install:
- dh_auto_install --builddirectory=build-qt6
- dh_auto_install --builddirectory=build-qt5
+ dh_auto_configure --builddirectory=build -- \
+ --enable-static \
+ --enable-languages="python cpp qt" \
+ --infodir=/usr/share/info
execute_after_dh_auto_configure-arch:
env -u QT_SELECT dh_auto_configure --builddirectory=build-qt6 -- \
@@ -38,7 +28,12 @@ execute_after_dh_auto_configure-arch:
override_dh_missing:
dh_missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ -Xgpgme-json
- dh_missing -X.la -Xinfo/dir -X.pyc -Xinstall_files.txt -X__pycache__ -Xgpgme-json
+
+override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ dh_auto_test
+ ./debian/tests/checky2106 || true
+endif
execute_after_dh_auto_test-arch:
ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
@@ -56,14 +51,6 @@ execute_after_dh_auto_install-arch:
override_dh_makeshlibs:
dh_makeshlibs -V
- dh_makeshlibs -V
override_dh_installdocs:
dh_installdocs -X.md5
- dh_installdocs -X.md5
-
-override_dh_auto_test:
-# dh_auto_test --no-parallel
-# dh_auto_test --no-parallel --builddirectory=build-Qt6
- .
- .
\ No newline at end of file
More information about the Neon-commits
mailing list