summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 22:24:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 22:24:02 (GMT)
commitd3148becf761fd02fc4ccd43c73900ed28be1f69 (patch)
tree553777b4bb8bc12a06f2801d30e60bbea31ece3c /Swift
parenta23b90319f9de8db0b455f5cd56e2428a3fcc53b (diff)
parent142085bcf0890765dd97f5a2a0bb15ba99d5beb6 (diff)
downloadswift-d3148becf761fd02fc4ccd43c73900ed28be1f69.zip
swift-d3148becf761fd02fc4ccd43c73900ed28be1f69.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Specify dependency on libqtwebkit-dev.
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Packaging/Debian/debian/control.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in
index 572840b..7d86bef 100644
--- a/Swift/Packaging/Debian/debian/control.in
+++ b/Swift/Packaging/Debian/debian/control.in
@@ -2,7 +2,7 @@ Source: swift-im
Section: net
Priority: optional
Maintainer: Swift Package Maintainer <packages@swift.im>
-Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libxml2-dev (>= 2.7.8), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils
+Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libqtwebkit-dev (>= 2.0.0) | libqt4-dev (<= 4.7.0), libxml2-dev (>= 2.7.8), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils
Standards-Version: 3.9.1
Vcs-Git: git://swift.im/swift
Vcs-Browser: http://swift.im/git/swift