diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/control | 8 | ||||
-rw-r--r-- | debian/libqt4-declarative-folderlistmodel.install | 4 | ||||
-rw-r--r-- | debian/libqt4-declarative-gestures.install | 4 | ||||
-rw-r--r-- | debian/libqt4-declarative-particles.install | 4 | ||||
-rw-r--r-- | debian/libqt4-declarative-shaders.install | 4 | ||||
-rwxr-xr-x | debian/rules | 2 |
7 files changed, 20 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 29566cb..b7fd2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ qt4-x11 (4:4.8.0-2) UNRELEASED; urgency=low * Revert debian/compat to 8: - drop mv-qt4-bin-dbg.sh script. - drop elfutils build dependency. + * Use multiarch for importsdir: + - update debian/libqt4-declarative-*.install files. + - mark QML plugin packages as Multi-Arch: same. -- Fathi Boudra <fabo@debian.org> Wed, 04 Jan 2012 22:15:56 +0200 diff --git a/debian/control b/debian/control index f6bad73..67f88fb 100644 --- a/debian/control +++ b/debian/control @@ -469,6 +469,8 @@ Description: Qt 4 Declarative module Package: libqt4-declarative-folderlistmodel Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 4 folderlistmodel QML plugin Qt is a cross-platform C++ application framework. Qt's primary feature @@ -478,6 +480,8 @@ Description: Qt 4 folderlistmodel QML plugin Package: libqt4-declarative-gestures Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 4 gestures QML plugin Qt is a cross-platform C++ application framework. Qt's primary feature @@ -487,6 +491,8 @@ Description: Qt 4 gestures QML plugin Package: libqt4-declarative-particles Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 4 particles QML plugin Qt is a cross-platform C++ application framework. Qt's primary feature @@ -496,6 +502,8 @@ Description: Qt 4 particles QML plugin Package: libqt4-declarative-shaders Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Qt 4 shaders QML plugin Qt is a cross-platform C++ application framework. Qt's primary feature diff --git a/debian/libqt4-declarative-folderlistmodel.install b/debian/libqt4-declarative-folderlistmodel.install index 9a74031..e866dca 100644 --- a/debian/libqt4-declarative-folderlistmodel.install +++ b/debian/libqt4-declarative-folderlistmodel.install @@ -1,2 +1,2 @@ -usr/lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so -usr/lib/qt4/imports/Qt/labs/folderlistmodel/qmldir +usr/lib/*/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so +usr/lib/*/qt4/imports/Qt/labs/folderlistmodel/qmldir diff --git a/debian/libqt4-declarative-gestures.install b/debian/libqt4-declarative-gestures.install index d89107f..deed3b7 100644 --- a/debian/libqt4-declarative-gestures.install +++ b/debian/libqt4-declarative-gestures.install @@ -1,2 +1,2 @@ -usr/lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so -usr/lib/qt4/imports/Qt/labs/gestures/qmldir +usr/lib/*/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so +usr/lib/*/qt4/imports/Qt/labs/gestures/qmldir diff --git a/debian/libqt4-declarative-particles.install b/debian/libqt4-declarative-particles.install index 25bab82..6df8fa2 100644 --- a/debian/libqt4-declarative-particles.install +++ b/debian/libqt4-declarative-particles.install @@ -1,2 +1,2 @@ -usr/lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so -usr/lib/qt4/imports/Qt/labs/particles/qmldir +usr/lib/*/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so +usr/lib/*/qt4/imports/Qt/labs/particles/qmldir diff --git a/debian/libqt4-declarative-shaders.install b/debian/libqt4-declarative-shaders.install index b8e289e..77afd1d 100644 --- a/debian/libqt4-declarative-shaders.install +++ b/debian/libqt4-declarative-shaders.install @@ -1,2 +1,2 @@ -usr/lib/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so -usr/lib/qt4/imports/Qt/labs/shaders/qmldir +usr/lib/*/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so +usr/lib/*/qt4/imports/Qt/labs/shaders/qmldir diff --git a/debian/rules b/debian/rules index 4027b73..177fea6 100755 --- a/debian/rules +++ b/debian/rules @@ -110,7 +110,7 @@ endif -headerdir "/usr/include/qt4" \ -datadir "/usr/share/qt4" \ -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins" \ - -importdir "/usr/lib/qt4/imports" \ + -importdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/imports" \ -translationdir "/usr/share/qt4/translations" \ -sysconfdir "/etc/xdg" \ -demosdir "/usr/lib/qt4/demos" \ |