74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
From 5f999d05c6df82ff6d27ee555b82dd4d7620ca67 Mon Sep 17 00:00:00 2001
|
|
From: Jim Meyering <meyering@fb.com>
|
|
Date: Sun, 11 Jan 2015 16:44:35 -0800
|
|
Subject: [PATCH 1/2] update-copyright: recognize groff's \(co marker
|
|
|
|
* build-aux/update-copyright (circle_c_re): Also accept
|
|
uses of \(co, as found in gzip.1.
|
|
|
|
Upstream-commit: 06c61ed439c29bf0ff6261462afef6f84e772643
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
build-aux/update-copyright | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
|
|
index 90624e9..b0a19bc 100755
|
|
--- a/build-aux/update-copyright
|
|
+++ b/build-aux/update-copyright
|
|
@@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
|
|
if 0;
|
|
# Update an FSF copyright year list to include the current year.
|
|
|
|
-my $VERSION = '2013-01-03.09:41'; # UTC
|
|
+my $VERSION = '2015-01-02.04:14'; # UTC
|
|
|
|
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
|
+# Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
@@ -124,7 +124,7 @@ use strict;
|
|
use warnings;
|
|
|
|
my $copyright_re = 'Copyright';
|
|
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
|
|
+my $circle_c_re = '(?:\([cC]\)|@copyright{}|\\\\\(co|©)';
|
|
my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
|
|
$holder ||= 'Free Software Foundation, Inc.';
|
|
my $prefix_max = 5;
|
|
--
|
|
2.4.3
|
|
|
|
|
|
From 807f0f0ebef70b463a4e49a5a0c9e968ea7d3461 Mon Sep 17 00:00:00 2001
|
|
From: Friedrich Haubensak <hsk@fli-leibniz.de>
|
|
Date: Thu, 2 Jul 2015 14:36:33 +0100
|
|
Subject: [PATCH 2/2] update-copyright: fix test failure with perl >= 5.22
|
|
|
|
* build-aux/update-copyright: Escape a literal left curly bracket,
|
|
required with perl >= 5.22
|
|
|
|
Upstream-commit: 841d0dcfa8103235836a1aeb0c1ad657f43ade85
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
build-aux/update-copyright | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
|
|
index b0a19bc..b91248c 100755
|
|
--- a/build-aux/update-copyright
|
|
+++ b/build-aux/update-copyright
|
|
@@ -124,7 +124,7 @@ use strict;
|
|
use warnings;
|
|
|
|
my $copyright_re = 'Copyright';
|
|
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|\\\\\(co|©)';
|
|
+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)';
|
|
my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
|
|
$holder ||= 'Free Software Foundation, Inc.';
|
|
my $prefix_max = 5;
|
|
--
|
|
2.4.3
|
|
|