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

7 files changed, 67 insertions, 32 deletions

diff --git a/debian/changelog b/debian/changelog
index bf6a5f5..60be0b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libonig (6.9.10-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Fixes build failure with GCC 15 (C23) (Closes: #1097239).
+    - Refresh symbols file accordingly.
+  * Declare compliance with Debian Policy 4.7.2 (No changes needed).
+  * debian/copyright:
+    - Add year 2025 to myself.
+    - Add year 2024 to K.Kosako.
+    - Rewrite to make lrc happy.
+    - Fix old FSF address.
+  * debian/control:
+    - Change Vcs-Git from git: to https:.
+  * Remove obsolate debian/patches/0100-source_typos.patch.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 11 Sep 2025 19:08:56 +0200
+
 libonig (6.9.9-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index edaba76..d577ca8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper-compat (= 13)
-Standards-Version: 4.6.2.0
+Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://github.com/kkos/oniguruma
-Vcs-Git: git://git.jff.email/libonig.git
+Vcs-Git: https://git.jff.email/cgit/libonig.git
 Vcs-Browser: https://git.jff.email/cgit/libonig.git
 
 Package: libonig5
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.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 5050f32..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-libonig_6.9.9-1_source.buildinfo libs extra
diff --git a/debian/patches/0100-source_typos.patch b/debian/patches/0100-source_typos.patch
deleted file mode 100644
index 6444b65..0000000
--- a/debian/patches/0100-source_typos.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix typos
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2016-11-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/src/regerror.c
-===================================================================
---- trunk.orig/src/regerror.c
-+++ trunk/src/regerror.c
-@@ -63,7 +63,7 @@ onig_error_code_to_format(int code)
-   case ONIGERR_UNEXPECTED_BYTECODE:
-     p = "unexpected bytecode (bug)"; break;
-   case ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED:
--    p = "default multibyte-encoding is not setted"; break;
-+    p = "default multibyte-encoding is not set"; break;
-   case ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR:
-     p = "can't convert to wide-char on specified multibyte-encoding"; break;
-   case ONIGERR_FAIL_TO_INITIALIZE:
diff --git a/debian/patches/series b/debian/patches/series
index 0760549..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-#0100-source_typos.patch
diff --git a/debian/symbols b/debian/symbols
index 9276102..6f93672 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -59,6 +59,7 @@ libonig.so.5 libonig5 #MINVER#
  onig_builtin_fail@Base 6.8.1
  onig_builtin_max@Base 6.8.1
  onig_builtin_mismatch@Base 6.8.1
+ onig_builtin_skip@Base 6.9.10
  onig_builtin_total_count@Base 6.8.1
  onig_callout_tag_is_exist_at_callout_num@Base 6.8.1
  onig_callout_tag_table_free@Base 6.8.1