diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-02-01 16:34:53 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-02-01 16:34:53 +0100 |
| commit | d2fbbed6c9e7da895915ef57ae57be63a6bfe4a7 (patch) | |
| tree | d584580b6cafbdb5637a63837d58e7a6b267063b | |
| parent | e4e0c9e36afec29cf3f5e4f24c2b085a12c7837f (diff) | |
Add Build-Depends libicu-dev to debian/control; add patch for fix the desktop file
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/505-fix-viewer-desktop-file.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 33 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 55b8d57..79afab5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ shotwell (0.20.2-2) UNRELEASED; urgency=medium + debian/shotwell.postrm + debian/shotwell.examples - Thanks to Teo Romera <teoromera@gmail.com>. + * Add debian/505-fix-viewer-desktop-file.patch to correct build of + shotwell-viewer.desktop (Closes: #776745). + - thanks to Raphaël Halimi <raphael.halimi@gmail.com>. + * debian/control: + - Add Build-Depends libicu-dev for missing unicode/ucnv.h. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 22 Jan 2015 18:03:59 +0100 diff --git a/debian/control b/debian/control index 5575478..bacf090 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: libgstreamer1.0-dev (>= 1.0.0), libgtk-3-dev (>= 3.6.0), libgudev-1.0-dev (>= 145), + libicu-dev, libjson-glib-dev, libraw-dev (>= 0.14), librest-dev (>= 0.7), 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 |