On 01/09/13 22:41, Adam D. Barratt wrote: > On Sun, 2013-09-01 at 21:11 +0100, Jonathan Wiltshire wrote: > > There is one instance of whitespace noise in your patch: > [...] > > so please go ahead, and it's up to you if you want to correct that first. > > One additional note: > > +stellarium (0.11.3-1+deb7u1) wheezy; urgency=high > + > + * Applied patch that fixes #709303 > > Please uses "Closes: #709303" there, as you would with any other upload > (possibly with a more useful description, but there's no reason not to > let the bug get automatically handled). > > Regards, > > Adam >
Ok, corrected and attached. Tomasz
diff -Nru stellarium-0.11.3/debian/changelog stellarium-0.11.3/debian/changelog --- stellarium-0.11.3/debian/changelog 2013-08-27 19:01:55.000000000 +0200 +++ stellarium-0.11.3/debian/changelog 2013-09-01 23:54:30.000000000 +0200 @@ -1,3 +1,9 @@ +stellarium (0.11.3-1+deb7u1) wheezy; urgency=high + + * Do not crash when OpenGL is not available (Closes: #709303) + + -- Tomasz Buchert <tomasz.buch...@inria.fr> Tue, 27 Aug 2013 18:31:06 +0200 + stellarium (0.11.3-1) unstable; urgency=low * Imported Upstream version 0.11.3 diff -Nru stellarium-0.11.3/debian/patches/fix-bug-709303.patch stellarium-0.11.3/debian/patches/fix-bug-709303.patch --- stellarium-0.11.3/debian/patches/fix-bug-709303.patch 1970-01-01 01:00:00.000000000 +0100 +++ stellarium-0.11.3/debian/patches/fix-bug-709303.patch 2013-09-01 23:52:31.000000000 +0200 @@ -0,0 +1,46 @@ +This patch fixes Debian Bug #709303 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=709303). +Issue was resolved upstream (http://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/6093) +and the patch was imported from there. +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -334,22 +334,26 @@ + + if (!QGLFormat::hasOpenGL()) + { ++ qWarning() << "Oops... This system does not support OpenGL."; + QMessageBox::warning(0, "Stellarium", q_("This system does not support OpenGL.")); ++ app.quit(); + } ++ else ++ { ++ StelMainWindow mainWin; ++ mainWin.init(confSettings); ++ app.exec(); ++ mainWin.deinit(); ++ ++ delete confSettings; ++ StelLogger::deinit(); ++ ++ #ifdef Q_OS_WIN ++ if(timerGrain) ++ timeEndPeriod(timerGrain); ++ #endif //Q_OS_WIN + +- StelMainWindow mainWin; +- mainWin.init(confSettings); +- app.exec(); +- mainWin.deinit(); +- +- delete confSettings; +- StelLogger::deinit(); +- +- #ifdef Q_OS_WIN +- if(timerGrain) +- timeEndPeriod(timerGrain); +- #endif //Q_OS_WIN +- +- return 0; ++ return 0; ++ } + } + diff -Nru stellarium-0.11.3/debian/patches/series stellarium-0.11.3/debian/patches/series --- stellarium-0.11.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ stellarium-0.11.3/debian/patches/series 2013-09-01 23:51:39.000000000 +0200 @@ -0,0 +1 @@ +fix-bug-709303.patch