[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-8-7-g4dc858c
Fathi Boudra
fabo at alioth.debian.org
Mon Sep 12 09:14:34 UTC 2011
The following commit has been merged in the master branch:
commit 4dc858cbe32dd304294173559b81c89ebd59efc1
Author: Fathi Boudra <fabo at debian.org>
Date: Mon Sep 12 12:14:07 2011 +0300
Update debian/*.install: update paths for multiarch.
---
debian/changelog | 1 +
debian/libqt4-dbus.install | 2 +-
debian/libqt4-declarative.install | 6 +-
debian/libqt4-designer.install | 4 +-
debian/libqt4-dev.install | 108 ++++++++++++++++++------------------
debian/libqt4-help.install | 2 +-
debian/libqt4-network.install | 4 +-
debian/libqt4-opengl-dev.install | 6 +-
debian/libqt4-opengl.install | 4 +-
debian/libqt4-qt3support.install | 6 +-
debian/libqt4-script.install | 4 +-
debian/libqt4-scripttools.install | 2 +-
debian/libqt4-sql-ibase.install | 2 +-
debian/libqt4-sql-mysql.install | 2 +-
debian/libqt4-sql-odbc.install | 2 +-
debian/libqt4-sql-psql.install | 2 +-
debian/libqt4-sql-sqlite.install | 2 +-
debian/libqt4-sql-sqlite2.install | 2 +-
debian/libqt4-sql-tds.install | 2 +-
debian/libqt4-sql.install | 2 +-
debian/libqt4-svg.install | 6 +-
debian/libqt4-test.install | 2 +-
debian/libqt4-xml.install | 2 +-
debian/libqt4-xmlpatterns.install | 2 +-
debian/libqtcore4.install | 6 +-
debian/libqtgui4.install | 18 +++---
debian/qt4-demos.install | 10 ++--
27 files changed, 106 insertions(+), 105 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38efe36..4eb8beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ qt4-x11 (4:4.7.4-1) UNRELEASED; urgency=low
libqt4-dbus genuinely multiarch-installable.
* Update debian/control: mark Qt libraries as Multi-Arch.
* Update debian/rules: add DEB_HOST_MULTIARCH support for libdir/plugindir.
+ * Update debian/*.install: update paths for multiarch.
-- Fathi Boudra <fabo at debian.org> Mon, 12 Sep 2011 08:52:33 +0300
diff --git a/debian/libqt4-dbus.install b/debian/libqt4-dbus.install
index 4e6f1b4..3c1a8b2 100644
--- a/debian/libqt4-dbus.install
+++ b/debian/libqt4-dbus.install
@@ -1 +1 @@
-usr/lib/libQtDBus.so.*
+usr/lib/*/libQtDBus.so.*
diff --git a/debian/libqt4-declarative.install b/debian/libqt4-declarative.install
index 4857983..bc4c80d 100644
--- a/debian/libqt4-declarative.install
+++ b/debian/libqt4-declarative.install
@@ -1,3 +1,3 @@
-usr/lib/libQtDeclarative.so.*
-usr/lib/qt4/plugins/designer/libqdeclarativeview.so
-usr/lib/qt4/plugins/qmltooling/libtcpserver.so
+usr/lib/*/libQtDeclarative.so.*
+usr/lib/*/qt4/plugins/designer/libqdeclarativeview.so
+usr/lib/*/qt4/plugins/qmltooling/libtcpserver.so
diff --git a/debian/libqt4-designer.install b/debian/libqt4-designer.install
index d5101f3..a4c8978 100644
--- a/debian/libqt4-designer.install
+++ b/debian/libqt4-designer.install
@@ -1,2 +1,2 @@
-usr/lib/libQtDesigner.so.*
-usr/lib/libQtDesignerComponents.so.*
+usr/lib/*/libQtDesigner.so.*
+usr/lib/*/libQtDesignerComponents.so.*
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 32de6b6..1f26a75 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -2758,58 +2758,58 @@ usr/include/qt4/QtXmlPatterns/qxmlresultitems.h
usr/include/qt4/QtXmlPatterns/qxmlschema.h
usr/include/qt4/QtXmlPatterns/qxmlschemavalidator.h
usr/include/qt4/QtXmlPatterns/qxmlserializer.h
-usr/lib/libQt3Support.prl
-usr/lib/libQt3Support.so
-usr/lib/libQtCLucene.prl
-usr/lib/libQtCLucene.so
-usr/lib/libQtCore.prl
-usr/lib/libQtCore.so
-usr/lib/libQtDBus.prl
-usr/lib/libQtDBus.so
-usr/lib/libQtDeclarative.prl
-usr/lib/libQtDeclarative.so
-usr/lib/libQtDesigner.prl
-usr/lib/libQtDesigner.so
-usr/lib/libQtDesignerComponents.prl
-usr/lib/libQtDesignerComponents.so
-usr/lib/libQtGui.prl
-usr/lib/libQtGui.so
-usr/lib/libQtHelp.prl
-usr/lib/libQtHelp.so
-usr/lib/libQtNetwork.prl
-usr/lib/libQtNetwork.so
-usr/lib/libQtScript.prl
-usr/lib/libQtScript.so
-usr/lib/libQtScriptTools.prl
-usr/lib/libQtScriptTools.so
-usr/lib/libQtSql.prl
-usr/lib/libQtSql.so
-usr/lib/libQtSvg.prl
-usr/lib/libQtSvg.so
-usr/lib/libQtTest.prl
-usr/lib/libQtTest.so
-usr/lib/libQtUiTools.a
-usr/lib/libQtUiTools.prl
-usr/lib/libQtXml.prl
-usr/lib/libQtXml.so
-usr/lib/libQtXmlPatterns.prl
-usr/lib/libQtXmlPatterns.so
-usr/lib/pkgconfig/Qt3Support.pc
-usr/lib/pkgconfig/QtCLucene.pc
-usr/lib/pkgconfig/QtCore.pc
-usr/lib/pkgconfig/QtDBus.pc
-usr/lib/pkgconfig/QtDeclarative.pc
-usr/lib/pkgconfig/QtDesigner.pc
-usr/lib/pkgconfig/QtDesignerComponents.pc
-usr/lib/pkgconfig/QtGui.pc
-usr/lib/pkgconfig/QtHelp.pc
-usr/lib/pkgconfig/QtNetwork.pc
-usr/lib/pkgconfig/QtScript.pc
-usr/lib/pkgconfig/QtScriptTools.pc
-usr/lib/pkgconfig/QtSql.pc
-usr/lib/pkgconfig/QtSvg.pc
-usr/lib/pkgconfig/QtTest.pc
-usr/lib/pkgconfig/QtUiTools.pc
-usr/lib/pkgconfig/QtXml.pc
-usr/lib/pkgconfig/QtXmlPatterns.pc
+usr/lib/*/libQt3Support.prl
+usr/lib/*/libQt3Support.so
+usr/lib/*/libQtCLucene.prl
+usr/lib/*/libQtCLucene.so
+usr/lib/*/libQtCore.prl
+usr/lib/*/libQtCore.so
+usr/lib/*/libQtDBus.prl
+usr/lib/*/libQtDBus.so
+usr/lib/*/libQtDeclarative.prl
+usr/lib/*/libQtDeclarative.so
+usr/lib/*/libQtDesigner.prl
+usr/lib/*/libQtDesigner.so
+usr/lib/*/libQtDesignerComponents.prl
+usr/lib/*/libQtDesignerComponents.so
+usr/lib/*/libQtGui.prl
+usr/lib/*/libQtGui.so
+usr/lib/*/libQtHelp.prl
+usr/lib/*/libQtHelp.so
+usr/lib/*/libQtNetwork.prl
+usr/lib/*/libQtNetwork.so
+usr/lib/*/libQtScript.prl
+usr/lib/*/libQtScript.so
+usr/lib/*/libQtScriptTools.prl
+usr/lib/*/libQtScriptTools.so
+usr/lib/*/libQtSql.prl
+usr/lib/*/libQtSql.so
+usr/lib/*/libQtSvg.prl
+usr/lib/*/libQtSvg.so
+usr/lib/*/libQtTest.prl
+usr/lib/*/libQtTest.so
+usr/lib/*/libQtUiTools.a
+usr/lib/*/libQtUiTools.prl
+usr/lib/*/libQtXml.prl
+usr/lib/*/libQtXml.so
+usr/lib/*/libQtXmlPatterns.prl
+usr/lib/*/libQtXmlPatterns.so
+usr/lib/*/pkgconfig/Qt3Support.pc
+usr/lib/*/pkgconfig/QtCLucene.pc
+usr/lib/*/pkgconfig/QtCore.pc
+usr/lib/*/pkgconfig/QtDBus.pc
+usr/lib/*/pkgconfig/QtDeclarative.pc
+usr/lib/*/pkgconfig/QtDesigner.pc
+usr/lib/*/pkgconfig/QtDesignerComponents.pc
+usr/lib/*/pkgconfig/QtGui.pc
+usr/lib/*/pkgconfig/QtHelp.pc
+usr/lib/*/pkgconfig/QtNetwork.pc
+usr/lib/*/pkgconfig/QtScript.pc
+usr/lib/*/pkgconfig/QtScriptTools.pc
+usr/lib/*/pkgconfig/QtSql.pc
+usr/lib/*/pkgconfig/QtSvg.pc
+usr/lib/*/pkgconfig/QtTest.pc
+usr/lib/*/pkgconfig/QtUiTools.pc
+usr/lib/*/pkgconfig/QtXml.pc
+usr/lib/*/pkgconfig/QtXmlPatterns.pc
usr/share/qt4/q3porting.xml
diff --git a/debian/libqt4-help.install b/debian/libqt4-help.install
index 1274692..62f47e6 100644
--- a/debian/libqt4-help.install
+++ b/debian/libqt4-help.install
@@ -1,4 +1,4 @@
-usr/lib/libQtHelp.so.*
+usr/lib/*/libQtHelp.so.*
usr/share/qt4/translations/qt_help_cs.qm
usr/share/qt4/translations/qt_help_da.qm
usr/share/qt4/translations/qt_help_de.qm
diff --git a/debian/libqt4-network.install b/debian/libqt4-network.install
index 13e4a4d..7693f89 100644
--- a/debian/libqt4-network.install
+++ b/debian/libqt4-network.install
@@ -1,2 +1,2 @@
-usr/lib/libQtNetwork.so.*
-usr/lib/qt4/plugins/bearer
+usr/lib/*/libQtNetwork.so.*
+usr/lib/*/qt4/plugins/bearer
diff --git a/debian/libqt4-opengl-dev.install b/debian/libqt4-opengl-dev.install
index f43c100..8e645ac 100644
--- a/debian/libqt4-opengl-dev.install
+++ b/debian/libqt4-opengl-dev.install
@@ -30,6 +30,6 @@ usr/include/qt4/QtOpenGL/qglframebufferobject.h
usr/include/qt4/QtOpenGL/qglpixelbuffer.h
usr/include/qt4/QtOpenGL/qglscreen_qws.h
usr/include/qt4/QtOpenGL/qglshaderprogram.h
-usr/lib/libQtOpenGL.prl
-usr/lib/libQtOpenGL.so
-usr/lib/pkgconfig/QtOpenGL.pc
+usr/lib/*/libQtOpenGL.prl
+usr/lib/*/libQtOpenGL.so
+usr/lib/*/pkgconfig/QtOpenGL.pc
diff --git a/debian/libqt4-opengl.install b/debian/libqt4-opengl.install
index c998942..2261055 100644
--- a/debian/libqt4-opengl.install
+++ b/debian/libqt4-opengl.install
@@ -1,2 +1,2 @@
-usr/lib/libQtOpenGL.so.*
-usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
+usr/lib/*/libQtOpenGL.so.*
+usr/lib/*/qt4/plugins/graphicssystems/libqglgraphicssystem.so
diff --git a/debian/libqt4-qt3support.install b/debian/libqt4-qt3support.install
index 137efdd..a9b8d03 100644
--- a/debian/libqt4-qt3support.install
+++ b/debian/libqt4-qt3support.install
@@ -1,3 +1,3 @@
-usr/lib/libQt3Support.so.*
-usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
+usr/lib/*/libQt3Support.so.*
+usr/lib/*/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+usr/lib/*/qt4/plugins/designer/libqt3supportwidgets.so
diff --git a/debian/libqt4-script.install b/debian/libqt4-script.install
index 53d05ca..8874873 100644
--- a/debian/libqt4-script.install
+++ b/debian/libqt4-script.install
@@ -1,2 +1,2 @@
-usr/lib/libQtScript.so.*
-usr/lib/qt4/plugins/script/libqtscriptdbus.so
+usr/lib/*/libQtScript.so.*
+usr/lib/*/qt4/plugins/script/libqtscriptdbus.so
diff --git a/debian/libqt4-scripttools.install b/debian/libqt4-scripttools.install
index f3495aa..77e8f11 100644
--- a/debian/libqt4-scripttools.install
+++ b/debian/libqt4-scripttools.install
@@ -1 +1 @@
-usr/lib/libQtScriptTools.so.*
+usr/lib/*/libQtScriptTools.so.*
diff --git a/debian/libqt4-sql-ibase.install b/debian/libqt4-sql-ibase.install
index f31ca81..a0f729c 100644
--- a/debian/libqt4-sql-ibase.install
+++ b/debian/libqt4-sql-ibase.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlibase.so
diff --git a/debian/libqt4-sql-mysql.install b/debian/libqt4-sql-mysql.install
index c89284a..a5eb38f 100644
--- a/debian/libqt4-sql-mysql.install
+++ b/debian/libqt4-sql-mysql.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlmysql.so
diff --git a/debian/libqt4-sql-odbc.install b/debian/libqt4-sql-odbc.install
index 209b0a2..39148bb 100644
--- a/debian/libqt4-sql-odbc.install
+++ b/debian/libqt4-sql-odbc.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlodbc.so
diff --git a/debian/libqt4-sql-psql.install b/debian/libqt4-sql-psql.install
index 46b396b..3625b58 100644
--- a/debian/libqt4-sql-psql.install
+++ b/debian/libqt4-sql-psql.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlpsql.so
diff --git a/debian/libqt4-sql-sqlite.install b/debian/libqt4-sql-sqlite.install
index 1f329f8..20da1e0 100644
--- a/debian/libqt4-sql-sqlite.install
+++ b/debian/libqt4-sql-sqlite.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlite.so
diff --git a/debian/libqt4-sql-sqlite2.install b/debian/libqt4-sql-sqlite2.install
index bcac43d..8cde965 100644
--- a/debian/libqt4-sql-sqlite2.install
+++ b/debian/libqt4-sql-sqlite2.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqlite2.so
diff --git a/debian/libqt4-sql-tds.install b/debian/libqt4-sql-tds.install
index 6f70205..a4750b2 100644
--- a/debian/libqt4-sql-tds.install
+++ b/debian/libqt4-sql-tds.install
@@ -1 +1 @@
-usr/lib/qt4/plugins/sqldrivers/libqsqltds.so
+usr/lib/*/qt4/plugins/sqldrivers/libqsqltds.so
diff --git a/debian/libqt4-sql.install b/debian/libqt4-sql.install
index 04783f7..fcc7cd3 100644
--- a/debian/libqt4-sql.install
+++ b/debian/libqt4-sql.install
@@ -1 +1 @@
-usr/lib/libQtSql.so.*
+usr/lib/*/libQtSql.so.*
diff --git a/debian/libqt4-svg.install b/debian/libqt4-svg.install
index 71d996e..9bc9c83 100644
--- a/debian/libqt4-svg.install
+++ b/debian/libqt4-svg.install
@@ -1,3 +1,3 @@
-usr/lib/libQtSvg.so.*
-usr/lib/qt4/plugins/iconengines/libqsvgicon.so
-usr/lib/qt4/plugins/imageformats/libqsvg.so
+usr/lib/*/libQtSvg.so.*
+usr/lib/*/qt4/plugins/iconengines/libqsvgicon.so
+usr/lib/*/qt4/plugins/imageformats/libqsvg.so
diff --git a/debian/libqt4-test.install b/debian/libqt4-test.install
index 6552ae6..5f881e5 100644
--- a/debian/libqt4-test.install
+++ b/debian/libqt4-test.install
@@ -1 +1 @@
-usr/lib/libQtTest.so.*
+usr/lib/*/libQtTest.so.*
diff --git a/debian/libqt4-xml.install b/debian/libqt4-xml.install
index 6366cb3..857718d 100644
--- a/debian/libqt4-xml.install
+++ b/debian/libqt4-xml.install
@@ -1 +1 @@
-usr/lib/libQtXml.so.*
+usr/lib/*/libQtXml.so.*
diff --git a/debian/libqt4-xmlpatterns.install b/debian/libqt4-xmlpatterns.install
index a8b4816..5b59b87 100644
--- a/debian/libqt4-xmlpatterns.install
+++ b/debian/libqt4-xmlpatterns.install
@@ -1 +1 @@
-usr/lib/libQtXmlPatterns.so.*
+usr/lib/*/libQtXmlPatterns.so.*
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index d8c74cb..a4aef79 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -1,6 +1,6 @@
-usr/lib/libQtCLucene.so.*
-usr/lib/libQtCore.so.*
-usr/lib/qt4/plugins/codecs/*.so
+usr/lib/*/libQtCLucene.so.*
+usr/lib/*/libQtCore.so.*
+usr/lib/*/qt4/plugins/codecs/*.so
usr/share/qt4/translations/qt_ar.qm
usr/share/qt4/translations/qt_cs.qm
usr/share/qt4/translations/qt_da.qm
diff --git a/debian/libqtgui4.install b/debian/libqtgui4.install
index f8f9973..33cf0bf 100644
--- a/debian/libqtgui4.install
+++ b/debian/libqtgui4.install
@@ -1,9 +1,9 @@
-usr/lib/libQtGui.so.*
-usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
-usr/lib/qt4/plugins/imageformats/libqgif.so
-usr/lib/qt4/plugins/imageformats/libqico.so
-usr/lib/qt4/plugins/imageformats/libqjpeg.so
-usr/lib/qt4/plugins/imageformats/libqmng.so
-usr/lib/qt4/plugins/imageformats/libqtiff.so
-usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
+usr/lib/*/libQtGui.so.*
+usr/lib/*/qt4/plugins/accessible/libqtaccessiblewidgets.so
+usr/lib/*/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
+usr/lib/*/qt4/plugins/imageformats/libqgif.so
+usr/lib/*/qt4/plugins/imageformats/libqico.so
+usr/lib/*/qt4/plugins/imageformats/libqjpeg.so
+usr/lib/*/qt4/plugins/imageformats/libqmng.so
+usr/lib/*/qt4/plugins/imageformats/libqtiff.so
+usr/lib/*/qt4/plugins/inputmethods/libqimsw-multi.so
diff --git a/debian/qt4-demos.install b/debian/qt4-demos.install
index 19566af..c8a000b 100644
--- a/debian/qt4-demos.install
+++ b/debian/qt4-demos.install
@@ -1,8 +1,8 @@
usr/bin/qtdemo
usr/lib/qt4/demos
usr/lib/qt4/examples
-usr/lib/qt4/plugins/designer/libarthurplugin.so
-usr/lib/qt4/plugins/designer/libcontainerextension.so
-usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
-usr/lib/qt4/plugins/designer/libtaskmenuextension.so
-usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
+usr/lib/*/qt4/plugins/designer/libarthurplugin.so
+usr/lib/*/qt4/plugins/designer/libcontainerextension.so
+usr/lib/*/qt4/plugins/designer/libcustomwidgetplugin.so
+usr/lib/*/qt4/plugins/designer/libtaskmenuextension.so
+usr/lib/*/qt4/plugins/designer/libworldtimeclockplugin.so
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list