Merge tag 'debian/1.1-1_experimental1' into develop

New upstream release

6 files changed, 24 insertions, 82 deletions

diff --git a/debian/changelog b/debian/changelog
index d4f63b7..b8fbbd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-libunistring (1.1-1) unstable; urgency=medium
+libunistring (1.1-1~experimental1) experimental; urgency=medium
 
   * New upstream release.
-  * Transition from libunistring2 to linunistring5:
+  * Transition from libunistring2 to libunistring5:
     - Rename debian/libunistring2.* to libunistring5.*.
     - debian/control:
       + Rename package libunistring2 to libunistring5,
@@ -11,8 +11,14 @@ libunistring (1.1-1) unstable; urgency=medium
       + Change dpkg-gensymbols to the new package.
     - Refresh / Rebuild symbols file.
     - Remove debian/libunistring5.symbols.hurd-i386.
-
- -- Jörg Frings-Fürst <debian@jff.email>  Mon, 24 Oct 2022 22:26:44 +0200
+  * Remove unused patches:
+    - debian/patches/0010-AC_INIT.patch
+    - debian/patches/0005-fix_build_musl.patch
+    - debian/patches/0705-gcc-9.patch
+  * debian/copyright: Fix some nitpicks.
+      (Many thanks to Bastian Germann <bage@debian.org>)
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 07 Dec 2022 10:24:42 +0100
 
 libunistring (1.0-2) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 47894ea..5c8df23 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ License: FreeSoftware
 
 Files: doc/*
 Copyright: 2001-2022 Free Software Foundation, Inc.
-License: GPL-3+ or GFDL-1.2+
+License: GPL-3+ or GFDL-NIV-1.2+
 
 Files: tests/* woe32dll/* autogen.sh
 Copyright: 1990-2022 Free Software Foundation, Inc.
@@ -27,7 +27,6 @@ Copyright: 1995-2017 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: m4/init-package-version.m4
-       build-aux/ltmain.sh
 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
@@ -42,9 +41,19 @@ Copyright: 1999-2005 Patrice Dumas <dumas@centre-cired.fr>,
            1999-2005 Adrian Aichner <adrian@xemacs.org>
 License: GPL-2+
 
+Files: build-aux/ltmain.sh
+Copyright: 1996-2021 Free Software Foundation, Inc.
+           2004-2019, 2021 Bootstrap Authors
+License: GPL-2+ with distribution exception, Expat and GPL-2+
+ This file is free software, distributed under the terms of the GNU
+ General Public License.  As a special exception to the GNU General
+ Public License, this file may be distributed as part of a program
+ that contains a configuration script generated by Autoconf, under
+ the same distribution terms as the rest of that program.
+
 Files: build-aux/install-sh
 Copyright: 1994, X Consortium
-License: MIT
+License: X11
 
 Files: debian/*
 Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org>
@@ -107,7 +116,7 @@ License: GPL-2+
  version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: GFDL-1.2+
+License: GFDL-NIV-1.2+
  This manual is covered by the GNU FDL.  Permission is granted to
  copy, distribute and/or modify this document under the terms of the
  GNU Free Documentation License (FDL), either version 1.2 of the
@@ -119,7 +128,7 @@ License: GFDL-1.2+
  version 1.2 can be found in the file
  `/usr/share/common-licenses/GFDL-1.2'.
 
-License: MIT
+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
diff --git a/debian/patches/0005-fix_build_musl.patch b/debian/patches/0005-fix_build_musl.patch
deleted file mode 100644
index 6c0c0a2..0000000
--- a/debian/patches/0005-fix_build_musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix build for musl
-Author: Helmut Grohne <helmut@subdivi.de>
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987609
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987609
-Forwarded: not-needed
-Last-Update: 2021-04-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/lib/Makefile.gnulib
-===================================================================
---- trunk.orig/lib/Makefile.gnulib
-+++ trunk/lib/Makefile.gnulib
-@@ -461,7 +461,7 @@ install-exec-localcharset: all-local
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
diff --git a/debian/patches/0010-AC_INIT.patch b/debian/patches/0010-AC_INIT.patch
deleted file mode 100644
index d967829..0000000
--- a/debian/patches/0010-AC_INIT.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix AC_INIT handling
-Author: Jörg Frings-Fürst <debian@jff.email>
-Bug: <bug-libunistring@gnu.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992281
-Forwarded: yes 
-Last-Update: 2021-08-16
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/configure.ac
-===================================================================
---- trunk.orig/configure.ac
-+++ trunk/configure.ac
-@@ -16,12 +16,14 @@ dnl along with this program.  If not, se
- 
- dnl Process this file with autoconf to produce a configure script.
- 
-+
-+
- AC_PREREQ([2.63])
--AC_INIT
-+. $srcdir/version.sh
-+AC_INIT([libunistring],[m4_esyscmd_s([$VERSION_NUMBER])])
- AC_CONFIG_SRCDIR([lib/unistring/version.in.h])
- AC_CONFIG_AUX_DIR([build-aux])
--. $srcdir/version.sh
--gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
-+dnl AM_INIT_AUTOMAKE
- AM_INIT_AUTOMAKE([silent-rules dist-xz])
- AM_CONFIG_HEADER([config.h])
- 
diff --git a/debian/patches/0705-gcc-9.patch b/debian/patches/0705-gcc-9.patch
deleted file mode 100644
index 986e741..0000000
--- a/debian/patches/0705-gcc-9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Patch for gcc-9 compat
-Author: based on an patch from Bruno Haible <bruno@clisp.org> 
-Bug-Debian:https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925762 
-Last-Update: 2019-07-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/tests/glthread/thread.h
-===================================================================
---- trunk.orig/tests/glthread/thread.h
-+++ trunk/tests/glthread/thread.h
-@@ -133,7 +133,7 @@ extern int glthread_in_use (void);
-    call to foo(...) in the same function.  To avoid this, we test the
-    address of a function in libpthread that we don't use.  */
- 
--#  pragma weak pthread_create
-+/*#  pragma weak pthread_create */
- 
- #  ifndef pthread_sigmask /* Do not declare rpl_pthread_sigmask weak.  */
- #   pragma weak pthread_sigmask
diff --git a/debian/patches/series b/debian/patches/series
index 1e1d2cd..f107ca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-#0005-fix_build_musl.patch
 0100-float-endian-detection.patch
 0700-multiarch-libc.patch
-#0705-gcc-9.patch
-#0010-AC_INIT.patch