------------------------------------------------------------ revno: 64 committer: Jonathan Marsden <[email protected]> branch nick: debian timestamp: Sat 2011-06-25 14:33:34 -0700 message: * debian/patches/*: - Remove 01-fix-search-works-print-crash.patch - Remove series removed: debian/patches/01-fix-search-works-print-crash.patch debian/patches/series modified: debian/changelog
-- 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-25 21:27:29 +0000 +++ debian/changelog 2011-06-25 21:33:34 +0000 @@ -1,3 +1,11 @@ +bibletime (2.8.1-2~ppa1) UNRELEASED; urgency=low + + * debian/patches/*: + - Remove 01-fix-search-works-print-crash.patch + - Remove series + + -- Jonathan Marsden <[email protected]> Sat, 25 Jun 2011 14:29:31 -0700 + bibletime (2.8.1-1) unstable; urgency=low [ Jonathan Marsden ] === removed file 'debian/patches/01-fix-search-works-print-crash.patch' --- debian/patches/01-fix-search-works-print-crash.patch 2011-06-20 05:55:22 +0000 +++ debian/patches/01-fix-search-works-print-crash.patch 1970-01-01 00:00:00 +0000 @@ -1,52 +0,0 @@ -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)); === removed file 'debian/patches/series' --- debian/patches/series 2011-06-20 05:55:22 +0000 +++ debian/patches/series 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -01-fix-search-works-print-crash.patch
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
