diff options
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/doc-default-os-debian.patch | 2 | ||||
| -rw-r--r-- | debian/patches/man-hyperlinks.patch | 2 | ||||
| -rw-r--r-- | debian/patches/nroff-map-CW-to-R.patch | 2 | ||||
| -rw-r--r-- | debian/patches/source-date-epoch-utc.patch | 38 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 2 |
8 files changed, 36 insertions, 23 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index fe40ca3..c4ce76b 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -742dfac36f1fd23e17d27dbf83e3793d3f3a063d -742dfac36f1fd23e17d27dbf83e3793d3f3a063d +107cd6d6e837d9b6201e071f9488fa5e32e6aa64 +107cd6d6e837d9b6201e071f9488fa5e32e6aa64 4e2e28947560f0b5e3a7e89d43846b9183fb4c09 4e2e28947560f0b5e3a7e89d43846b9183fb4c09 groff_1.23.0.orig.tar.gz diff --git a/debian/changelog b/debian/changelog index 9db676f..0be6887 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +groff (1.23.0-4) unstable; urgency=medium + + * Build-depend on pkgconf rather than pkg-config. + * Fix PDF date format (thanks, Christof Meerwald; closes: #1069902). + + -- Colin Watson <cjwatson@debian.org> Tue, 30 Apr 2024 12:25:43 +0100 + groff (1.23.0-3) unstable; urgency=medium [ G. Branden Robinson ] diff --git a/debian/control b/debian/control index edd71b0..e07cbef 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: bison, libxt-dev, m4, netpbm, - pkg-config, + pkgconf, poppler-utils <!nocheck>, psutils, texinfo, diff --git a/debian/patches/doc-default-os-debian.patch b/debian/patches/doc-default-os-debian.patch index c1eaa8a..01ef51d 100644 --- a/debian/patches/doc-default-os-debian.patch +++ b/debian/patches/doc-default-os-debian.patch @@ -1,4 +1,4 @@ -From 9bd0e1f19bb2591b30d628710ab805ca265789bc Mon Sep 17 00:00:00 2001 +From 8f84439183c7c0940b13ef4459e5e1312f309e9e Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Sun, 9 Jul 2023 12:04:37 +0100 Subject: Set doc-default-operating-system to "Debian" diff --git a/debian/patches/man-hyperlinks.patch b/debian/patches/man-hyperlinks.patch index d28dec8..9bef412 100644 --- a/debian/patches/man-hyperlinks.patch +++ b/debian/patches/man-hyperlinks.patch @@ -1,4 +1,4 @@ -From 43f8bc8009a33929db3f3bafadf17f606c1b850a Mon Sep 17 00:00:00 2001 +From a1f87d74b9521bda316dbab92b1e8fdc9d3c71ea Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Tue, 11 Jul 2023 17:33:14 +0100 Subject: Enable OSC 8 hyperlinks for man pages diff --git a/debian/patches/nroff-map-CW-to-R.patch b/debian/patches/nroff-map-CW-to-R.patch index 8a99c9b..7e28b9e 100644 --- a/debian/patches/nroff-map-CW-to-R.patch +++ b/debian/patches/nroff-map-CW-to-R.patch @@ -1,4 +1,4 @@ -From 742dfac36f1fd23e17d27dbf83e3793d3f3a063d Mon Sep 17 00:00:00 2001 +From 107cd6d6e837d9b6201e071f9488fa5e32e6aa64 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Fri, 14 Jul 2023 12:42:26 +0100 Subject: Map CW to R for nroff diff --git a/debian/patches/source-date-epoch-utc.patch b/debian/patches/source-date-epoch-utc.patch index b9e5b76..0853b1e 100644 --- a/debian/patches/source-date-epoch-utc.patch +++ b/debian/patches/source-date-epoch-utc.patch @@ -1,4 +1,4 @@ -From 56d2f35b18a8e6502c6aa842c07b3d27fe9f6f7f Mon Sep 17 00:00:00 2001 +From 91dee0fbd709ec191800fbb1d12446215c7d0380 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Sun, 9 Jul 2023 13:23:21 +0100 Subject: Display time from SOURCE_DATE_EPOCH in UTC. @@ -46,7 +46,8 @@ from UTC is not a whole number of hours. * src/roff/troff/troff.1.man (Environment): Update. Origin: upstream, https://git.savannah.gnu.org/cgit/groff.git/commit/?id=d7bbfb04ea25a82a8597cdef6ebb391cb78ab47c -Last-Update: 2023-07-11 +Origin: upstream, https://git.savannah.gnu.org/cgit/groff.git/commit/?id=0815e503dba8d5c05921d68c6c718fe8f8440ee8 +Last-Update: 2024-04-30 Patch-Name: source-date-epoch-utc.patch --- @@ -54,7 +55,7 @@ Patch-Name: source-date-epoch-utc.patch src/devices/grohtml/grohtml.1.man | 12 +++++++----- src/devices/grohtml/post-html.cpp | 16 ++++------------ src/devices/gropdf/gropdf.1.man | 10 +++++----- - src/devices/gropdf/gropdf.pl | 16 ++++++++++++++-- + src/devices/gropdf/gropdf.pl | 19 +++++++++++++++---- src/devices/grops/grops.1.man | 12 +++++++----- src/devices/grops/ps.cpp | 9 ++------- src/include/curtime.h | 19 +++++++++++-------- @@ -62,7 +63,7 @@ Patch-Name: source-date-epoch-utc.patch src/roff/groff/groff.1.man | 12 +++++++----- src/roff/troff/input.cpp | 24 +++++++++--------------- src/roff/troff/troff.1.man | 12 +++++++----- - 12 files changed, 93 insertions(+), 85 deletions(-) + 12 files changed, 94 insertions(+), 87 deletions(-) diff --git a/doc/groff.texi b/doc/groff.texi index 2a6635e9d..bcea4f3e7 100644 @@ -198,7 +199,7 @@ index d1d39bbe0..20a957e68 100644 . .\" ==================================================================== diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl -index c65a1051f..0e1b612a5 100644 +index c65a1051f..4ba5a48df 100644 --- a/src/devices/gropdf/gropdf.pl +++ b/src/devices/gropdf/gropdf.pl @@ -23,6 +23,7 @@ @@ -209,32 +210,35 @@ index c65a1051f..0e1b612a5 100644 use constant { -@@ -343,7 +344,12 @@ for $papersz ( split(" ", lc($possiblesizes).' #duff#') ) +@@ -343,8 +344,7 @@ for $papersz ( split(" ", lc($possiblesizes).' #duff#') ) # If we get here, $papersz was invalid, so try the next one. } -my (@dt)=localtime($ENV{SOURCE_DATE_EPOCH} || time); -+my @dt; -+if ($ENV{SOURCE_DATE_EPOCH}) { -+ @dt=gmtime($ENV{SOURCE_DATE_EPOCH}); -+} else { -+ @dt=localtime; -+} - my $dt=PDFDate(\@dt); +-my $dt=PDFDate(\@dt); ++my $dt=PDFDate(time); my %info=('Creator' => "(groff version $cfg{GROFF_VERSION})", -@@ -628,7 +634,13 @@ sub GetObj + 'Producer' => "(gropdf version $cfg{GROFF_VERSION})", +@@ -627,8 +627,19 @@ sub GetObj + sub PDFDate { - my $dt=shift; +- my $dt=shift; - return(sprintf("D:%04d%02d%02d%02d%02d%02d%+03d'00'",$dt->[5]+1900,$dt->[4]+1,$dt->[3],$dt->[2],$dt->[1],$dt->[0],( localtime time() + 3600*( 12 - (gmtime)[2] ) )[2] - 12)); ++ my $ts=shift; ++ my @dt; + my $offset; ++ my $rel; + if ($ENV{SOURCE_DATE_EPOCH}) { + $offset=0; ++ @dt=gmtime($ENV{SOURCE_DATE_EPOCH}); + } else { -+ $offset=mktime((localtime $dt)[0..5]) - mktime((gmtime $dt)[0..5]); ++ @dt=localtime($ts); ++ $offset=mktime(@dt[0..5]) - mktime((gmtime $ts)[0..5]); + } -+ return(sprintf("D:%04d%02d%02d%02d%02d%02d%+03d'%+03d'",$dt->[5]+1900,$dt->[4]+1,$dt->[3],$dt->[2],$dt->[1],$dt->[0],int($offset/3600),int(($offset%3600)/60))); ++ $rel=($offset==0)?'Z':($offset>0)?'+':'-'; ++ return(sprintf("D:%04d%02d%02d%02d%02d%02d%s%02d'%02d'",$dt[5]+1900,$dt[4]+1,$dt[3],$dt[2],$dt[1],$dt[0],$rel,int(abs($offset)/3600),int((abs($offset)%3600)/60))); } sub ToPoints diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 5a834fa..818c2ec 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -4,3 +4,5 @@ include: variables: SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1 + SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1 + BUILD_PROFILES: nocheck |