Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libpaper for openSUSE:Factory
checked in at 2023-04-21 14:15:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpaper (Old)
and /work/SRC/openSUSE:Factory/.libpaper.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpaper"
Fri Apr 21 14:15:46 2023 rev:6 rq:1080490 version:2.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpaper/libpaper.changes 2023-03-07
16:48:49.961110408 +0100
+++ /work/SRC/openSUSE:Factory/.libpaper.new.1533/libpaper.changes
2023-04-21 14:15:58.374231272 +0200
@@ -1,0 +2,7 @@
+Thu Apr 20 07:37:34 UTC 2023 - Paolo Stivanin <i...@paolostivanin.com>
+
+- Update to 2.1.0:
+ * This release reintroduces the old âpaperconfâ utility, for
+ backwards compatibility only.
+
+-------------------------------------------------------------------
Old:
----
libpaper-2.0.10.tar.gz
New:
----
libpaper-2.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpaper.spec ++++++
--- /var/tmp/diff_new_pack.3loq2B/_old 2023-04-21 14:15:59.082235242 +0200
+++ /var/tmp/diff_new_pack.3loq2B/_new 2023-04-21 14:15:59.090235286 +0200
@@ -19,7 +19,7 @@
%define sover 2
Name: libpaper
-Version: 2.0.10
+Version: 2.1.0
Release: 0
Summary: Enables users to indicate their preferred paper size
License: GPL-3.0-or-later
@@ -90,6 +90,7 @@
%files -n %{name}-tools
%{_bindir}/paper
+%{_bindir}/paperconf
%{_mandir}/man1/paper.1.gz
%files -n %{name}%{sover}
++++++ libpaper-2.0.10.tar.gz -> libpaper-2.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/README new/libpaper-2.1.0/README
--- old/libpaper-2.0.10/README 2023-02-19 17:36:30.000000000 +0100
+++ new/libpaper-2.1.0/README 2023-04-13 15:37:12.000000000 +0200
@@ -20,12 +20,17 @@
* The âpaperâ program is distributed under the GNU General Public Licence
version 3, or, at your option, any later version. See the file
COPYING-GPL-3.
+ * The âpaperconfâ program by Yyes Arrouye and Adrian Bunk is distributed
+ under the GNU General Public Licence version 2.
Libpaper was developed by Reuben Thomas <r...@sc3d.org>, based on the
design of libpaper by Yves Arrouye <y...@debian.org>, improved by
Adrian Bunk <b...@fs.tum.de>. It also supersedes the earlier âpaperâ
package developed by Reuben Thomas.
+The âpaperconfâ program is supplied for backwards-compatibility with
+libpaper version 1. It is deprecated, and will be removed in future.
+
Installation from source
------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/configure
new/libpaper-2.1.0/configure
--- old/libpaper-2.0.10/configure 2023-02-24 10:39:17.000000000 +0100
+++ new/libpaper-2.1.0/configure 2023-04-13 15:48:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libpaper 2.0.10.
+# Generated by GNU Autoconf 2.71 for libpaper 2.1.0.
#
# Report bugs to <r...@sc3d.org>.
#
@@ -620,8 +620,8 @@
# Identity of this package.
PACKAGE_NAME='libpaper'
PACKAGE_TARNAME='libpaper'
-PACKAGE_VERSION='2.0.10'
-PACKAGE_STRING='libpaper 2.0.10'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='libpaper 2.1.0'
PACKAGE_BUGREPORT='r...@sc3d.org'
PACKAGE_URL='https://github.com/rrthomas/libpaper'
@@ -2632,7 +2632,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libpaper 2.0.10 to adapt to many kinds of systems.
+\`configure' configures libpaper 2.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2703,7 +2703,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpaper 2.0.10:";;
+ short | recursive ) echo "Configuration of libpaper 2.1.0:";;
esac
cat <<\_ACEOF
@@ -2823,7 +2823,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpaper configure 2.0.10
+libpaper configure 2.1.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3485,7 +3485,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libpaper $as_me 2.0.10, which was
+It was created by libpaper $as_me 2.1.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4791,7 +4791,7 @@
# Define the identity of the package.
PACKAGE='libpaper'
- VERSION='2.0.10'
+ VERSION='2.1.0'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -33702,7 +33702,7 @@
case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
- | gnu* | *-musl* | midnightbsd* \
+ | gnu* | *-musl* | midipix* | midnightbsd* \
| hpux* | solaris* | cygwin* | mingw* | msys* )
ac_cv_func_realloc_0_nonnull="guessing yes" ;;
# If we don't know, obey --enable-cross-guesses.
@@ -37637,7 +37637,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libpaper $as_me 2.0.10, which was
+This file was extended by libpaper $as_me 2.1.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -37706,7 +37706,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-libpaper config.status 2.0.10
+libpaper config.status 2.1.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/configure.ac
new/libpaper-2.1.0/configure.ac
--- old/libpaper-2.0.10/configure.ac 2023-02-24 10:38:28.000000000 +0100
+++ new/libpaper-2.1.0/configure.ac 2023-04-13 15:45:02.000000000 +0200
@@ -21,7 +21,7 @@
AC_PREREQ([2.71])
dnl Initialise autoconf and automake
-AC_INIT([libpaper],[2.0.10],[r...@sc3d.org],[],[https://github.com/rrthomas/libpaper])
+AC_INIT([libpaper],[2.1.0],[r...@sc3d.org],[],[https://github.com/rrthomas/libpaper])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIRS([m4])
AM_INIT_AUTOMAKE([-Wall subdir-objects])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/lib/libpaper.rc
new/libpaper-2.1.0/lib/libpaper.rc
--- old/libpaper-2.0.10/lib/libpaper.rc 2023-02-24 10:42:48.000000000 +0100
+++ new/libpaper-2.1.0/lib/libpaper.rc 2023-04-13 15:48:12.000000000 +0200
@@ -1,8 +1,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,10
- PRODUCTVERSION 2,0,10,0
+ FILEVERSION 2,1,0
+ PRODUCTVERSION 2,1,0,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,12 +15,12 @@
BEGIN
VALUE "CompanyName", "none"
VALUE "FileDescription", "libpaper"
- VALUE "FileVersion", "2.0.10"
- VALUE "InternalName", "libpaper-2.0"
+ VALUE "FileVersion", "2.1.0"
+ VALUE "InternalName", "libpaper-2.1"
VALUE "LegalCopyright", "Copyright (C) 2013-2021 Reuben Thomas"
- VALUE "OriginalFilename", "libpaper-2.0.dll"
+ VALUE "OriginalFilename", "libpaper-2.1.dll"
VALUE "ProductName", "libpaper"
- VALUE "ProductVersion", "2.0.10"
+ VALUE "ProductVersion", "2.1.0"
END
END
BLOCK "VarFileInfo"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/m4/realloc.m4
new/libpaper-2.1.0/m4/realloc.m4
--- old/libpaper-2.0.10/m4/realloc.m4 2023-01-09 09:38:08.000000000 +0100
+++ new/libpaper-2.1.0/m4/realloc.m4 2023-02-25 22:15:07.000000000 +0100
@@ -1,4 +1,4 @@
-# realloc.m4 serial 26
+# realloc.m4 serial 27
dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,7 +25,7 @@
[case "$host_os" in
# Guess yes on platforms where we know the result.
*-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
- | gnu* | *-musl* | midnightbsd* \
+ | gnu* | *-musl* | midipix* | midnightbsd* \
| hpux* | solaris* | cygwin* | mingw* | msys* )
ac_cv_func_realloc_0_nonnull="guessing yes" ;;
# If we don't know, obey --enable-cross-guesses.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/src/Makefile.am
new/libpaper-2.1.0/src/Makefile.am
--- old/libpaper-2.0.10/src/Makefile.am 2023-01-07 22:42:52.000000000 +0100
+++ new/libpaper-2.1.0/src/Makefile.am 2023-04-12 23:07:42.000000000 +0200
@@ -1,6 +1,6 @@
# Source code Makefile.am
#
-# Copyright (c) 2013-2021 Reuben Thomas <r...@sc3d.org>
+# Copyright (c) 2013-2023 Reuben Thomas <r...@sc3d.org>
#
# This file is part of libpaper.
#
@@ -26,10 +26,11 @@
AM_CFLAGS = $(WARN_CFLAGS)
RELOCATABLE_LIBRARY_PATH = $(libdir)
-bin_PROGRAMS = paper
+bin_PROGRAMS = paper paperconf
paper_SOURCES = paper.c tbl_opts.h
paper_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" $(AM_CPPFLAGS)
if RELOCATABLE_VIA_LD
paper_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
endif
paper_LDADD = $(top_builddir)/lib/libpaper.la
$(top_builddir)/src/libgnu/libgnupaper.la
+paperconf_LDADD = $(paper_LDADD)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/src/Makefile.in
new/libpaper-2.1.0/src/Makefile.in
--- old/libpaper-2.0.10/src/Makefile.in 2023-02-24 10:39:19.000000000 +0100
+++ new/libpaper-2.1.0/src/Makefile.in 2023-04-13 15:48:11.000000000 +0200
@@ -16,7 +16,7 @@
# Source code Makefile.am
#
-# Copyright (c) 2013-2021 Reuben Thomas <r...@sc3d.org>
+# Copyright (c) 2013-2023 Reuben Thomas <r...@sc3d.org>
#
# This file is part of libpaper.
#
@@ -108,7 +108,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = paper$(EXEEXT)
+bin_PROGRAMS = paper$(EXEEXT) paperconf$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/src/m4/__inline.m4 \
@@ -222,6 +222,9 @@
paper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(paper_LDFLAGS) $(LDFLAGS) -o $@
+paperconf_SOURCES = paperconf.c
+paperconf_OBJECTS = paperconf.$(OBJEXT)
+paperconf_DEPENDENCIES = $(paper_LDADD)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -237,7 +240,8 @@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/paper-paper.Po
+am__depfiles_remade = ./$(DEPDIR)/paper-paper.Po \
+ ./$(DEPDIR)/paperconf.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -257,8 +261,8 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(paper_SOURCES)
-DIST_SOURCES = $(paper_SOURCES)
+SOURCES = $(paper_SOURCES) paperconf.c
+DIST_SOURCES = $(paper_SOURCES) paperconf.c
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -1623,6 +1627,7 @@
paper_CPPFLAGS = -DINSTALLDIR=\"$(bindir)\" $(AM_CPPFLAGS)
@RELOCATABLE_VIA_LD_TRUE@paper_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
paper_LDADD = $(top_builddir)/lib/libpaper.la
$(top_builddir)/src/libgnu/libgnupaper.la
+paperconf_LDADD = $(paper_LDADD)
all: all-recursive
.SUFFIXES:
@@ -1711,6 +1716,10 @@
@rm -f paper$(EXEEXT)
$(AM_V_CCLD)$(paper_LINK) $(paper_OBJECTS) $(paper_LDADD) $(LIBS)
+paperconf$(EXEEXT): $(paperconf_OBJECTS) $(paperconf_DEPENDENCIES)
$(EXTRA_paperconf_DEPENDENCIES)
+ @rm -f paperconf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(paperconf_OBJECTS) $(paperconf_LDADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -1718,6 +1727,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paper-paper.Po@am__quote@ #
am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paperconf.Po@am__quote@ #
am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -1969,6 +1979,7 @@
distclean: distclean-recursive
-rm -f ./$(DEPDIR)/paper-paper.Po
+ -rm -f ./$(DEPDIR)/paperconf.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -2015,6 +2026,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f ./$(DEPDIR)/paper-paper.Po
+ -rm -f ./$(DEPDIR)/paperconf.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/src/paperconf.c
new/libpaper-2.1.0/src/paperconf.c
--- old/libpaper-2.0.10/src/paperconf.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libpaper-2.1.0/src/paperconf.c 2023-04-13 15:50:51.000000000 +0200
@@ -0,0 +1,212 @@
+/* Copyright (C) 1996, Yves Arrouye <arro...@debian.org>
+ 2001, Adrian Bunk <b...@fs.tum.de>
+ 2023, Reuben Thomas <r...@sc3d.org>
+
+ This program is distributed under the GNU General Public Licence version
+ 2. See https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
+*/
+
+#include "config.h"
+
+#include <sys/param.h>
+
+#include <ctype.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <paper.h>
+
+static void usage(const char* name)
+{
+ fprintf(stderr,
+ "usage: %s [ [ -p ] papername | -d | -a ] [ -z ] [ -n | -N ] [ -s |
-w | -h ] [ -c | -m | -i ]\n",
+ name);
+ exit(1);
+}
+
+#define OPT_NAME 1
+#define OPT_UPPERNAME 2
+#define OPT_WIDTH 4
+#define OPT_HEIGHT 8
+#define OPT_CM 16
+#define OPT_MM 32
+#define OPT_INCH 64
+#define OPT_CONTINUE 128
+
+#define OPT_UNIT (OPT_CM | OPT_MM | OPT_INCH)
+
+#define INCHxCM 2.54
+
+static void printf_downcase(const char *s)
+{
+ if (strlen(s) == 0)
+ return;
+ printf("%c%s", tolower(s[0]), s + 1);
+}
+
+static void printinfo(const struct paper* paper, int options)
+{
+ int pr = 0;
+
+ if ((options & ~(OPT_CONTINUE)) == 0)
+ options = OPT_NAME;
+
+ if (options & OPT_NAME) {
+ printf_downcase(papername(paper));
+ pr = 1;
+ } else if (options & OPT_UPPERNAME) {
+ if (islower(*papername(paper)))
+ printf("%c%s", toupper(*papername(paper)), papername(paper) + 1);
+ else
+ printf_downcase(papername(paper));
+ pr = 1;
+ }
+
+ if (options & OPT_WIDTH) {
+ if (pr)
+ putchar(' ');
+ if (options & OPT_CM)
+ printf("%g cm", paperpswidth(paper) / 72.0 * INCHxCM );
+ else if (options & OPT_MM)
+ printf("%g mm", paperpswidth(paper) / 72.0 * 10 * INCHxCM );
+ else if (options & OPT_INCH)
+ printf("%g\"", paperpswidth(paper) / 72.0 );
+ else
+ printf("%g", paperpswidth(paper) );
+ pr = 1;
+ }
+ if (options & OPT_HEIGHT) {
+ if (pr) putchar(' ');
+ if (options & OPT_CM)
+ printf("%g cm", paperpsheight(paper) / 72.0 * INCHxCM );
+ else if (options & OPT_MM)
+ printf("%g mm", paperpsheight(paper) / 72.0 * 10 * INCHxCM );
+ else if (options & OPT_INCH)
+ printf("%g\"", paperpsheight(paper) / 72.0 );
+ else
+ printf("%g", paperpsheight(paper) );
+ pr = 1;
+ }
+
+ putchar('\n');
+}
+
+int main(int argc, char** argv)
+{
+ int all = 0;
+ const char* paper = NULL;
+ int options = 0;
+
+ const char* progname = strrchr(*argv, '/');
+ if (progname)
+ ++progname;
+ else
+ progname = *argv;
+
+ int c;
+ while ((c = getopt(argc, argv, "adznNswhcmip:")) != EOF) {
+ switch (c) {
+ case 'a':
+ if (paper || all)
+ usage(progname);
+ all = 1;
+ break;
+ case 'd':
+ if (paper || all)
+ usage(progname);
+ paper = defaultpapername();
+ break;
+ case 'p':
+ if (paper || all)
+ usage(progname);
+ paper = optarg;
+ break;
+ case 'z':
+ options |= OPT_CONTINUE;
+ break;
+ case 'n':
+ if (options & OPT_UPPERNAME) usage(progname);
+ options |= OPT_NAME;
+ break;
+ case 'N':
+ if (options & OPT_NAME) usage(progname);
+ options |= OPT_UPPERNAME;
+ break;
+ case 's':
+ options |= OPT_WIDTH | OPT_HEIGHT;
+ break;
+ case 'w':
+ options |= OPT_WIDTH;
+ break;
+ case 'h':
+ options |= OPT_HEIGHT;
+ break;
+ case 'c':
+ if (options & OPT_UNIT) usage(progname);
+ options |= OPT_CM;
+ break;
+ case 'm':
+ if (options & OPT_UNIT) usage(progname);
+ options |= OPT_MM;
+ break;
+ case 'i':
+ if (options & OPT_UNIT) usage(progname);
+ options |= OPT_INCH;
+ break;
+ default:
+ usage(progname);
+ }
+ }
+
+ if (optind < argc - 1 || (paper && optind != argc))
+ usage(progname);
+ else if (optind != argc)
+ paper = argv[optind];
+
+ paperinit();
+
+ if (all) {
+ const struct paper* papers;
+
+ for (papers = paperfirst(); papers; papers = papernext(papers))
+ printinfo(papers, options);
+ } else {
+ const struct paper* syspaper;
+
+ if (!paper)
+ paper = systempapername();
+ if (!paper)
+ paper = defaultpapername();
+ if (!paper) {
+ char errmsg[2 * MAXPATHLEN + 64];
+ sprintf(errmsg, "%s: cannot get system paper size", progname);
+
+ if (errno)
+ perror(errmsg);
+ else
+ fputs(errmsg, stderr);
+
+ paperdone();
+ exit(3);
+ }
+
+ syspaper = paperinfo(paper);
+
+ if (syspaper)
+ printinfo(syspaper, options);
+ else {
+ fprintf(stderr, "%s: unknown paper `%s'\n", progname, paper);
+ if (options & OPT_CONTINUE)
+ printf_downcase(paper);
+
+ paperdone();
+ exit(2);
+ }
+ }
+
+ paperdone();
+ return 0;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libpaper-2.0.10/tests/run-test
new/libpaper-2.1.0/tests/run-test
--- old/libpaper-2.0.10/tests/run-test 2023-02-19 17:36:30.000000000 +0100
+++ new/libpaper-2.1.0/tests/run-test 2023-04-12 19:28:24.000000000 +0200
@@ -51,7 +51,11 @@
echo "Expected exit code $expected_exit but was $exit_code"
exit 1
fi
- sed -e 's|\\|/|g' -e 's|^.*/paper:|paper:|g' < "$basename-output.txt" >
"$basename-output-fixed.txt"
+ # Fix variation in output:
+ # 1. Convert backslashes to forward slashes
+ # 2. Compress double slashes (from relocated paths on some systems)
+ # 3. Remove prefix of name of 'paper' executable
+ sed -e 's|\\|/|g' -e 's|//|/|g' -e 's|^.*/paper:|paper:|g' <
"$basename-output.txt" > "$basename-output-fixed.txt"
$DIFF -u "$expected_file" "$basename-output-fixed.txt"
}
