Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-19 09:00:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-19 09:00:19 (GMT) |
| commit | 6eabee840343d99d92dd4c2f627cb52ff3b97886 (patch) | |
| tree | e421491397e1a044731a17c4ecca33f58a6970b4 | |
| parent | 65702bc0da2ff0b20038b0c5adc44f6bbac59052 (diff) | |
| parent | aa1fd086d1453685348ada941d38891c42b902da (diff) | |
| download | swift-6eabee840343d99d92dd4c2f627cb52ff3b97886.zip swift-6eabee840343d99d92dd4c2f627cb52ff3b97886.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Make webkit dependency distribution specific.
| -rw-r--r-- | Swift/Packaging/Debian/debian/control.in | 2 | ||||
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Swift/Packaging/Debian/debian/control.in b/Swift/Packaging/Debian/debian/control.in index a8facfc..6373a00 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), libqtwebkit-dev (>= 2.0.0) | libqt4-dev (<< 4.7.0), libxml2-dev (>= 2.7.6), 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), libxml2-dev (>= 2.7.6), 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 %WEBKIT_DEPENDENCY% Standards-Version: 3.9.1 Vcs-Git: git://swift.im/swift Vcs-Browser: http://swift.im/git/swift diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh index 5ccb6c1..1890069 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -35,10 +35,17 @@ cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost # Create orig tarball for debuild tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz --exclude=$DIRNAME/.git $DIRNAME +# Detect dependencies +WEBKIT_DEPENDENCY=", libqtwebkit-dev (>= 2.0.0)" +DISTRIBUTION=`lsb_release -s -i`-`lsb_release -s -c` +if [ "$DISTRIBUTION" == "Debian-squeeze" -o "$DISTRIBUTION" == "Ubuntu-lucid" ]; then + WEBKIT_DEPENDENCY="" +fi + # Initialize debian files ln -s Swift/Packaging/Debian/debian $DIRNAME/debian ../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION -cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" > $DIRNAME/debian/control +cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" | sed -e "s/%WEBKIT_DEPENDENCY%/$WEBKIT_DEPENDENCY/g" > $DIRNAME/debian/control mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.manpages |