[SCM] qtbase packaging branch, master, updated. 1c9f8be04f4d30a9ea6c1bdaa6be1dbbe4b8fed5
Timo Jyrinki
timo at alioth.debian.org
Thu Jan 3 14:11:47 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=1c9f8be
The following commit has been merged in the master branch:
commit 1c9f8be04f4d30a9ea6c1bdaa6be1dbbe4b8fed5
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date: Thu Jan 3 14:11:16 2013 +0000
Prepare for qtchooser usage.
Delete suffix patches, change bindir, add qt5-default package.
qtchooser configuration location can be updated once the tool supports
other locations.
---
debian/control | 15 +++
debian/patches/append_qt_version_suffix.patch | 154 ------------------------
debian/patches/append_qt_version_suffix2.patch | 70 -----------
debian/patches/series | 2 -
debian/qt5-default.install | 2 +
debian/qt5-qmake.install | 2 +-
debian/qt5-qmake.postinst | 10 --
debian/qt5-qmake.prerm | 12 --
debian/qtbase5-dev-tools.install | 14 +-
debian/qtbase5-dev-tools.postinst | 24 ----
debian/qtbase5-dev-tools.prerm | 13 --
debian/qtbase5-dev.install | 2 +-
debian/rules | 11 ++-
13 files changed, 35 insertions(+), 296 deletions(-)
diff --git a/debian/control b/debian/control
index 95bdece..795afce 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,19 @@ Homepage: http://qt-project.org/
Vcs-Git: git://git.debian.org/pkg-kde/qt/qtbase.git
Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=summary
+Package: qt5-default
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, qtchooser
+Conflicts: qt4-default
+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.
+
Package: libqt5core5
Architecture: any
Multi-Arch: same
@@ -325,6 +338,7 @@ Multi-Arch: foreign
Section: devel
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: qtchooser
Description: Qt 5 base development programs
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -339,6 +353,7 @@ Multi-Arch: foreign
Section: devel
Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: qtchooser
Description: Qt 5 qmake Makefile generator tool
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/patches/append_qt_version_suffix.patch b/debian/patches/append_qt_version_suffix.patch
deleted file mode 100644
index 834e429..0000000
--- a/debian/patches/append_qt_version_suffix.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Author: Fathi Boudra <fabo at debian.org>
-Author: Pino Toscano <pino at kde.org>
-Description: Append a -qt${version} suffix to some tools.
- To allow co-installation of the Qt development tools, we append a -qt${version}
- suffix to the executable names of some development tools: moc, qmake, uic.
-Last-Update: 2012-09-01
-Forwarded: not-needed
-
----
- config.tests/unix/arch.test | 2 +-
- config.tests/unix/compile.test | 2 +-
- config.tests/unix/ptrsize.test | 2 +-
- config.tests/x11/notype.test | 2 +-
- configure | 8 ++++----
- mkspecs/features/moc.prf | 2 +-
- mkspecs/features/uic.prf | 2 +-
- qmake/Makefile.unix | 8 ++++----
- qtbase.pro | 2 +-
- src/tools/moc/moc.pro | 2 +-
- src/tools/uic/uic.pro | 2 +-
- 11 files changed, 17 insertions(+), 17 deletions(-)
-
---- a/config.tests/unix/arch.test
-+++ b/config.tests/unix/arch.test
-@@ -31,9 +31,9 @@ done
- # build a test program but don't run it
- test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch"
- cd "$OUTDIR/config.tests/arch"
- [ -f Makefile ] && $MAKE distclean >/dev/null 2>&1
--OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
-+OUTDIR=$OUTDIR "$OUTDIR/bin/qmake-qt5" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
-
-
- ARCH=""
- [ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
---- a/config.tests/unix/compile.test
-+++ b/config.tests/unix/compile.test
-@@ -72,7 +72,7 @@ test -r Makefile && $MAKE distclean >/de
- # Make sure output from possible previous tests is gone
- rm -f "$EXE" "${EXE}.exe"
-
--set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+set -- "$OUTDIR/bin/qmake-qt5" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- if [ "$VERBOSE" = "yes" ]; then
- OUTDIR=$OUTDIR "$@"
- $MAKE
---- a/config.tests/unix/ptrsize.test
-+++ b/config.tests/unix/ptrsize.test
-@@ -10,7 +10,7 @@ OUTDIR=$4
-
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt5" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/ptrsize"
-
- if [ "$VERBOSE" = "yes" ]; then
---- a/config.tests/x11/notype.test
-+++ b/config.tests/x11/notype.test
-@@ -27,7 +27,7 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLA
- NOTYPE=yes
-
- test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
-- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-+ "$OUTDIR/bin/qmake-qt5" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/x11/notype"
-
- if [ "$VERBOSE" = "yes" ]; then
---- a/configure
-+++ b/configure
-@@ -3623,7 +3623,7 @@ setBootstrapVariable()
- }
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if true; then ###[ '!' -f "$outpath/bin/qmake-qt5" ];
- echo "Creating qmake. Please wait..."
-
- mkdir -p "$outpath/qmake" || exit
-@@ -6326,10 +6326,10 @@ if [ "$CFG_PROCESS" != "no" ]; then
-
- if [ "$CFG_PROCESS" = "full" ]; then
- echo "Creating makefiles. Please wait..."
-- "$outpath/bin/qmake" -r "$relpath"
-+ "$outpath/bin/qmake-qt5" -r "$relpath"
- echo "Done"
- else
-- "$outpath/bin/qmake" "$relpath"
-+ "$outpath/bin/qmake-qt5" "$relpath"
- fi
-
- if [ "$OPT_FAST" = "yes" ]; then
-@@ -6342,7 +6342,7 @@ if [ "$CFG_PROCESS" != "no" ]; then
- if [ "x$PART_ROOTS" != "x" ]; then
- echo
- echo "Creating stub makefiles. Please wait..."
-- QMAKE="$outpath/bin/qmake"
-+ QMAKE="$outpath/bin/qmake-qt5"
- [ "$CFG_DEBUG_RELEASE" = "no" ] && first_tgt="first_target: first" || first_tgt=
- (cd "$relpath" && find $PART_ROOTS -name '*.pro') | grep -v /testdata/ | while read p; do
- d=${p%/*}
---- a/mkspecs/features/moc.prf
-+++ b/mkspecs/features/moc.prf
-@@ -1,6 +1,6 @@
-
- #global defaults
--qtPrepareTool(QMAKE_MOC, moc)
-+qtPrepareTool(QMAKE_MOC, moc-qt5)
- isEmpty(MOC_DIR):MOC_DIR = .
- isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_
- isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc
---- a/mkspecs/features/uic.prf
-+++ b/mkspecs/features/uic.prf
-@@ -1,4 +1,4 @@
--qtPrepareTool(QMAKE_UIC, uic)
-+qtPrepareTool(QMAKE_UIC, uic-qt5)
-
- isEmpty(UI_DIR):UI_DIR = .
- isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_
---- a/qmake/Makefile.unix
-+++ b/qmake/Makefile.unix
-@@ -87,17 +87,17 @@ CPPFLAGS = -g -I$(QMKSRC) -I$(QMKSRC)/ge
-
- CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
-
--first all: $(BUILD_PATH)/bin/qmake
--qmake: $(BUILD_PATH)/bin/qmake
-+first all: $(BUILD_PATH)/bin/qmake-qt5
-+qmake: $(BUILD_PATH)/bin/qmake-qt5
-
--$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS)
-+$(BUILD_PATH)/bin/qmake-qt5: $(OBJS) $(QOBJS)
- $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS)
-
- clean::
- rm -f $(OBJS) $(QOBJS)
-
- distclean:: clean
-- rm -rf $(BUILD_PATH)/bin/qmake .deps
-+ rm -rf $(BUILD_PATH)/bin/qmake-qt5 .deps
-
- depend:
- makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
---- a/qtbase.pro
-+++ b/qtbase.pro
-@@ -70,7 +70,7 @@ qmake.path = $$[QT_HOST_BINS]
- equals(QMAKE_HOST.os, Windows) {
- qmake.files = $$OUT_PWD/bin/qmake.exe
- } else {
-- qmake.files = $$OUT_PWD/bin/qmake
-+ qmake.files = $$OUT_PWD/bin/qmake-qt5
- }
- INSTALLS += qmake
-
diff --git a/debian/patches/append_qt_version_suffix2.patch b/debian/patches/append_qt_version_suffix2.patch
deleted file mode 100644
index 8c06664..0000000
--- a/debian/patches/append_qt_version_suffix2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -urN qtbase-opensource-src-5.0.0-beta2.old/mkspecs/features/dbuscommon.pri qtbase-opensource-src-5.0.0-beta2/mkspecs/features/dbuscommon.pri
---- qtbase-opensource-src-5.0.0-beta2.old/mkspecs/features/dbuscommon.pri 2012-11-10 21:03:34.000000000 +0200
-+++ qtbase-opensource-src-5.0.0-beta2/mkspecs/features/dbuscommon.pri 2012-11-22 17:11:59.490849805 +0200
-@@ -1,5 +1,5 @@
- load(moc)
--qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
-+qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp-qt5)
-
- defineReplace(qdbusOutputBasename) {
- return($$lower($$section($$list($$basename(1)),.,-2,-2)))
-diff -urN qtbase-opensource-src-5.0.0-beta2.old/mkspecs/features/resources.prf qtbase-opensource-src-5.0.0-beta2/mkspecs/features/resources.prf
---- qtbase-opensource-src-5.0.0-beta2.old/mkspecs/features/resources.prf 2012-11-10 21:03:34.000000000 +0200
-+++ qtbase-opensource-src-5.0.0-beta2/mkspecs/features/resources.prf 2012-11-22 16:55:20.058859693 +0200
-@@ -1,4 +1,4 @@
--qtPrepareTool(QMAKE_RCC, rcc)
-+qtPrepareTool(QMAKE_RCC, rcc-qt5)
-
- isEmpty(RCC_DIR):RCC_DIR = .
- isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc
-
---- a/src/tools/rcc/rcc.pro 2012-12-03 19:18:32.000000000 +0000
-+++ b/src/tools/rcc/rcc.pro 2012-12-07 09:52:11.104108391 +0000
-@@ -2,6 +2,7 @@
-
- DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII
-
-+TARGET=rcc-qt5
- include(rcc.pri)
- HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h
- SOURCES += main.cpp
---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro 2012-12-03 19:18:32.000000000 +0000
-+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro 2012-12-07 09:53:30.600107750 +0000
-@@ -1,6 +1,7 @@
- option(host_build)
-
- DEFINES += QT_NO_CAST_FROM_ASCII
-+TARGET = qdbusxml2cpp-qt5
-
- INCLUDEPATH += $$QT_BUILD_TREE/include \
- $$QT_BUILD_TREE/include/QtDBus \
---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro 2012-12-03 19:18:32.000000000 +0000
-+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro 2012-12-07 09:54:15.412107094 +0000
-@@ -3,6 +3,7 @@
- include(../moc/moc.pri)
-
- DEFINES += QT_NO_CAST_FROM_ASCII
-+TARGET = qdbuscpp2xml-qt5
-
- INCLUDEPATH += $$QT_BUILD_TREE/include \
- $$QT_BUILD_TREE/include/QtDBus \
---- a/src/tools/uic/uic.pro 2012-12-03 19:18:32.000000000 +0000
-+++ b/src/tools/uic/uic.pro 2012-12-07 09:55:27.900112667 +0000
-@@ -1,6 +1,7 @@
- option(host_build)
-
- DEFINES += QT_UIC QT_NO_CAST_FROM_ASCII
-+TARGET = uic-qt5
-
- include(uic.pri)
- include(cpp/cpp.pri)
---- a/src/tools/moc/moc.pro 2012-12-03 19:18:32.000000000 +0000
-+++ b/src/tools/moc/moc.pro 2012-12-07 09:56:01.092101976 +0000
-@@ -1,6 +1,7 @@
- option(host_build)
-
- DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
-+TARGET = moc-qt5
-
- INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
-
diff --git a/debian/patches/series b/debian/patches/series
index abcd405..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-append_qt_version_suffix2.patch
-append_qt_version_suffix.patch
diff --git a/debian/qt5-default.install b/debian/qt5-default.install
new file mode 100644
index 0000000..7d52d20
--- /dev/null
+++ b/debian/qt5-default.install
@@ -0,0 +1,2 @@
+/etc/xdg/qtchooser/default.conf
+
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index 1d273cc..7d12a15 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,2 +1,2 @@
-usr/bin/qmake-qt5
+usr/lib/*/qt5/bin/qmake
usr/share/qt5/mkspecs/*
diff --git a/debian/qt5-qmake.postinst b/debian/qt5-qmake.postinst
deleted file mode 100644
index 27bfbcc..0000000
--- a/debian/qt5-qmake.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/qmake qmake "/usr/bin/qmake-qt5" "40" \
- --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \
- "/usr/share/man/man1/qmake-qt5.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt5-qmake.prerm b/debian/qt5-qmake.prerm
deleted file mode 100644
index 9a495e4..0000000
--- a/debian/qt5-qmake.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove qmake "/usr/bin/qmake-qt5"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qtbase5-dev-tools.install b/debian/qtbase5-dev-tools.install
index e9663ff..8500b08 100644
--- a/debian/qtbase5-dev-tools.install
+++ b/debian/qtbase5-dev-tools.install
@@ -1,7 +1,7 @@
-usr/bin/moc-qt5
-usr/bin/qdbuscpp2xml-qt5
-usr/bin/qdbusxml2cpp-qt5
-usr/bin/qdoc
-usr/bin/rcc-qt5
-usr/bin/syncqt
-usr/bin/uic-qt5
+usr/lib/*/qt5/bin/moc
+usr/lib/*/qt5/bin/qdbuscpp2xml
+usr/lib/*/qt5/bin/qdbusxml2cpp
+usr/lib/*/qt5/bin/qdoc
+usr/lib/*/qt5/bin/rcc
+usr/lib/*/qt5/bin/syncqt
+usr/lib/*/qt5/bin/uic
diff --git a/debian/qtbase5-dev-tools.postinst b/debian/qtbase5-dev-tools.postinst
deleted file mode 100644
index 7ea7740..0000000
--- a/debian/qtbase5-dev-tools.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/moc moc "/usr/bin/moc-qt5" "40" \
- --slave /usr/share/man/man1/moc.1.gz moc.1.gz \
- "/usr/share/man/man1/moc-qt5.1.gz"
-
-update-alternatives --install \
- /usr/bin/uic uic "/usr/bin/uic-qt5" "40" \
- --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
- "/usr/share/man/man1/uic-qt5.1.gz"
-
-update-alternatives --install \
- /usr/bin/rcc rcc "/usr/bin/rcc-qt5" "40"
-
-update-alternatives --install \
- /usr/bin/qdbuscpp2xml qdbuscpp2xml "/usr/bin/qdbuscpp2xml-qt5" "40"
-
-update-alternatives --install \
- /usr/bin/qdbusxml2cpp qdbusxml2cpp "/usr/bin/qdbusxml2cpp-qt5" "40"
-
-#DEBHELPER#
diff --git a/debian/qtbase5-dev-tools.prerm b/debian/qtbase5-dev-tools.prerm
deleted file mode 100644
index 0aa0d8c..0000000
--- a/debian/qtbase5-dev-tools.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove moc "/usr/bin/moc-qt5"
- update-alternatives --remove uic "/usr/bin/uic-qt5"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index e4430d5..07d1f9c 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1566,4 +1566,4 @@ usr/share/qt5/doc/global/template/images/spinner.gif
usr/share/qt5/doc/global/template/images/sprites-combined.png
usr/share/qt5/doc/global/template/style/offline.css
usr/share/qt5/doc/global/template/style/online.css
-
+etc/xdg/qtchooser/qt5.conf
diff --git a/debian/rules b/debian/rules
index 97b4bac..f41abc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@ endif
./configure -confirm-license \
-prefix "/usr" \
- -bindir "/usr/bin" \
+ -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
-libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
-docdir "/usr/share/qt5/doc" \
-headerdir "/usr/include/qt5" \
@@ -215,7 +215,8 @@ ifeq ($(vendor),Ubuntu)
endif
override_dh_auto_install:
- dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
+ # Disable stripping to allow debug packages to be built
+ dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/ STRIP=echo
# Fix wrong path in pkgconfig files
find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
@@ -224,6 +225,12 @@ override_dh_auto_install:
find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*//" {} \;
+ # Add a configuration for qtchooser
+ mkdir -p $(CURDIR)/debian/tmp/etc/xdg/qtchooser
+ echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/etc/xdg/qtchooser/qt5.conf
+ echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/etc/xdg/qtchooser/qt5.conf
+ ln -s /etc/xdg/qtchooser/qt5.conf $(CURDIR)/debian/tmp/etc/xdg/qtchooser/default.conf
+
# Remove leftover directories
find $(CURDIR)/debian/tmp/usr/lib/qt5 -depth -type d \( -false \
-o -name .moc\* \
--
qtbase packaging
More information about the pkg-kde-commits
mailing list