diff -Nru geeqie-1.2.2/debian/changelog geeqie-1.2.2/debian/changelog
--- geeqie-1.2.2/debian/changelog	2015-09-10 14:32:22.000000000 +0000
+++ geeqie-1.2.2/debian/changelog	2015-11-03 07:58:09.000000000 +0000
@@ -1,3 +1,11 @@
+geeqie (1:1.2.2-2) unstable; urgency=medium
+
+  * Do not provide menu file as we ship desktop one as well.
+  * Add patch to fix display if RAW images caused by gcc 5 transition
+    (Closes: #800350, #798274, #799353). 
+
+ -- Michal Čihař <nijel@debian.org>  Tue, 03 Nov 2015 08:58:05 +0100
+
 geeqie (1:1.2.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru geeqie-1.2.2/debian/clean geeqie-1.2.2/debian/clean
--- geeqie-1.2.2/debian/clean	2015-09-10 13:51:58.000000000 +0000
+++ geeqie-1.2.2/debian/clean	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-geeqie.xpm
diff -Nru geeqie-1.2.2/debian/geeqie-common.install geeqie-1.2.2/debian/geeqie-common.install
--- geeqie-1.2.2/debian/geeqie-common.install	2015-09-10 13:51:58.000000000 +0000
+++ geeqie-1.2.2/debian/geeqie-common.install	2015-11-03 07:55:13.000000000 +0000
@@ -1,4 +1,3 @@
-geeqie.xpm /usr/share/pixmaps
 usr/share/pixmaps
 usr/lib/geeqie
 usr/share/doc/geeqie/html
diff -Nru geeqie-1.2.2/debian/geeqie.menu geeqie-1.2.2/debian/geeqie.menu
--- geeqie-1.2.2/debian/geeqie.menu	2015-09-10 13:51:58.000000000 +0000
+++ geeqie-1.2.2/debian/geeqie.menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-?package(geeqie): \
-    needs="X11" \
-    section="Applications/Graphics" \
-    title="Geeqie" \
-    command="/usr/bin/geeqie" \
-    icon="/usr/share/pixmaps/geeqie.xpm" \
-    longtitle="Geeqie Image Viewer"
diff -Nru geeqie-1.2.2/debian/patches/geeqie-bug-800350-libstc++-copy-on-write-string.diff geeqie-1.2.2/debian/patches/geeqie-bug-800350-libstc++-copy-on-write-string.diff
--- geeqie-1.2.2/debian/patches/geeqie-bug-800350-libstc++-copy-on-write-string.diff	1970-01-01 00:00:00.000000000 +0000
+++ geeqie-1.2.2/debian/patches/geeqie-bug-800350-libstc++-copy-on-write-string.diff	2015-11-03 07:51:31.000000000 +0000
@@ -0,0 +1,52 @@
+Subject: Fix RAW photos display with new GCC
+From: David Kalnischkies <david@kalnischkies.de>
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index 455c8d3..98029cd 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -16,6 +16,7 @@
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ #include <iostream>
++#include <string>
+ 
+ // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
+ #ifndef EXIV2_TEST_VERSION
+@@ -1130,9 +1131,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
+ 
+ 	if (!exif->image()) return NULL;
+ 	
+-	const char* path = exif->image()->io().path().c_str();
++	std::string const path = exif->image()->io().path();
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	gboolean is_raw = filter_file_class(path, FORMAT_CLASS_RAWIMAGE);
++	gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
+ 	
+ 	if (!is_raw && requested_width == 0) return NULL;
+ 
+@@ -1232,10 +1233,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 	if (!exif) return NULL;
+ 	if (!exif->image()) return NULL;
+ 
+-	const char* path = exif->image()->io().path().c_str();
++	std::string const path = exif->image()->io().path();
+ 
+ 	/* given image pathname, first do simple (and fast) file extension test */
+-	if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
++	if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
+ 
+ 	try {
+ 		struct stat st;
+@@ -1246,9 +1247,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
+ 		
+ 		RawFile rf(exif->image()->io());
+ 		offset = rf.preview_offset();
+-		DEBUG_1("%s: offset %lu", path, offset);
++		DEBUG_1("%s: offset %lu", path.c_str(), offset);
+ 		
+-		fd = open(path, O_RDONLY);
++		fd = open(path.c_str(), O_RDONLY);
+ 		if (fd == -1)
+ 			{
+ 			return NULL;
diff -Nru geeqie-1.2.2/debian/patches/series geeqie-1.2.2/debian/patches/series
--- geeqie-1.2.2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ geeqie-1.2.2/debian/patches/series	2015-11-03 07:51:31.000000000 +0000
@@ -0,0 +1 @@
+geeqie-bug-800350-libstc++-copy-on-write-string.diff
diff -Nru geeqie-1.2.2/debian/rules geeqie-1.2.2/debian/rules
--- geeqie-1.2.2/debian/rules	2015-09-10 13:54:39.000000000 +0000
+++ geeqie-1.2.2/debian/rules	2015-11-03 07:51:31.000000000 +0000
@@ -11,10 +11,6 @@
 		--enable-lirc \
 		--disable-gtk3
 
-override_dh_auto_build:
-	dh_auto_build
-	convert geeqie.png -scale 32x32 geeqie.xpm
-
 override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/geeqie/html
 	dh_auto_install