------------------------------------------------------------ revno: 68 committer: Jonathan Marsden <[email protected]> branch nick: debian timestamp: Fri 2011-12-23 12:39:32 -0800 message: debian/patches/*: Remove all patches (incorporated upstream) removed: debian/patches/01-fix-search-works-print-crash.patch debian/patches/02-prevent-unused-but-set-variable-ftbfs.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-12-23 20:32:12 +0000 +++ debian/changelog 2011-12-23 20:39:32 +0000 @@ -1,6 +1,7 @@ bibletime (2.9.1-1) UNRELEASED; urgency=low * New upstream version 2.9.1 + * debian/patches/*: Remove all patches (incorporated upstream) -- Jonathan Marsden <[email protected]> Fri, 23 Dec 2011 12:31:02 -0800 === removed file 'debian/patches/01-fix-search-works-print-crash.patch' --- debian/patches/01-fix-search-works-print-crash.patch 2011-11-27 00:03:32 +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/02-prevent-unused-but-set-variable-ftbfs.patch' --- debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch 2011-11-27 00:03:32 +0000 +++ debian/patches/02-prevent-unused-but-set-variable-ftbfs.patch 1970-01-01 00:00:00 +0000 @@ -1,22 +0,0 @@ -Description: Prevents gcc 4.6 FTBFS (do not create a variable that is never used). - The relevant Bibletime upstream git log entry is: - commit 984d9f41bdb7efb9477a706fb1f524b2fbc9c54b - Author: Gary Holmlund <[email protected]> - Date: Mon May 16 22:05:02 2011 -0700 - Fix compile error on Fedora 15 -Origin: upstream, https://gitorious.org/bibletime/bibletime/commit/984d9f41bdb7efb9477a706fb1f524b2fbc9c54b -Author: Gary Holmlund <[email protected]> - -Index: debian/src/frontend/keychooser/ckeychooserwidget.cpp -=================================================================== ---- debian.orig/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:10:48.000000000 -0700 -+++ debian/src/frontend/keychooser/ckeychooserwidget.cpp 2011-07-10 14:11:20.000000000 -0700 -@@ -180,7 +180,7 @@ - emit changed(m_comboBox->currentIndex()); - } - -- const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized! -+ m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized! - //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly! - m_comboBox->show(); - === removed file 'debian/patches/series' --- debian/patches/series 2011-11-27 00:03:32 +0000 +++ debian/patches/series 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -01-fix-search-works-print-crash.patch -02-prevent-unused-but-set-variable-ftbfs.patch
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
