summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-02-01 16:34:53 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-02-01 16:34:53 +0100
commitd2fbbed6c9e7da895915ef57ae57be63a6bfe4a7 (patch)
treed584580b6cafbdb5637a63837d58e7a6b267063b /debian/patches
parente4e0c9e36afec29cf3f5e4f24c2b085a12c7837f (diff)
Add Build-Depends libicu-dev to debian/control; add patch for fix the desktop file
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/505-fix-viewer-desktop-file.patch26
-rw-r--r--debian/patches/series1
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/505-fix-viewer-desktop-file.patch b/debian/patches/505-fix-viewer-desktop-file.patch
new file mode 100644
index 0000000..eeaa76c
--- /dev/null
+++ b/debian/patches/505-fix-viewer-desktop-file.patch
@@ -0,0 +1,26 @@
+Description: Fix viewer desktop file
+ A typo in the Makefile, probably due to a quick copy/paste, results in an
+ incorrectly generated desktop file for the photo viewer.
+Author: Raphaël Halimi <raphael.halimi@gmail.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776745
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=743799
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=743799
+Last-Update: 2015-02-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -493,9 +493,8 @@ endif
+ misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
+ cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
+ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
+- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
+- echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
+- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
++ LANGUAGE=$(lang) gettext --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` \
++ >> misc/shotwell-viewer.desktop ; \
+ echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
+ --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
+ ifndef DISABLE_DESKTOP_VALIDATE
diff --git a/debian/patches/series b/debian/patches/series
index bfb8f07..782add2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
500-buildflags.patch
+505-fix-viewer-desktop-file.patch
hardening.patch
libexec.patch