------------------------------------------------------------ revno: 50 committer: Jonathan Marsden <[email protected]> branch nick: main timestamp: Tue 2010-07-13 11:15:16 -0700 message: New upstream version 2.7.2 modified: CMakeLists.txt ChangeLog debian/changelog src/bibletime.cpp src/frontend/displaywindow/cdisplaywindow.cpp
-- lp:~pkgcrosswire/bibletime/main https://code.launchpad.net/~pkgcrosswire/bibletime/main Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibletime/main. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription
=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2010-05-20 03:49:24 +0000 +++ CMakeLists.txt 2010-07-13 18:15:16 +0000 @@ -5,7 +5,7 @@ # BibleTime version SET(BT_VERSION_MAJOR "2") SET(BT_VERSION_MINOR "7") -SET(BT_REVISION_PATCH "") +SET(BT_REVISION_PATCH "2") # Determine SVN patch version, if needed: IF (NOT (DEFINED BT_REVISION_PATCH)) === modified file 'ChangeLog' --- ChangeLog 2010-05-20 03:49:24 +0000 +++ ChangeLog 2010-07-13 18:15:16 +0000 @@ -1,3 +1,13 @@ +2010-07-11 Martin Gruner <[email protected]> + * Released 2.7.2 + * fix version number + +2010-07-06 Martin Gruner <[email protected]> + * Released 2.7.1 + +2010-05-29 Gary Holmlund <[email protected]> + * Fix crash opening first window in manual arrangement mode. + 2010-05-19 Martin Gruner <[email protected]> * Released 2.7 === modified file 'debian/changelog' --- debian/changelog 2010-05-20 03:49:24 +0000 +++ debian/changelog 2010-07-13 18:15:16 +0000 @@ -1,3 +1,9 @@ +bibletime (2.7.2-1) unstable; urgency=low + + * New upstream version 2.7.2 + + -- Jonathan Marsden <[email protected]> Tue, 13 Jul 2010 11:10:43 -0700 + bibletime (2.7-1) unstable; urgency=low * New upstream version 2.7 === modified file 'src/bibletime.cpp' --- src/bibletime.cpp 2010-05-10 17:24:05 +0000 +++ src/bibletime.cpp 2010-07-13 18:15:16 +0000 @@ -181,10 +181,8 @@ CDisplayWindow* displayWindow = CDisplayWindowFactory::createReadInstance(modules, m_mdi); if ( displayWindow ) { displayWindow->init(); - if (m_mdi->subWindowList().count() == 0) - displayWindow->showMaximized(); - else - displayWindow->show(); + m_mdi->addSubWindow(displayWindow); + displayWindow->show(); // if (!key.isEmpty()) displayWindow->lookupKey(key); } === modified file 'src/frontend/displaywindow/cdisplaywindow.cpp' --- src/frontend/displaywindow/cdisplaywindow.cpp 2010-05-10 17:24:05 +0000 +++ src/frontend/displaywindow/cdisplaywindow.cpp 2010-07-13 18:15:16 +0000 @@ -50,7 +50,6 @@ m_history(0) { qDebug() << "CDisplayWindow::CDisplayWindow"; setAttribute(Qt::WA_DeleteOnClose); //we want to destroy this window when it is closed - parent->addSubWindow(this); m_actionCollection = new BtActionCollection(this); setModules(modules);
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
