Merge branch 'release/debian/6.9.10-1'HEADdebian/6.9.10-1master

1 files changed, 47 insertions, 10 deletions

diff --git a/debian/copyright b/debian/copyright
index 08ff4c9..8a414d1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,25 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: oniguruma
 Upstream-Contact: K.Kosako <kkosako0@gmail.com>
 Source: https://github.com/kkos/oniguruma
 
 Files: *
-Copyright: 2002-2020 K.Kosako <kkosako0@gmail.com>
+Copyright: 2002-2024 K.Kosako <kkosako0@gmail.com>
 License: BSD-2-clause
 
+Files: INSTALL
+Copyright: 1994-2016 Free Software Foundation, Inc.
+License: FSFAP
+
+Files: install-sh
+Copyright: 1994      X Consortium
+License: X11
+
+Files: debian/*
+Copyright: 2006-2008 Max Kellermann <max@duempel.org>
+           2014-2025 Jörg Frings-Fürst <debian@jff.email>
+License: GPL-2+
+
 License: BSD-2-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
@@ -29,12 +42,6 @@ License: BSD-2-clause
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 
-
-Files: debian/*
-Copyright: 2006-2008 Max Kellermann <max@duempel.org>
-           2014-2023 Jörg Frings-Fürst <debian@jff.email>
-License: GPL-2+
-
 License: GPL-2+
  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
@@ -47,8 +54,38 @@ License: GPL-2+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
+ with this program; If not, see https://www.gnu.org/licenses/.
  .
  On Debian systems, the full text of the GNU General Public License version 2
  can be found in the file `/usr/share/common-licenses/GPL-2'.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+License: X11
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+ .
+ FSF changes to this file are in the public domain.
+
+License: FSFAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.  This file is offered as-is,
+ without warranty of any kind.