Add buildflags into Makefiles, remove useless tags

11 files changed, 36 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index a9df1ae..4abf157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+shotwell (0.20.2-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #769025).
+  * debian/control:
+    - Remove useless ${shlibs:Depends} from shotwell-dbg.
+  * debian/rules:
+    - Remove useless hardening parts.
+  * New debian/patches/500-buildflags.patch:
+    - Poke buildflags into Makefile
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 07 Jan 2015 14:23:48 +0100
+
 shotwell (0.20.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8f9e7e1..5575478 100644
--- a/debian/control
+++ b/debian/control
@@ -62,8 +62,7 @@ Package: shotwell-dbg
 Priority: extra
 Section: debug
 Architecture: linux-any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Depends: ${misc:Depends},
          shotwell (= ${binary:Version})
 Description: digital photo organizer - debugging symbols
  Shotwell is a digital photo organizer designed for the GNOME desktop
diff --git a/debian/patches/500-buildflags.patch b/debian/patches/500-buildflags.patch
new file mode 100644
index 0000000..fa493ab
--- /dev/null
+++ b/debian/patches/500-buildflags.patch
@@ -0,0 +1,22 @@
+Description: Poke requested Debian buildflags for hardening into Makefile
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2015-01-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -394,10 +394,11 @@ VALA_CFLAGS := `pkg-config --cflags $(EX
+ 	$(foreach def,$(DEFINES),-D$(def))
+ 
+ VALA_LDFLAGS := `pkg-config --libs $(EXT_PKGS) $(DIRECT_LIBS) gthread-2.0`
++VALA_LDFLAGS += -fPIE -pie -Wl,-z,relro -Wl,-z,now
+ 
+ # REQUIRED_CFLAGS absolutely get appended to CFLAGS, whatever the
+ # the value of CFLAGS in the environment
+-REQUIRED_CFLAGS := -fPIC
++REQUIRED_CFLAGS := -fPIC -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
+ 
+ # setting CFLAGS in configure.mk overrides build type
+ ifndef CFLAGS
diff --git a/debian/patches/series b/debian/patches/series
index 2535d18..bfb8f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+500-buildflags.patch
 hardening.patch
 libexec.patch
diff --git a/debian/rules b/debian/rules
index 49701c2..71e7242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
 
 export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
 
diff --git a/shotwell_0.18.1.orig.tar.xz.delta b/shotwell_0.18.1.orig.tar.xz.delta
deleted file mode 100644
index e88f123..0000000
--- a/shotwell_0.18.1.orig.tar.xz.delta
+++ /dev/null
diff --git a/shotwell_0.18.1.orig.tar.xz.id b/shotwell_0.18.1.orig.tar.xz.id
deleted file mode 100644
index 6db7e2b..0000000
--- a/shotwell_0.18.1.orig.tar.xz.id
+++ /dev/null
@@ -1 +0,0 @@
-d2e54377d14d604356c86862a326f64ae64dadd6
diff --git a/shotwell_0.20.0.orig.tar.xz.delta b/shotwell_0.20.0.orig.tar.xz.delta
deleted file mode 100644
index d5039e4..0000000
--- a/shotwell_0.20.0.orig.tar.xz.delta
+++ /dev/null
diff --git a/shotwell_0.20.0.orig.tar.xz.id b/shotwell_0.20.0.orig.tar.xz.id
deleted file mode 100644
index 7da1a9b..0000000
--- a/shotwell_0.20.0.orig.tar.xz.id
+++ /dev/null
@@ -1 +0,0 @@
-6eaeba1cf78d3f03b8a1d5bfa998eb104ca47425
diff --git a/shotwell_0.20.1.orig.tar.xz.delta b/shotwell_0.20.1.orig.tar.xz.delta
deleted file mode 100644
index e646a6b..0000000
--- a/shotwell_0.20.1.orig.tar.xz.delta
+++ /dev/null
diff --git a/shotwell_0.20.1.orig.tar.xz.id b/shotwell_0.20.1.orig.tar.xz.id
deleted file mode 100644
index b849f7c..0000000
--- a/shotwell_0.20.1.orig.tar.xz.id
+++ /dev/null
@@ -1 +0,0 @@
-b9afc8d1553a62369c373c703d4f479ad81188af