New upstream-release, remove/refresh patches

5 files changed, 22 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 8eb918c..bb78e7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+shotwell (0.22.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches:
+    - debian/patches/hardening.patch
+    - debían/patches/500-buildflags.patch
+  * Remove upstream applied patch:
+    - debian/patches/505-fix-viewer-desktop-file.patch
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 03 Apr 2015 13:16:32 +0200
+
 shotwell (0.20.2-2) unstable; urgency=low
 
   * Add user scripts to replace shotwell-video-thumbnailer
diff --git a/debian/patches/500-buildflags.patch b/debian/patches/500-buildflags.patch
index 46cf411..a8030ec 100644
--- a/debian/patches/500-buildflags.patch
+++ b/debian/patches/500-buildflags.patch
@@ -7,7 +7,7 @@ Index: trunk/Makefile
 ===================================================================
 --- trunk.orig/Makefile
 +++ trunk/Makefile
-@@ -394,10 +394,11 @@ VALA_CFLAGS := `pkg-config --cflags $(EX
+@@ -395,10 +395,11 @@ VALA_CFLAGS := `pkg-config --cflags $(EX
  	$(foreach def,$(DEFINES),-D$(def))
  
  VALA_LDFLAGS := `pkg-config --libs $(EXT_PKGS) $(DIRECT_LIBS) gthread-2.0`
@@ -20,7 +20,7 @@ Index: trunk/Makefile
  
  # setting CFLAGS in configure.mk overrides build type
  ifndef CFLAGS
-@@ -410,8 +411,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe
+@@ -411,8 +412,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe
  endif
  endif
  
diff --git a/debian/patches/505-fix-viewer-desktop-file.patch b/debian/patches/505-fix-viewer-desktop-file.patch
index eeaa76c..30505b5 100644
--- a/debian/patches/505-fix-viewer-desktop-file.patch
+++ b/debian/patches/505-fix-viewer-desktop-file.patch
@@ -5,7 +5,8 @@ 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
+Applied-Upstream: 0.22.0, https://git.gnome.org/browse/shotwell/commit/?id=2ecda59a5562565967647b6c3d44dd99a48a04ef
+Last-Update: 2015-04-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/Makefile
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 33d92a6..c60496f 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -3,9 +3,9 @@ Author: Devid Antonio Filoni <d.filoni@ubuntu.com>
 
 Index: trunk/Makefile
 ===================================================================
---- trunk.orig/Makefile	2014-10-09 12:18:23.260829459 +0200
-+++ trunk/Makefile	2014-10-09 12:18:23.252829340 +0200
-@@ -35,7 +35,7 @@
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -35,7 +35,7 @@ CORE_SUPPORTED_LANGUAGES=$(shell cat po/
  LOCAL_LANG_DIR=locale-langpack
  SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
  
@@ -14,7 +14,7 @@ Index: trunk/Makefile
  ifdef UNITY_SUPPORT
  VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT
  endif
-@@ -671,7 +671,7 @@
+@@ -673,7 +673,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
  	@
  
  $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
@@ -25,9 +25,9 @@ Index: trunk/Makefile
  	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
 Index: trunk/plugins/Makefile.plugin.mk
 ===================================================================
---- trunk.orig/plugins/Makefile.plugin.mk	2014-10-09 12:18:23.260829459 +0200
-+++ trunk/plugins/Makefile.plugin.mk	2014-10-09 12:19:22.945701585 +0200
-@@ -41,7 +41,7 @@
+--- trunk.orig/plugins/Makefile.plugin.mk
++++ trunk/plugins/Makefile.plugin.mk
+@@ -41,7 +41,7 @@ DEFINES := -D_VERSION='"$(PLUGINS_VERSIO
  all: $(PLUGIN).so
  
  .stamp: $(SRC_FILES) $(MAKE_FILES) $(HEADER_FILES)
diff --git a/debian/patches/series b/debian/patches/series
index 782add2..bfb8f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 500-buildflags.patch
-505-fix-viewer-desktop-file.patch
 hardening.patch
 libexec.patch