diff options
author | Brian Nelson <pyro@debian.org> | 2006-10-17 02:34:12 +0000 |
---|---|---|
committer | Brian Nelson <pyro@debian.org> | 2006-10-17 02:34:12 +0000 |
commit | 646f41bc16fc5c82f7c96cbc8444d95bc566518f (patch) | |
tree | 61cb315549b605b237daf7da4076c69de583af8a | |
parent | abeffe6a8025cc6ae4697397424b96513908dfa2 (diff) | |
download | qt4-x11-646f41bc16fc5c82f7c96cbc8444d95bc566518f.tar.gz |
* Imported Ubuntu fixes, thanks to Jonathan Riddell for the tip
- Fix typo in debian/rules -qt-sql-slite to -qt-sql-sqlite
- Install usr/bin/qdbus usr/bin/qdbusxml2cpp and usr/bin/qdbuscpp2xml
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/libqt4-core.install | 1 | ||||
-rw-r--r-- | debian/libqt4-dev.install | 2 | ||||
-rwxr-xr-x | debian/rules | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index aa53758..fefbce2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,11 @@ qt4-x11 (4.2.0-2) UNRELEASED; urgency=low * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on m68k (Closes: #391902) - -- Brian Nelson <pyro@debian.org> Mon, 16 Oct 2006 17:40:48 -0400 + * Imported Ubuntu fixes, thanks to Jonathan Riddell for the tip + - Fix typo in debian/rules -qt-sql-slite to -qt-sql-sqlite + - Install usr/bin/qdbus usr/bin/qdbusxml2cpp and usr/bin/qdbuscpp2xml + + -- Brian Nelson <pyro@debian.org> Mon, 16 Oct 2006 22:30:42 -0400 qt4-x11 (4.2.0-1) unstable; urgency=low diff --git a/debian/libqt4-core.install b/debian/libqt4-core.install index b9c24a8..d633e91 100644 --- a/debian/libqt4-core.install +++ b/debian/libqt4-core.install @@ -3,4 +3,5 @@ usr/lib/libQtNetwork.so.* usr/lib/libQtXml.so.* usr/lib/libQtTest.so.* usr/lib/libQtDBus.so.* +usr/bin/qdbus usr/share/qt4/translations/*.qm diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install index 71ca792..4cee416 100644 --- a/debian/libqt4-dev.install +++ b/debian/libqt4-dev.install @@ -14,3 +14,5 @@ usr/bin/qt3to4 usr/bin/rcc usr/bin/uic3 usr/bin/qtdemo +usr/bin/qdbusxml2cpp +usr/bin/qdbuscpp2xml diff --git a/debian/rules b/debian/rules index 307208c..f156446 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ common-configure-arch:: -qt-gif \ -qt-sql-psql \ -qt-sql-mysql \ - -qt-sql-slite \ + -qt-sql-sqlite \ -system-sqlite \ -qt-sql-sqlite2 \ -I/usr/include/freetype2 \ |