[neon/qt/qtbase/Neon/testing] debian: Remove qt5-default.

Lisandro Damián Nicanor Pérez Meyer null at kde.org
Tue May 18 11:01:28 BST 2021


Git commit 9b944d81a6dce98c2d7e3cd364c7c008c3f35fd0 by Lisandro Damián Nicanor Pérez Meyer.
Committed on 09/10/2020 at 18:08.
Pushed by sitter into branch 'Neon/testing'.

Remove qt5-default.

See changelog.

M  +2    -0    debian/changelog
M  +0    -22   debian/control
D  +0    -1    debian/qt5-default.install
M  +0    -4    debian/rules

https://invent.kde.org/neon/qt/qtbase/commit/9b944d81a6dce98c2d7e3cd364c7c008c3f35fd0

diff --git a/debian/changelog b/debian/changelog
index 96d9273..5d92521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtbase-opensource-src (5.15.1+dfsg-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Apply cross_build_mysql.diff to get closer to cross building on a Debian
     environment. Thanks Helmut Grohne for the patch! (Closes: #971604).
+  * Remove qt5-default. Nowadays it's not needed as Qt 5 is the only Qt version
+    in Debian and it brought more problems than solutions.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Sep 2020 20:54:35 +0300
 
diff --git a/debian/control b/debian/control
index 611c693..3b54b41 100644
--- a/debian/control
+++ b/debian/control
@@ -483,28 +483,6 @@ Description: Qt 5 base examples
  .
  This package contains Qt base 5 examples.
 
-Package: qt5-default
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: qtbase5-dev (= ${binary:Version}) | qtbase5-gles-dev (>= ${source:Upstream-Version}),
-         qtchooser (>= 55-gc9562a1-1~),
-         ${misc:Depends}
-Conflicts: qt4-default
-Suggests: qt5-qmake, qtbase5-dev-tools
-Description: Qt 5 development defaults package
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package sets Qt 5 to be the default Qt version to be used when
- using development binaries like qmake. It provides a default
- configuration for qtchooser, but does not prevent alternative Qt
- installations from being used.
- .
- This package should not be used for building Debian packages. Take a
- look at https://qt-kde-team.pages.debian.net/packagingqtbasedstuff.html for
- more information.
-
 Package: qtbase5-doc
 Build-Profiles: <!nodoc>
 Architecture: all
diff --git a/debian/qt5-default.install b/debian/qt5-default.install
deleted file mode 100644
index 4e0fd83..0000000
--- a/debian/qt5-default.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/qtchooser/default.conf
diff --git a/debian/rules b/debian/rules
index 9a4a8fe..9a1ce9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -240,10 +240,6 @@ endif
 	sed -i "s,lib/qt5/bin,lib/$(DEB_HOST_MULTIARCH)/qt5/bin," \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/Qt5Core.pc
 
-	# Configuration file for qt5-default package
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
-	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
-
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 -depth -type d \( -false \
 	  -o -name .moc\* \



More information about the Neon-commits mailing list