From f08ccc45757cf84d2387c3d20205f7dab62f07e7 Mon Sep 17 00:00:00 2001 From: openKylinBot Date: Mon, 16 May 2022 15:10:15 +0800 Subject: [PATCH] format patches --- debian/patches/01-237630-err-in-string.patch | 28 +++++++++++-------- debian/patches/02-makefile-dependencies.patch | 19 +++++++++---- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian/patches/01-237630-err-in-string.patch b/debian/patches/01-237630-err-in-string.patch index f84be18..bfc77e8 100644 --- a/debian/patches/01-237630-err-in-string.patch +++ b/debian/patches/01-237630-err-in-string.patch @@ -1,16 +1,20 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=237630 - From: Thorsten Alteholz +Date: Mon, 16 May 2022 15:10:15 +0800 +Subject: err-in-string This is a small patch to avoid an endless loop. In case of an error textwrap() adds at the end of the string and returns with the string that was built up to that error. +--- + textwrap.3 | 3 +++ + textwrap.c | 8 ++++++++ + 2 files changed, 11 insertions(+) -Index: libtextwrap-0.1/textwrap.3 -=================================================================== ---- libtextwrap-0.1.orig/textwrap.3 -+++ libtextwrap-0.1/textwrap.3 -@@ -78,6 +78,9 @@ proper number of space code (0x20) by \f +diff --git a/textwrap.3 b/textwrap.3 +index 4bac77b..67f1f84 100644 +--- a/textwrap.3 ++++ b/textwrap.3 +@@ -78,6 +78,9 @@ proper number of space code (0x20) by \fBtextwrap\fR. .SH RETURN VALUE \fBtextwrap()\fR returns the line-folded text. You can free(3) the given value. @@ -20,11 +24,11 @@ Index: libtextwrap-0.1/textwrap.3 .\" ******************************************************************** .SH EXAMPLE .nf -Index: libtextwrap-0.1/textwrap.c -=================================================================== ---- libtextwrap-0.1.orig/textwrap.c -+++ libtextwrap-0.1/textwrap.c -@@ -300,6 +300,14 @@ textwrap(const textwrap_t *prop, const c +diff --git a/textwrap.c b/textwrap.c +index 5753ec9..5c14781 100644 +--- a/textwrap.c ++++ b/textwrap.c +@@ -300,6 +300,14 @@ textwrap(const textwrap_t *prop, const char *text) now = p; /* current character */ ml = mblen(p, MB_CUR_MAX); diff --git a/debian/patches/02-makefile-dependencies.patch b/debian/patches/02-makefile-dependencies.patch index 9ce0f08..ead461b 100644 --- a/debian/patches/02-makefile-dependencies.patch +++ b/debian/patches/02-makefile-dependencies.patch @@ -1,10 +1,17 @@ -Description: Fix a dependency bug in Makefile.am - Old bug exposed by automake 1.16. -Author: Adrian Bunk -Bug-Debian: https://bugs.debian.org/905472 +From: Adrian Bunk +Date: Mon, 16 May 2022 15:10:15 +0800 +Subject: Fix a dependency bug in Makefile.am ---- libtextwrap-0.1.orig/Makefile.am -+++ libtextwrap-0.1/Makefile.am +Old bug exposed by automake 1.16. +Bug-Debian: https://bugs.debian.org/905472 +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 80acb10..bd7e5e8 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -8,4 +8,4 @@ man_MANS = textwrap.3 dotextwrap.1 bin_PROGRAMS = dotextwrap