diff -u merkaartor-0.16.1/debian/changelog merkaartor-0.16.1/debian/changelog --- merkaartor-0.16.1/debian/changelog +++ merkaartor-0.16.1/debian/changelog @@ -1,3 +1,14 @@ +merkaartor (0.16.1-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: Build-Depend on libqtwebkit-dev as + QtWebKit is no longer part of libqt4-dev. + * Fixes: + - (LP: #607953) + - (LP: #611405) + + -- Artur Rona Thu, 29 Jul 2010 18:28:49 +0200 + merkaartor (0.16.1-1) unstable; urgency=low * [486efdb0] Merge branch 'upstream' @@ -66,6 +77,18 @@ -- Bernd Zeimetz Mon, 19 Apr 2010 10:54:27 +0200 +merkaartor (0.15.3-1ubuntu2) maverick; urgency=low + + * Replace libqt4-webkit-dev build-dep with libqtwebkit-dev. + + -- Felix Geyer Wed, 21 Jul 2010 13:54:56 +0200 + +merkaartor (0.15.3-1ubuntu1) maverick; urgency=low + + * Add build-dep on libqt4-webkit-dev. + + -- Felix Geyer Tue, 25 May 2010 19:27:20 +0200 + merkaartor (0.15.3-1) unstable; urgency=low * [fa5d9441] Merge branch 'upstream' diff -u merkaartor-0.16.1/debian/control merkaartor-0.16.1/debian/control --- merkaartor-0.16.1/debian/control +++ merkaartor-0.16.1/debian/control @@ -1,11 +1,13 @@ Source: merkaartor Section: science Priority: extra -Maintainer: Bernd Zeimetz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bernd Zeimetz Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.4.3), quilt, zlib1g-dev, libexiv2-dev, sharutils, libgdal1-dev, libxml2-dev, libxslt1-dev, libboost-dev (>= 1.38), libboost-math-dev (>= 1.38), libboost-serialization-dev (>= 1.38), - libgps-dev, libzbarqt-dev (>= 0.10), libzbar-dev (>= 0.10) + libgps-dev, libzbarqt-dev (>= 0.10), libzbar-dev (>= 0.10), + libqtwebkit-dev Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/users/bzed/merkaartor.git Vcs-Browser: http://git.debian.org/?p=users/bzed/merkaartor.git