changed debian/source/format to native

This commit is contained in:
openKylinBot 2022-05-13 20:12:41 +08:00
parent fa4e0ce04d
commit 1c049e95a1
4 changed files with 1 additions and 62 deletions

View File

@ -1,29 +0,0 @@
From: Rhonda D'Vine <rhonda@debian.org>
Date: Fri, 13 May 2022 20:12:40 +0800
Subject: Remove --force option from po4a calls
The --force option forced a regenerate of the pot files on every call,
hindering the reproducible buildability of the package
---
GNUmakefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 6051159..88e98ad 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -173,12 +173,12 @@ po/dctrl-tools.pot : $(src) lib/msg.h
# create (or update) dctrl-tools-man.pot
man/po4a/po/dctrl-tools-man.pot :
touch man/po4a/po/dctrl-tools-man.pot
- $(PO4A) --force --no-translations $(PO4A_CONFIG)
+ $(PO4A) --no-translations $(PO4A_CONFIG)
# build translated manpages in man/translated/$lang/
po4a :
touch man/po4a/po/dctrl-tools-man.pot
- $(PO4A) --force --no-backups $(PO4A_CONFIG)
+ $(PO4A) --no-backups $(PO4A_CONFIG)
# handle the "%.1 : %.1.cp" rule if and only if the grep-dctrl.1.cp file exists
translated-man : po4a

View File

@ -1,30 +0,0 @@
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Fri, 13 May 2022 20:12:40 +0800
Subject: Sort object files for deterministic linking order
---
GNUmakefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 88e98ad..75f108f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -31,7 +31,7 @@ PO4A = po4a
PO4A_CONFIG = man/po4a/po4a.cfg
libsrc = $(wildcard lib/*.c)
-libobj = $(libsrc:.c=.o)
+libobj = $(sort $(libsrc:.c=.o))
src = $(libsrc) \
$(wildcard grep-dctrl/*.c) \
@@ -39,7 +39,7 @@ src = $(libsrc) \
$(wildcard tbl-dctrl/*.c) \
$(wildcard join-dctrl/*.c)
-obj = $(src:.c=.o)
+obj = $(sort $(src:.c=.o))
exe = grep-dctrl/grep-dctrl \
sort-dctrl/sort-dctrl \

View File

@ -1,2 +0,0 @@
GNUmakefile_remove---force-from-po4a-call
reproducible_build.patch

View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)