Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package libgwenhywfar In support of the Qt 4 removal efforts I wanted to remove the Qt 4 support library packages from libgwenhywfar (see #875012). But as the downstream dependency kmymoney took a bit longer to realize that buster will not ship a Qt 4 based version of kmymoney (see also my request at Nov 9th 2018 for an earlier upload to unstable in #874961), I couldn't do it as early as I wanted. Then, suddenly and more or less unexpectedly in the recent days, the kmymoney version based on Qt 5 became available in testing. For some reason I didn't get an immediate notification, but only realized this during my occasional package checks. Before we release buster, I would like to get some cleaned up version of libgwenhywfar into the release. These are the two major issues I want to see cleaned up, and that I consider this a low risk for the following reasons: * Binary packages libgwengui-qt4-0 and libgwengui-qt4-dev are removed. They don't have any reverse (build) dependencies left in buster. * The declared multiarch support for binary package libgwenhywfar-core-dev is reverted because it is broken (see #906560). A binary package not supporting multiarch seems to be better than a binary package with broken multiarch support. The following additional cosmetical changes in my opinion do not impact the functionality of the built binary packages at all: * Fix of a spelling mistake in an older debian/changelog entry * Added/updated meta data in debian/control and debian/watch * Integration with Salsa CI by adding debian/gitlab-ci.yml unblock libgwenhywfar/4.20.0-9 Thanks for considering and Best regards, Micha
diff -Nru libgwenhywfar-4.20.0/debian/changelog libgwenhywfar-4.20.0/debian/changelog --- libgwenhywfar-4.20.0/debian/changelog 2018-08-18 23:39:43.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/changelog 2019-03-06 22:05:49.000000000 +0100 @@ -1,9 +1,45 @@ +libgwenhywfar (4.20.0-9) unstable; urgency=medium + + * Drop binary packages libgwengui-qt4-0 and libgwengui-qt4-dev + now also in Debian unstable (Closes: #875012, LP: #1757732). + * Fix spelling mistake in debian/changelog entry for 4.20.0-8. + * debian/control: + - Add upstream homepage. + - Bump standards version to 4.3.0 (no changes needed). + - Vcs-Git: track Git branch 'master' again. + * debian/watch: Update to new upstream homepage. + * Revert attempts to make package libgwenhywfar-core-dev Multi-Arch: same + because it broke cross compiling (closes: #906560). This removes + multiarch_support_in_gwenhywfar-config_script.patch, removes the multiarch + hint and dependency on pkg-config from binary package + libgwenhywfar-core-dev. + * Integrate with Salsa CI by adding the file debian/gitlab-ci.yml. + + -- Micha Lenk <[email protected]> Wed, 06 Mar 2019 22:05:49 +0100 + +libgwenhywfar (4.20.0-8) experimental; urgency=medium + + * Merge changes from libgwenhywfar 4.20.0-7 (unstable) for upload to + experimental. + * Improve cross building: Do not use /usr/lib/<triplet>/qt5. + Thanks to Helmut Grohne <[email protected]> for providing the patch. + (Closes: #906543) + + -- Micha Lenk <[email protected]> Sat, 18 Aug 2018 23:51:31 +0200 + libgwenhywfar (4.20.0-7) unstable; urgency=medium * Fix a regression introduced in 4.20.0-5 that causes libaqbanking to FTBFS. -- Micha Lenk <[email protected]> Sat, 18 Aug 2018 23:39:43 +0200 +libgwenhywfar (4.20.0-6) experimental; urgency=medium + + * Merge changes from libgwenhywfar 4.20.0-5 (unstable) for upload to + experimental. + + -- Micha Lenk <[email protected]> Fri, 17 Aug 2018 15:35:48 +0200 + libgwenhywfar (4.20.0-5) unstable; urgency=medium * Fix pkgconfig's pkgincludedir variable by adding patch @@ -14,6 +50,14 @@ -- Micha Lenk <[email protected]> Fri, 17 Aug 2018 15:13:11 +0200 +libgwenhywfar (4.20.0-4) experimental; urgency=medium + + * Merge changes from libgwenhywfar 4.20.0-3 (unstable) for upload to + experimental. + * Vcs-Git: track Git branch 'experimental'. + + -- Micha Lenk <[email protected]> Thu, 16 Aug 2018 23:12:03 +0200 + libgwenhywfar (4.20.0-3) unstable; urgency=medium * Drop Gtk 2 GUI bindings. @@ -23,6 +67,13 @@ -- Micha Lenk <[email protected]> Thu, 16 Aug 2018 21:53:23 +0200 +libgwenhywfar (4.20.0-2) experimental; urgency=medium + + * Drop binary packages libgwengui-qt4-0 and libgwengui-qt4-dev + (Closes: #875012, LP: #1757732). + + -- Micha Lenk <[email protected]> Mon, 26 Mar 2018 20:27:07 +0200 + libgwenhywfar (4.20.0-1) unstable; urgency=medium * New upstream version 4.20.0 diff -Nru libgwenhywfar-4.20.0/debian/control libgwenhywfar-4.20.0/debian/control --- libgwenhywfar-4.20.0/debian/control 2018-08-18 23:38:25.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/control 2019-03-06 22:05:49.000000000 +0100 @@ -9,7 +9,6 @@ libgnutls28-dev, libssl-dev, libfox-1.6-dev, - libqt4-dev, qtbase5-dev, libqt5opengl5-dev, libgtk-3-dev, @@ -17,9 +16,10 @@ asciidoc, xmlto, pkg-config -Standards-Version: 4.2.0 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/aqbanking-team/pkg-libgwenhywfar Vcs-Git: https://salsa.debian.org/aqbanking-team/pkg-libgwenhywfar.git +Homepage: https://www.aquamaniac.de/rdm/projects/gwenhywfar Package: libgwenhywfar60-dev Section: libdevel @@ -28,7 +28,6 @@ Depends: libgwenhywfar-core-dev (= ${binary:Version}), libgwengui-fox16-dev (= ${binary:Version}), libgwengui-gtk3-dev (= ${binary:Version}), - libgwengui-qt4-dev (= ${binary:Version}), libgwengui-qt5-dev (= ${binary:Version}), gwenhywfar-tools (>= ${source:Version}), ${misc:Depends} Provides: libgwenhywfar-dev @@ -48,9 +47,8 @@ Replaces: libgwenhywfar60-dev (<< 4.15.3-3) Section: libdevel Architecture: any -Multi-Arch: same Depends: libgwenhywfar60 (= ${binary:Version}), libgwengui-cpp0 (= ${binary:Version}), - ${misc:Depends}, pkg-config + ${misc:Depends} Suggests: libgwenhywfar-doc Description: OS abstraction layer (core development files) Gwenhywfar allows porting of your software to different operating @@ -92,23 +90,6 @@ This package contains development files of the Gwenhywfar GUI implementation for GTK3. -Package: libgwengui-qt4-dev -Breaks: libgwenhywfar60-dev (<< 4.15.3-3) -Replaces: libgwenhywfar60-dev (<< 4.15.3-3) -Section: libdevel -Architecture: any -Multi-Arch: same -Depends: libgwenhywfar-core-dev (= ${binary:Version}), - libgwengui-qt4-0 (= ${binary:Version}), ${misc:Depends} -Description: Gwenhywfar GUI implementation for Qt 4 (development files) - Gwenhywfar allows porting of your software to different operating - systems like Linux, *BSD, Windows etc. It also provides some often - needed modules such as configuration file handling, simple XML file - parsing, IPC etc. - . - This package contains development files of the Gwenhywfar GUI implementation - for Qt 4. - Package: libgwengui-qt5-dev Breaks: libgwenhywfar60-dev (<< 4.15.3-3) Replaces: libgwenhywfar60-dev (<< 4.15.3-3) @@ -206,18 +187,6 @@ . This package contains a Gwenhywfar GUI implementation for the FOX Toolkit. -Package: libgwengui-qt4-0 -Architecture: any -Multi-Arch: same -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Gwenhywfar GUI implementation for Qt4 - Gwenhywfar allows porting of your software to different operating - systems like Linux, *BSD, Windows etc. It also provides some often - needed modules such as configuration file handling, simple XML file - parsing, IPC etc. - . - This package contains a Gwenhywfar GUI implementation for Qt4. - Package: libgwengui-qt5-0 Architecture: any Multi-Arch: same diff -Nru libgwenhywfar-4.20.0/debian/gitlab-ci.yml libgwenhywfar-4.20.0/debian/gitlab-ci.yml --- libgwenhywfar-4.20.0/debian/gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ libgwenhywfar-4.20.0/debian/gitlab-ci.yml 2019-03-06 22:00:47.000000000 +0100 @@ -0,0 +1,9 @@ +image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest + +build: + artifacts: + paths: + - "*.deb" + expire_in: 1 day + script: + - gitlab-ci-git-buildpackage-all diff -Nru libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.install libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.install --- libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.install 2018-08-18 23:38:25.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/*/libgwengui-qt4.so.* diff -Nru libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.shlibs libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.shlibs --- libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.shlibs 2018-08-18 23:38:25.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/libgwengui-qt4-0.shlibs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -libgwengui-qt4 0 libgwengui-qt4-0 diff -Nru libgwenhywfar-4.20.0/debian/libgwengui-qt4-dev.install libgwenhywfar-4.20.0/debian/libgwengui-qt4-dev.install --- libgwenhywfar-4.20.0/debian/libgwengui-qt4-dev.install 2018-08-18 23:38:25.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/libgwengui-qt4-dev.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -usr/include/gwenhywfar4/gwen-gui-qt4/* -usr/lib/*/libgwengui-qt4.so -usr/lib/*/cmake/gwengui-qt4-* -usr/lib/*/pkgconfig/gwengui-qt4.pc diff -Nru libgwenhywfar-4.20.0/debian/patches/multiarch_support_in_gwenhywfar-config_script.patch libgwenhywfar-4.20.0/debian/patches/multiarch_support_in_gwenhywfar-config_script.patch --- libgwenhywfar-4.20.0/debian/patches/multiarch_support_in_gwenhywfar-config_script.patch 2018-08-18 23:39:02.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/patches/multiarch_support_in_gwenhywfar-config_script.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -Author: Micha Lenk <[email protected]> -Description: Fix multi-arch support in gwenhywfar-config - Without this patch the libdir will contain the multi-arch triplet, which will - cause the script to vary its content based on the current target architecture. - But the content needs to be the same on all architectures if we want to mark - the package libgwenhywfar-core-dev as "Multi-Arch: same". - . - This patch does not need to get forwarded upstream, because it is unsafe to - assume calling pkg-config will always return the correct value when it is - built using a totally different build configuration not matching Debian's - policy requirements. - . - This patch requires patch fix_pkg-config_pkgincludedir.patch to work - correctly, otherwise `gwenhywfar-config --headers` returns a wrong path. -Forwarded: not-needed -Last-Update: 2018-08-17 - -diff --git a/gwenhywfar-config.in.in b/gwenhywfar-config.in.in -index be14e39..423752b 100644 ---- a/gwenhywfar-config.in.in -+++ b/gwenhywfar-config.in.in -@@ -6,26 +6,24 @@ exec_prefix=@exec_prefix@ - includedir=@includedir@ - bindir=@bindir@ - --libdir=@libdir@ -- - result="" - - for d in $*; do - case $d in - --includes) -- result="$result -I@gwenhywfar_headerdir@" -+ result="$result $(pkg-config --cflags-only-I gwenhywfar)" - ;; - --libraries) -- result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@" -+ result="$result $(pkg-config --libs gwenhywfar)" - ;; - --bindir) - result="$result @gwenhywfar_bindir@" - ;; - --headers) -- result="$result @gwenhywfar_headerdir@/gwenhywfar" -+ result="$result $(pkg-config --variable=pkgincludedir gwenhywfar)/gwenhywfar" - ;; - --plugins) -- result="$result @gwenhywfar_plugindir@" -+ result="$result $(pkg-config --variable=plugindir gwenhywfar)" - ;; - --vmajor) - result="$result @GWENHYWFAR_VERSION_MAJOR@" diff -Nru libgwenhywfar-4.20.0/debian/patches/series libgwenhywfar-4.20.0/debian/patches/series --- libgwenhywfar-4.20.0/debian/patches/series 2018-08-17 15:37:52.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/patches/series 2018-10-13 23:34:11.000000000 +0200 @@ -1,2 +1 @@ fix_pkg-config_pkgincludedir.patch -multiarch_support_in_gwenhywfar-config_script.patch diff -Nru libgwenhywfar-4.20.0/debian/rules libgwenhywfar-4.20.0/debian/rules --- libgwenhywfar-4.20.0/debian/rules 2018-08-18 23:38:25.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/rules 2019-03-06 22:01:45.000000000 +0100 @@ -10,15 +10,16 @@ DPKG_GENSYMBOLS_CHECK_LEVEL ?= 4 export DPKG_GENSYMBOLS_CHECK_LEVEL -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -QT5_BIN_DIR ?= "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" +include /usr/share/dpkg/architecture.mk +ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) +CROSS_COMPILE = $(DEB_HOST_GNU_TYPE)- +endif +export QT_SELECT=qt5 override_dh_auto_configure: dh_auto_configure -- \ - --with-guis="fox16 qt4 qt5 gtk3" \ - --with-qt5-qmake=$(QT5_BIN_DIR)/qmake \ - --with-qt5-moc=$(QT5_BIN_DIR)/moc \ - --with-qt5-uic=$(QT5_BIN_DIR)/uic \ + --with-guis="fox16 qt5 gtk3" \ + --with-qt5-qmake=$(CROSS_COMPILE)qmake \ --enable-system-certs \ --disable-network-checks diff -Nru libgwenhywfar-4.20.0/debian/watch libgwenhywfar-4.20.0/debian/watch --- libgwenhywfar-4.20.0/debian/watch 2018-08-16 21:57:14.000000000 +0200 +++ libgwenhywfar-4.20.0/debian/watch 2019-03-06 22:00:47.000000000 +0100 @@ -1,4 +1,4 @@ version=4 -opts="filenamemangle=s/.*\&dummy=(.*)/lib$1/, pgpsigurlmangle=s/\&file=01\&(.*)$/&file=02&$1.asc/" \ - http://www.aquamaniac.de/sites/download/packages.php \ - /sites/download/download.php\?package=01\&.*\&dummy=gwenhywfar-([\d.]*).tar.gz debian uupdate +opts="filenamemangle=s/gwenhywfar/libgwenhywfar/" \ + https://www.aquamaniac.de/rdm/projects/gwenhywfar/files \ + /rdm/attachments/download/.*/gwenhywfar-([\d.]+).tar.gz debian uupdate
