------------------------------------------------------------
revno: 63
committer: Jonathan Marsden <[email protected]>
branch nick: debian
timestamp: Sat 2011-06-25 14:27:29 -0700
message:
Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt4-dev.
modified:
debian/changelog
debian/control
--
lp:bibletime/debian
https://code.launchpad.net/~pkgcrosswire/bibletime/main
Your team Crosswire Packaging Team is subscribed to branch lp:bibletime/debian.
To unsubscribe from this branch go to
https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2011-06-20 05:55:22 +0000
+++ debian/changelog 2011-06-25 21:27:29 +0000
@@ -4,7 +4,7 @@
* New upstream version 2.8.1 (Closes: #629607).
* debian/control:
- Remove article from start of Description: synopsis line.
- - Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt3-dev.
+ - Replace Build-Depends: libqt4-dev with libqtwebkit-dev | libqt4-dev.
* Bump Standards-Version to 3.9.2 (no changes needed)
* debian/control: Fix version comparison > to >= for libsword
* debian/watch: Look for .bz2 as well as .gz compressed tarballs.
@@ -22,11 +22,6 @@
- This allows building from recipes since cdbs simple-patchsys was
interfering
- Move dh_install[man] options from debian/rules to package files.
- * debian/control:
- - Change build-Depends to: libqtwebkit-dev | libqtcore4, libqt4-dev
- - Libqtcore4 is a bogus build-depends which is pulled in by libqt4-dev
- anyways. This is needed to prevent FTBFS on platforms that didn't have
- libqtwebkit-dev as a stand-alone package.
-- Jonathan Marsden <[email protected]> Sun, 19 Jun 2011 22:40:22 -0700
=== modified file 'debian/control'
--- debian/control 2011-06-20 05:55:22 +0000
+++ debian/control 2011-06-25 21:27:29 +0000
@@ -2,8 +2,7 @@
Section: kde
Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~),
libsword-dev (>= 1.5.11), libclucene-dev, poxml, libboost-dev, cmake,
- pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqtcore4,
- libqt4-dev
+ pkg-config, zlib1g-dev, libcurl4-gnutls-dev, libqtwebkit-dev | libqt4-dev
Priority: optional
Maintainer: CrossWire Packages <[email protected]>
Uploaders: Daniel Glassey <[email protected]>,
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
