diff -Nru nageru-1.4.2/debian/changelog nageru-1.4.2/debian/changelog
--- nageru-1.4.2/debian/changelog	2016-12-19 00:38:36.000000000 +0000
+++ nageru-1.4.2/debian/changelog	2017-04-01 18:31:56.000000000 +0000
@@ -1,8 +1,10 @@
-nageru (1.4.2-1build1) zesty; urgency=medium
+nageru (1.4.2-2) unstable; urgency=high
 
-  * No-change rebuild against latest bmusb
+  * friendlier-opengl-error.diff: New patch from upstream git, adds a
+    friendlier error message if OpenGL initialization fails.
+    (Closes: #859217)
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 18 Dec 2016 19:38:36 -0500
+ -- Steinar H. Gunderson <sesse@debian.org>  Sat, 01 Apr 2017 20:31:56 +0200
 
 nageru (1.4.2-1) unstable; urgency=medium
 
diff -Nru nageru-1.4.2/debian/patches/friendlier-opengl-error.diff nageru-1.4.2/debian/patches/friendlier-opengl-error.diff
--- nageru-1.4.2/debian/patches/friendlier-opengl-error.diff	1970-01-01 00:00:00.000000000 +0000
+++ nageru-1.4.2/debian/patches/friendlier-opengl-error.diff	2017-04-01 18:31:56.000000000 +0000
@@ -0,0 +1,28 @@
+From 8a2371388d04aafca3604034de132035edd27cae Mon Sep 17 00:00:00 2001
+From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
+Date: Sat, 1 Apr 2017 20:30:06 +0200
+Subject: [PATCH] Make a friendlier error message if OpenGL initialization
+ fails.
+
+---
+ main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/main.cpp b/main.cpp
+index e156c59..dcaf2a6 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -52,6 +52,10 @@ int main(int argc, char *argv[])
+ 	QGLFormat::setDefaultFormat(QGLFormat::fromSurfaceFormat(fmt));
+ 
+ 	global_share_widget = new QGLWidget();
++	if (!global_share_widget->isValid()) {
++		fprintf(stderr, "Failed to initialize OpenGL. Nageru needs at least OpenGL 3.1 to function properly.\n");
++		exit(1);
++	}
+ 
+ 	MainWindow mainWindow;
+ 	mainWindow.resize(QSize(1500, 850));
+-- 
+2.11.0
+
diff -Nru nageru-1.4.2/debian/patches/series nageru-1.4.2/debian/patches/series
--- nageru-1.4.2/debian/patches/series	2016-08-02 20:48:35.000000000 +0000
+++ nageru-1.4.2/debian/patches/series	2017-04-01 18:31:48.000000000 +0000
@@ -1 +1,2 @@
 prefix-usr.diff
+friendlier-opengl-error.diff