Merge branch 'release/debian/1.0-1'debian/1.0-1

6 files changed, 66 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 25b1c77d..87f0aad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libunistring (1.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Declare compliance with Debian Policy 4.6.0.1 (No changes needed).
+  * Refresh debian/libunistring2.symbols.
+  * debian/copyright:
+    - Refresh uploader copyright years.
+    - Add 2022 to myself.
+  * debian/patches:
+    - Refresh 0700-multiarch-libc.patch.
+    - In series comment out:
+      + 0005-fix_build_musl.patch
+      + 0705-gcc-9.patch
+      + 0010-AC_INIT.patch
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 08 Jan 2022 18:08:42 +0100
+
 libunistring (0.9.10-6) unstable; urgency=medium
 
   * New debian/patches/0010-AC_INIT.patch to fix AC_INIT handling
diff --git a/debian/control b/debian/control
index f8e7e509..f69dc165 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper-compat (= 13)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0.1
 Section: libs
 Rules-Requires-Root: no
 Homepage: https://www.gnu.org/software/libunistring/
diff --git a/debian/copyright b/debian/copyright
index cb0d99f4..47894ea7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,22 +4,22 @@ Upstream-Contact: Bruno Haible <bruno@clisp.org>
 Source: http://ftp.gnu.org/gnu/libunistring/
 
 Files: *
-Copyright: 1995-2017 Free Software Foundation, Inc.
+Copyright: 1995-2022 Free Software Foundation, Inc.
 License: LGPL-3+ or GPL-2+
 
 Files: gnulib-m4/* m4/*.m4
-Copyright: 1995-2017 Free Software Foundation, Inc.
+Copyright: 1995-2022 Free Software Foundation, Inc.
 License: FreeSoftware
  This file is free software; the Free Software Foundation
  gives unlimited permission to copy and/or distribute it,
  with or without modifications, as long as this notice is preserved.
 
 Files: doc/*
-Copyright: 2001-2017 Free Software Foundation, Inc.
+Copyright: 2001-2022 Free Software Foundation, Inc.
 License: GPL-3+ or GFDL-1.2+
 
 Files: tests/* woe32dll/* autogen.sh
-Copyright: 1990-2017 Free Software Foundation, Inc.
+Copyright: 1990-2022 Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: build-aux/*
@@ -28,7 +28,7 @@ License: GPL-2+
 
 Files: m4/init-package-version.m4
        build-aux/ltmain.sh
-Copyright: 1992-2009, Free Software Foundation, Inc.
+Copyright: 1992-2021, Free Software Foundation, Inc.
 License: GPL-2+ with distribution exception
  This file is free software, distributed under the terms of the GNU
  General Public License.  As a special exception to the GNU General
@@ -48,7 +48,7 @@ License: MIT
 
 Files: debian/*
 Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org>
-           2017-2021 Jörg Frings-Fürst <debian@jff.email>
+           2017-2022 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: LGPL-3+
diff --git a/debian/libunistring2.symbols b/debian/libunistring2.symbols
index 88d0c92d..bbd04e21 100644
--- a/debian/libunistring2.symbols
+++ b/debian/libunistring2.symbols
@@ -72,6 +72,12 @@ libunistring.so.2 libunistring2 #MINVER#
  UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT@Base 0.9.7
  UC_PROPERTY_DEPRECATED@Base 0.9.7
  UC_PROPERTY_DIACRITIC@Base 0.9.7
+ UC_PROPERTY_EMOJI@Base 1.0
+ UC_PROPERTY_EMOJI_COMPONENT@Base 1.0
+ UC_PROPERTY_EMOJI_MODIFIER@Base 1.0
+ UC_PROPERTY_EMOJI_MODIFIER_BASE@Base 1.0
+ UC_PROPERTY_EMOJI_PRESENTATION@Base 1.0
+ UC_PROPERTY_EXTENDED_PICTOGRAPHIC@Base 1.0
  UC_PROPERTY_EXTENDER@Base 0.9.7
  UC_PROPERTY_FORMAT_CONTROL@Base 0.9.7
  UC_PROPERTY_GRAPHEME_BASE@Base 0.9.7
@@ -111,6 +117,7 @@ libunistring.so.2 libunistring2 #MINVER#
  UC_PROPERTY_PUNCTUATION@Base 0.9.7
  UC_PROPERTY_QUOTATION_MARK@Base 0.9.7
  UC_PROPERTY_RADICAL@Base 0.9.7
+ UC_PROPERTY_REGIONAL_INDICATOR@Base 1.0
  UC_PROPERTY_SENTENCE_TERMINAL@Base 0.9.7
  UC_PROPERTY_SOFT_DOTTED@Base 0.9.7
  UC_PROPERTY_SPACE@Base 0.9.7
@@ -152,10 +159,10 @@ libunistring.so.2 libunistring2 #MINVER#
  libunistring_gl_locale_name_posix@Base 0.9.7
  libunistring_gl_locale_name_thread@Base 0.9.7
  libunistring_gl_unicase_special_lookup@Base 0.9.7
- libunistring_gl_uninorm_compose_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_gl_uninorm_compose_lookup@Base 0.9.7
  libunistring_gl_uninorm_decomp_chars_table@Base 0.9.7
  libunistring_gl_uninorm_decomp_index_table@Base 0.9.7
- libunistring_gl_uninorm_decompose_merge_sort_fromto@Base 0.9.7
+#MISSING: 1.0-1# libunistring_gl_uninorm_decompose_merge_sort_fromto@Base 0.9.7
  libunistring_gl_uninorm_decompose_merge_sort_inplace@Base 0.9.7
  libunistring_glthread_once_singlethreaded@Base 0.9.7
  libunistring_glthread_recursive_lock_init_multithreaded@Base 0.9.7
@@ -179,30 +186,36 @@ libunistring.so.2 libunistring2 #MINVER#
  libunistring_printf_frexp@Base 0.9.7
  libunistring_printf_frexpl@Base 0.9.7
  libunistring_rpl_mbrtowc@Base 0.9.7
+ libunistring_setlocale_null@Base 1.0
+ libunistring_setlocale_null_r@Base 1.0
  libunistring_str_cd_iconveh@Base 0.9.7
  libunistring_str_iconveh@Base 0.9.7
  libunistring_str_iconveha@Base 0.9.7
  libunistring_u16_casemap@Base 0.9.7
  libunistring_u16_is_invariant@Base 0.9.7
+ libunistring_u16_possible_linebreaks_loop@Base 1.0
  libunistring_u16_printf_parse@Base 0.9.7
  libunistring_u32_casemap@Base 0.9.7
  libunistring_u32_is_invariant@Base 0.9.7
+ libunistring_u32_possible_linebreaks_loop@Base 1.0
  libunistring_u32_printf_parse@Base 0.9.7
  libunistring_u8_casemap@Base 0.9.7
  libunistring_u8_is_invariant@Base 0.9.7
+ libunistring_u8_possible_linebreaks_loop@Base 1.0
  libunistring_u8_printf_parse@Base 0.9.7
+ libunistring_u8_width_linebreaks_internal@Base 1.0
  libunistring_u_printf_fetchargs@Base 0.9.7
- libunistring_uc_bidi_class_lookup@Base 0.9.7
- libunistring_uc_combining_class_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_bidi_class_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_combining_class_lookup@Base 0.9.7
  libunistring_uc_compat_decomposition@Base 0.9.7
- libunistring_uc_general_category_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_general_category_lookup@Base 0.9.7
  libunistring_uc_is_case_ignorable@Base 0.9.7
  libunistring_uc_is_cased@Base 0.9.7
- libunistring_uc_joining_group_lookup@Base 0.9.7
- libunistring_uc_joining_type_lookup@Base 0.9.7
- libunistring_uc_locale_languages_lookup@Base 0.9.7
- libunistring_uc_property_lookup@Base 0.9.7
- libunistring_uc_script_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_joining_group_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_joining_type_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_locale_languages_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_property_lookup@Base 0.9.7
+#MISSING: 1.0-1# libunistring_uc_script_lookup@Base 0.9.7
  libunistring_uc_tocasefold@Base 0.9.7
  libunistring_ulc_printf_parse@Base 0.9.7
  libunistring_uniconv_register_autodetect@Base 0.9.7
@@ -262,6 +275,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u16_normcoll@Base 0.9.7
  u16_normxfrm@Base 0.9.7
  u16_possible_linebreaks@Base 0.9.7
+ u16_possible_linebreaks_v2@Base 1.0
  u16_prev@Base 0.9.7
  u16_set@Base 0.9.7
  u16_snprintf@Base 0.9.7
@@ -314,6 +328,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u16_vsprintf@Base 0.9.7
  u16_width@Base 0.9.7
  u16_width_linebreaks@Base 0.9.7
+ u16_width_linebreaks_v2@Base 1.0
  u16_wordbreaks@Base 0.9.7
  u32_asnprintf@Base 0.9.7
  u32_asprintf@Base 0.9.7
@@ -358,6 +373,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u32_normcoll@Base 0.9.7
  u32_normxfrm@Base 0.9.7
  u32_possible_linebreaks@Base 0.9.7
+ u32_possible_linebreaks_v2@Base 1.0
  u32_prev@Base 0.9.7
  u32_set@Base 0.9.7
  u32_snprintf@Base 0.9.7
@@ -409,6 +425,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u32_vsprintf@Base 0.9.7
  u32_width@Base 0.9.7
  u32_width_linebreaks@Base 0.9.7
+ u32_width_linebreaks_v2@Base 1.0
  u32_wordbreaks@Base 0.9.7
  u8_asnprintf@Base 0.9.7
  u8_asprintf@Base 0.9.7
@@ -455,6 +472,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u8_normcoll@Base 0.9.7
  u8_normxfrm@Base 0.9.7
  u8_possible_linebreaks@Base 0.9.7
+ u8_possible_linebreaks_v2@Base 1.0
  u8_prev@Base 0.9.7
  u8_set@Base 0.9.7
  u8_snprintf@Base 0.9.7
@@ -507,6 +525,7 @@ libunistring.so.2 libunistring2 #MINVER#
  u8_vsprintf@Base 0.9.7
  u8_width@Base 0.9.7
  u8_width_linebreaks@Base 0.9.7
+ u8_width_linebreaks_v2@Base 1.0
  u8_wordbreaks@Base 0.9.7
  uc_all_blocks@Base 0.9.7
  uc_all_scripts@Base 0.9.7
@@ -588,6 +607,12 @@ libunistring.so.2 libunistring2 #MINVER#
  uc_is_property_default_ignorable_code_point@Base 0.9.7
  uc_is_property_deprecated@Base 0.9.7
  uc_is_property_diacritic@Base 0.9.7
+ uc_is_property_emoji@Base 1.0
+ uc_is_property_emoji_component@Base 1.0
+ uc_is_property_emoji_modifier@Base 1.0
+ uc_is_property_emoji_modifier_base@Base 1.0
+ uc_is_property_emoji_presentation@Base 1.0
+ uc_is_property_extended_pictographic@Base 1.0
  uc_is_property_extender@Base 0.9.7
  uc_is_property_format_control@Base 0.9.7
  uc_is_property_grapheme_base@Base 0.9.7
@@ -627,6 +652,7 @@ libunistring.so.2 libunistring2 #MINVER#
  uc_is_property_punctuation@Base 0.9.7
  uc_is_property_quotation_mark@Base 0.9.7
  uc_is_property_radical@Base 0.9.7
+ uc_is_property_regional_indicator@Base 1.0
  uc_is_property_sentence_terminal@Base 0.9.7
  uc_is_property_soft_dotted@Base 0.9.7
  uc_is_property_space@Base 0.9.7
@@ -672,6 +698,7 @@ libunistring.so.2 libunistring2 #MINVER#
  ulc_fprintf@Base 0.9.7
  ulc_grapheme_breaks@Base 0.9.7
  ulc_possible_linebreaks@Base 0.9.7
+ ulc_possible_linebreaks_v2@Base 1.0
  ulc_snprintf@Base 0.9.7
  ulc_sprintf@Base 0.9.7
  ulc_vasnprintf@Base 0.9.7
@@ -680,6 +707,7 @@ libunistring.so.2 libunistring2 #MINVER#
  ulc_vsnprintf@Base 0.9.7
  ulc_vsprintf@Base 0.9.7
  ulc_width_linebreaks@Base 0.9.7
+ ulc_width_linebreaks_v2@Base 1.0
  ulc_wordbreaks@Base 0.9.7
  unicase_empty_prefix_context@Base 0.9.7
  unicase_empty_suffix_context@Base 0.9.7
diff --git a/debian/patches/0700-multiarch-libc.patch b/debian/patches/0700-multiarch-libc.patch
index 1686bcb2..95ec0d06 100644
--- a/debian/patches/0700-multiarch-libc.patch
+++ b/debian/patches/0700-multiarch-libc.patch
@@ -5,7 +5,7 @@ Index: trunk/lib/Makefile.am
 ===================================================================
 --- trunk.orig/lib/Makefile.am
 +++ trunk/lib/Makefile.am
-@@ -101,30 +101,15 @@ unistring/stdint.h : $(STDINT_H) stdint.
+@@ -103,30 +103,15 @@ unistring/stdint.h : $(STDINT_H) stdint.
  	  echo '#if __GLIBC__ >= 2'; \
  	  echo '#include <stdint.h>'; \
  	  echo '#else'; \
diff --git a/debian/patches/series b/debian/patches/series
index d6c7caac..1e1d2cd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-0005-fix_build_musl.patch
+#0005-fix_build_musl.patch
 0100-float-endian-detection.patch
 0700-multiarch-libc.patch
-0705-gcc-9.patch
-0010-AC_INIT.patch
+#0705-gcc-9.patch
+#0010-AC_INIT.patch