Control: tags 829755 pending
Control: tags 901345 pending

I've uploaded an NMU to DELAYED/10 fixing reproducible builds and cross
building issues:

diff -Nru elvis-tiny-1.4/debian/changelog elvis-tiny-1.4/debian/changelog
--- elvis-tiny-1.4/debian/changelog     2016-11-11 07:20:53.000000000 -0800
+++ elvis-tiny-1.4/debian/changelog     2022-10-06 14:10:44.000000000 -0700
@@ -1,3 +1,16 @@
+elvis-tiny (1.4-24.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Reiner Herrmann ]
+  * Strip build date to enable reproducible building. (Closes: #829755)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Let dh_auto_build pass cross tools to make.
+    (Closes: #901345)
+
+ -- Vagrant Cascadian <vagr...@reproducible-builds.org>  Thu, 06 Oct 2022 
14:10:44 -0700
+
 elvis-tiny (1.4-24) unstable; urgency=low
 
   * remove bin/vi wrapper, incompatible with / + /usr merge (closes: 
#540928,#813857)
diff -Nru elvis-tiny-1.4/debian/patches/series 
elvis-tiny-1.4/debian/patches/series
--- elvis-tiny-1.4/debian/patches/series        2012-06-29 13:36:03.000000000 
-0700
+++ elvis-tiny-1.4/debian/patches/series        2022-10-06 14:10:44.000000000 
-0700
@@ -11,3 +11,4 @@
 patch-bug-258640.diff
 patch-siglongjmp.diff
 patch-fix-resize.diff
+strip-build-date-to-enable-reproducible-.patch
diff -Nru 
elvis-tiny-1.4/debian/patches/strip-build-date-to-enable-reproducible-.patch 
elvis-tiny-1.4/debian/patches/strip-build-date-to-enable-reproducible-.patch
--- 
elvis-tiny-1.4/debian/patches/strip-build-date-to-enable-reproducible-.patch    
    1969-12-31 16:00:00.000000000 -0800
+++ 
elvis-tiny-1.4/debian/patches/strip-build-date-to-enable-reproducible-.patch    
    2022-10-06 14:10:44.000000000 -0700
@@ -0,0 +1,24 @@
+From: Reiner Herrmann <rei...@reiner-h.de>
+Date: Tue, 5 Jul 2016 21:25:37 +0200
+X-Dgit-Generated: 1.4-24.1 a916d656222970d87859c16014646663d51286e1
+Subject: Strip build date to enable reproducible building
+
+(Closes: #829755)
+
+If DATE is not defined, the C file doesn't embed it, so no change is
+required there.
+
+---
+
+diff --git a/Makefile.mix b/Makefile.mix
+index 38f2774..bd7a8d0 100644
+--- a/Makefile.mix
++++ b/Makefile.mix
+@@ -49,7 +49,6 @@ CFLAGS=      -O2 -DM_SYSV -DCRUNCH -DNO_MKEXRC 
-DNO_CURSORSHAPE -DNO_CHARATTR \
+       -fsigned-char $(EXTRA_CFLAGS)
+ OF=   -o 
+ RF=   -c
+-DATE= -DDATE=\'\"`date`\"\'
+ EVAL= eval 
+ PROGS=        elvis
+ CHMEM=        
diff -Nru elvis-tiny-1.4/debian/rules elvis-tiny-1.4/debian/rules
--- elvis-tiny-1.4/debian/rules 2016-11-11 07:05:43.000000000 -0800
+++ elvis-tiny-1.4/debian/rules 2022-10-06 14:10:44.000000000 -0700
@@ -6,10 +6,10 @@
 endif
 
 %:
-       dh $@
+       dh $@ --buildsystem=makefile
 
 override_dh_auto_build:
-       make -f Makefile.mix EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
+       dh_auto_build -- -f Makefile.mix EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
 
 override_dh_auto_install:
        install -m 755 -d $(tmp)/bin

Attachment: signature.asc
Description: PGP signature

Reply via email to