------------------------------------------------------------ revno: 62 fixes bug(s): http://bugs.debian.org/629607 committer: Jonathan Marsden <[email protected]> branch nick: bibletime timestamp: Sun 2011-06-19 22:55:22 -0700 message: * New upstream version 2.8.1 (Closes: #629607). - Remove article from start of Description: synopsis line. * Bump Standards-Version to 3.9.2 (no changes needed) * debian/watch: Look for .bz2 as well as .gz compressed tarballs. * debian/patches/01-fix-search-works-print-crash.patch: - An upstream git commit to fix a crash when printing. - Also fixes a gcc-4.6 FTBFS. added: debian/patches/01-fix-search-works-print-crash.patch modified: debian/changelog debian/control debian/patches/series debian/watch
-- 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-03-05 20:41:30 +0000 +++ debian/changelog 2011-06-20 05:55:22 +0000 @@ -1,18 +1,16 @@ -bibletime (2.8.1-1) UNRELEASED; urgency=low - - [ Jonathan Marsden ] - * New upstream version 2.8.1 - - -- Jonathan Marsden <[email protected]> Sat, 05 Mar 2011 12:40:13 -0800 - -bibletime (2.8.0-1) UNRELEASED; urgency=low - - [ Jonathan Marsden ] - * New upstream version 2.8.0 +bibletime (2.8.1-1) unstable; urgency=low + + [ Jonathan Marsden ] + * 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. - * Bump Standards-Version to 3.9.1 (no changes needed) + * 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. + * debian/patches/01-fix-search-works-print-crash.patch: + - An upstream git commit to fix a crash when printing. + - Also fixes a gcc-4.6 FTBFS. [ Dmitrijs Ledkovs ] * Daily-build / build from recipes: @@ -30,7 +28,7 @@ anyways. This is needed to prevent FTBFS on platforms that didn't have libqtwebkit-dev as a stand-alone package. - -- Dmitrijs Ledkovs <[email protected]> Thu, 02 Dec 2010 00:32:12 +0000 + -- Jonathan Marsden <[email protected]> Sun, 19 Jun 2011 22:40:22 -0700 bibletime (2.5-1) unstable; urgency=low === modified file 'debian/control' --- debian/control 2010-12-02 01:15:37 +0000 +++ debian/control 2011-06-20 05:55:22 +0000 @@ -9,14 +9,14 @@ Uploaders: Daniel Glassey <[email protected]>, Dmitrijs Ledkovs <[email protected]>, Jonathan Marsden <[email protected]> -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://www.bibletime.info/ Package: bibletime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqtgui4 (>= 4.4.0), bibletime-data Provides: sword-frontend -Description: A bible study tool for Qt +Description: bible study tool for Qt BibleTime is a free and easy to use bible study tool. It uses the Qt and SWORD software libraries. BibleTime provides easy handling of digitized texts (Bibles, commentaries === added file 'debian/patches/01-fix-search-works-print-crash.patch' --- debian/patches/01-fix-search-works-print-crash.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/01-fix-search-works-print-crash.patch 2011-06-20 05:55:22 +0000 @@ -0,0 +1,52 @@ +Upstream git commit https://gitorious.org/bibletime/bibletime/commit/f22df940f92da55445c36e1334ab542addf690ff +2011-05-15 Gary Holmlund <[email protected]> + * Fix crash when printing from Works pane of search dialog. +Index: src/frontend/cexportmanager.cpp +=================================================================== +--- a/src/frontend/cexportmanager.cpp 2011-06-19 21:35:46.000000000 -0700 ++++ b/src/frontend/cexportmanager.cpp 2011-06-19 21:35:58.000000000 -0700 +@@ -342,29 +342,27 @@ + CPrinter::KeyTreeItem::Settings settings; + CPrinter::KeyTree tree; + +- QString startKey, stopKey; + setProgressRange(list.Count()); +- +- list.setPosition(sword::TOP); +- while (!list.Error() && !progressWasCancelled()) { +- if (dynamic_cast<const sword::VerseKey&>(l) != 0) { +- const sword::VerseKey &vk = static_cast<const sword::VerseKey&>(l); +- startKey = QString::fromUtf8((const char*) vk.LowerBound()); +- stopKey = QString::fromUtf8((const char*) vk.UpperBound()); ++ for (int i=0; i< list.Count(); i++) { ++ const sword::SWKey* swKey = list.getElement(i); ++ const sword::VerseKey* vKey = dynamic_cast<const sword::VerseKey*>(swKey); ++ if (vKey != 0) { ++ QString startKey = vKey->getText(); + tree.append(new CTextRendering::KeyTreeItem(startKey, +- stopKey, +- module, +- settings)); ++ startKey, ++ module, ++ settings)); + } + else { +- startKey = QString::fromUtf8((const char*) * list); +- tree.append(new CTextRendering::KeyTreeItem(startKey, +- module, +- settings)); ++ QString key = swKey->getText(); ++ tree.append(new CTextRendering::KeyTreeItem(key, ++ key, ++ module, ++ settings)); + } +- +- list.increment(); + incProgress(); ++ if (progressWasCancelled()) ++ break; + } + + QSharedPointer<CPrinter> printer(new CPrinter(0, displayOptions, filterOptions)); === modified file 'debian/patches/series' --- debian/patches/series 2009-04-29 17:39:29 +0000 +++ debian/patches/series 2011-06-20 05:55:22 +0000 @@ -1,1 +1,1 @@ - +01-fix-search-works-print-crash.patch === modified file 'debian/watch' --- debian/watch 2009-06-07 23:25:32 +0000 +++ debian/watch 2011-06-20 05:55:22 +0000 @@ -1,3 +1,3 @@ version=3 -http://sf.net/bibletime/bibletime-([\d\.]+).tar.gz +http://sf.net/bibletime/bibletime-([\d\.]+).tar.[bg]z2?
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
