Source: shotwell
Version: 0.22.0-4
Severity: wishlist
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: timestamps umask
X-Debbugs-Cc: reproducible-builds@lists.alioth.debian.org

Dear Maintainer,

While working on the “reproducible builds” effort [1], we have noticed
that 'shotwell' could not be built reproducibly.

The attached patch fixes date handling (tar needs an English date in
--mtime) and fixes files mode in the temp-source archive. Once
applied, shotwell can be built reproducibly in our current experimental
framework.

Regards,
Alexis Bienvenüe.

 [1]: https://wiki.debian.org/ReproducibleBuilds




diff -Nru shotwell-0.22.0/debian/changelog shotwell-0.22.0/debian/changelog
--- shotwell-0.22.0/debian/changelog	2016-03-21 13:15:42.000000000 +0100
+++ shotwell-0.22.0/debian/changelog	2016-04-29 11:10:27.000000000 +0200
@@ -1,3 +1,10 @@
+shotwell (0.22.0-4.0~reproducible1) UNRELEASED; urgency=medium
+
+  * Fix date handling for non-English locales
+  * Fix files mode in temp-source tarball
+
+ -- Alexis Bienvenüe <p...@passoire.fr>  Fri, 29 Apr 2016 08:57:37 +0200
+
 shotwell (0.22.0-4) unstable; urgency=medium
 
   * New debian/patches/0100-ios8.patch (Closes: #792016):
diff -Nru shotwell-0.22.0/debian/rules shotwell-0.22.0/debian/rules
--- shotwell-0.22.0/debian/rules	2015-11-03 11:57:14.000000000 +0100
+++ shotwell-0.22.0/debian/rules	2016-04-29 11:10:09.000000000 +0200
@@ -5,7 +5,7 @@
 export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w))
 
 CHDATE:=$(shell dpkg-parsechangelog --show-field=Date)
-B_DATE:=$(shell date -d "$(CHDATE)")
+B_DATE:=$(shell LC_ALL=C date --utc -d "$(CHDATE)")
 
 %:
 	dh $@
@@ -21,8 +21,7 @@
 	mkdir -p debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source
 	find -type f -name '*.c' -exec cp --parent '{}' debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source/ ';'
 	cd debian/shotwell-dbg/usr/share/doc/shotwell-dbg && \
-	find . -newermt '$(B_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(B_DATE)' && \
-	tar --mtime="$(B_DATE)" -cJf temp-source.tar.xz temp-source
+	tar --mode=go=rX,u+rw,a-s --mtime="$(B_DATE)" -cJf temp-source.tar.xz temp-source
 	rm -fr debian/shotwell-dbg/usr/share/doc/shotwell-dbg/temp-source
 
 override_dh_installchangelogs:
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds

Reply via email to