This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository sweethome3d.
commit 396e6dd35915b742b863464f61479153db29429f Author: tony mancill <[email protected]> Date: Tue Feb 24 20:49:06 2015 -0800 Revert "Make build reproducible, png timestamps." This reverts commit c51c78d372079084f1bcd430ea7d36ca9dc8bbe3. Conflicts: debian/changelog Reverting in order to have a minimal changeset for unblock request for upload to jessie. --- debian/changelog | 5 ----- debian/rules | 2 -- 2 files changed, 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 538dbf0..8910ff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ sweethome3d (4.5+dfsg-3) unstable; urgency=medium * Team upload. - - [ Gabriele Giacone ] - * Make build reproducible, remove timestamps from PNG files. - - [ tony mancill ] * Set checkForUpdates=false as the default. (Closes: #778947). -- tony mancill <[email protected]> Sun, 22 Feb 2015 09:40:22 -0800 diff --git a/debian/rules b/debian/rules index 669b0d8..bcab269 100755 --- a/debian/rules +++ b/debian/rules @@ -19,11 +19,9 @@ override_dh_auto_install: for i in 16 22 48 128; do \ mkdir -p $(ICONS)/$$i; \ convert $(ABOUT) -colorspace RGB -resize $${i}x$${i} \ - +set date:create +set date:modify -define png:exclude-chunk=time \ -colorspace sRGB $(ICONS)/$$i/sweethome3d.png; \ done convert $(ABOUT) -colorspace RGB -resize 32x32 \ - +set date:create +set date:modify -define png:exclude-chunk=time \ -colorspace sRGB $(ICONS)/sweethome3d.xpm dh_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
