[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3
Fathi Boudra
fabo at alioth.debian.org
Tue Dec 27 16:43:32 UTC 2011
The following commit has been merged in the experimental branch:
commit be474c334df7e88576a73ba6b373146064dc722e
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Dec 27 18:42:22 2011 +0200
Build-Depends on firebird-dev package. (Closes: #653378)
---
debian/changelog | 4 +++-
debian/control | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 17ad844..480bf71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,9 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
* Add patches:
- qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
plugin path.
- * Update debian/control: mark Qt libraries as Multi-Arch.
+ * Update debian/control:
+ - mark Qt libraries as Multi-Arch.
+ - build-depends on firebird-dev package. (Closes: #653378)
* Update debian/rules:
- add DEB_HOST_MULTIARCH support for libdir/plugindir.
- remove -qt-gif configure option - removed upstream.
diff --git a/debian/control b/debian/control
index 852016a..74916b0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
Sune Vuorela <debian at pusling.com>,
Pino Toscano <pino at debian.org>
Build-Depends: debhelper (>= 7.4.13),
- firebird2.5-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
+ firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
flex,
freetds-dev,
g++ (>= 4:4.5) [s390],
@@ -527,7 +527,7 @@ Breaks: g++-4.6 (<< 4.6.0-7~) [armel],
libqt4-opengl-dev (<< 4.4.0-2),
libqtwebkit-dev (<< 2.0~)
Replaces: libqt4-opengl-dev (<< 4.4.0-2), libqtwebkit-dev (<< 2.0~)
-Suggests: firebird2.1-dev,
+Suggests: firebird-dev,
libmysqlclient-dev,
libpq-dev,
libsqlite0-dev,
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list