summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/hardening.patch8
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/shotwell.lintian-overrides4
4 files changed, 14 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 6308220..a9df1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-shotwell (0.20.0-2) unstable; urgency=medium
+shotwell (0.20.1-1) unstable; urgency=medium
+ * New upstream release.
+ * Add sharedobject-in-library-directory-missing-soname to
+ lintian-overrides.
* debian/patch/hardening.patch:
- Add removal of --fatal-warnings at plugins/Makefile.plugins.mk
to prevent build errors on armel and mips.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 09 Oct 2014 08:59:04 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 09 Oct 2014 11:57:41 +0200
shotwell (0.20.0-1) unstable; urgency=medium
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index 44c59c5..33d92a6 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -3,8 +3,8 @@ Author: Devid Antonio Filoni <d.filoni@ubuntu.com>
Index: trunk/Makefile
===================================================================
---- trunk.orig/Makefile 2014-10-09 08:02:24.871560620 +0200
-+++ trunk/Makefile 2014-10-09 08:02:24.867560531 +0200
+--- 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 @@
LOCAL_LANG_DIR=locale-langpack
SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale
@@ -25,8 +25,8 @@ 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-03-04 23:54:12.000000000 +0100
-+++ trunk/plugins/Makefile.plugin.mk 2014-10-09 08:02:56.340224031 +0200
+--- 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 @@
all: $(PLUGIN).so
diff --git a/debian/rules b/debian/rules
index b5c9967..49701c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
-VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
+export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
%:
dh $@
diff --git a/debian/shotwell.lintian-overrides b/debian/shotwell.lintian-overrides
index f403c2d..f2a6e4b 100644
--- a/debian/shotwell.lintian-overrides
+++ b/debian/shotwell.lintian-overrides
@@ -1 +1,5 @@
image-file-in-usr-lib
+#
+# see debian bug #731987
+#
+sharedobject-in-library-directory-missing-soname \ No newline at end of file