[med-svn] [Git][med-team/mira][master] 2 commits: Modify patch to also fix source-date-epoch compileinfo

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / mira


Commits:
ac6a4c3e by Nilesh Patra at 2023-06-18T17:56:12+05:30
Modify patch to also fix source-date-epoch compileinfo

- - - - -
c9287ee4 by Nilesh Patra at 2023-06-18T17:58:24+05:30
Upload to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/echo-dm.patch → debian/patches/fix-debian-compileinfo.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,18 @@
-mira (4.9.6-9) UNRELEASED; urgency=medium
+mira (4.9.6-9) unstable; urgency=medium
 
   * Team Upload.
   * Make package cross-build
     + Drop un-needed B-D on perl
     + Pass boost include dir and libdir for easy cross-compilation
-  * Add override for README.html, source is present in the source package
-
- -- Nilesh Patra <nilesh at debian.org>  Sun, 18 Jun 2023 12:49:40 +0530
+  * Add override for README.html, source is present
+    in the source package.
+  * Set SOURCE_DATE_EPOCH, ISDEBIAN and DEBIAN_MAINTAINER
+    to get debian-specific repro builds working.
+  * Add patch to:
+    + Fix upstream mistake, actually echo DEBIAN_MAINTAINER name
+    + convert source-date-epoch to actual date to put into compileinfo
+
+ -- Nilesh Patra <nilesh at debian.org>  Sun, 18 Jun 2023 17:56:43 +0530
 
 mira (4.9.6-8) unstable; urgency=medium
 


=====================================
debian/patches/echo-dm.patch → debian/patches/fix-debian-compileinfo.patch
=====================================
@@ -1,21 +1,19 @@
-diff --git a/src/progs/Makefile.am b/src/progs/Makefile.am
-index 4696c38..bc87bbd 100644
 --- a/src/progs/Makefile.am
 +++ b/src/progs/Makefile.am
-@@ -23,7 +23,7 @@ compileinfo-std:
+@@ -23,8 +23,8 @@
  
  compileinfo-debian:
  	@/bin/echo -n "Compiled by: " >compileinfo.itxt.xxd
 -	@$$DEBIAN_MAINTAINER >>compileinfo.itxt.xxd
+-	@echo $$SOURCE_DATE_EPOCH >>compileinfo.itxt.xxd
 +	@echo $$DEBIAN_MAINTAINER >>compileinfo.itxt.xxd
- 	@echo $$SOURCE_DATE_EPOCH >>compileinfo.itxt.xxd
++	@date -d @$$SOURCE_DATE_EPOCH >>compileinfo.itxt.xxd
  
  compileinfo.itxt: ciclean compileinfo-$(CITARGET)
-diff --git a/src/progs/Makefile.in b/src/progs/Makefile.in
-index cedcff5..653db31 100644
+ 	@echo "Making .C out of .xxd" $@
 --- a/src/progs/Makefile.in
 +++ b/src/progs/Makefile.in
-@@ -603,7 +603,7 @@ compileinfo-std:
+@@ -603,7 +603,7 @@
  
  compileinfo-debian:
  	@/bin/echo -n "Compiled by: " >compileinfo.itxt.xxd


=====================================
debian/patches/series
=====================================
@@ -4,4 +4,4 @@ man-directory
 fix_buildorder.patch
 gcc-12.patch
 gcc-13.patch
-echo-dm.patch
+fix-debian-compileinfo.patch



View it on GitLab: https://salsa.debian.org/med-team/mira/-/compare/6dfc25ea5da30511b6622193250f4b7e46fd3b95...c9287ee47c3c326573077a43b4cf2bd05d94551f

-- 
View it on GitLab: https://salsa.debian.org/med-team/mira/-/compare/6dfc25ea5da30511b6622193250f4b7e46fd3b95...c9287ee47c3c326573077a43b4cf2bd05d94551f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230618/0d15d3a7/attachment-0001.htm>