summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-04-26 22:24:08 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-04-26 22:24:08 +0200
commita0f0ec6aa5e10da258f48f3884ef269ba04361a6 (patch)
treeeff8960d0df6f66df23cc238faddb44a8d16aed1
parent4a09de7f3680121e1cdfd9938b177f2858aec8d6 (diff)
parent0252d4b4ba4c3d12b221ed9f3259b683170826ea (diff)
Merge branch 'release/debian/0.9.10-5'debian/0.9.10-5
-rw-r--r--debian/changelog15
-rw-r--r--debian/control2
-rw-r--r--debian/copyright24
-rw-r--r--debian/libunistring2.symbols1
-rw-r--r--debian/libunistring2.symbols.hurd-i3861
-rw-r--r--debian/patches/0005-fix_build_musl.patch21
-rw-r--r--debian/patches/series1
7 files changed, 52 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 61290489..4f60766a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libunistring (0.9.10-5) experimental; urgency=medium
+
+ * New debian/patches/0005-fix_build_musl.patch (Closes: #987609):
+ - Fix build on musl (Thanks to Helmut Grohne <helmut@subdivi.de>).
+ * Declare compliance with Debian Policy 4.5.1 (No changes needed).
+ * debian/copyright:
+ - Fix copyright format problems (Closes: #972501):
+ + Thanks to Bastian Germann <bage@linutronix.de>.
+ - Refresh copyright years for debian/* to 2021.
+ * debian/libunistring2.symbols,
+ debian/libunistring2.symbols.hurd-i386:
+ - Add Build-Depends-Package field.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Mon, 26 Apr 2021 19:52:59 +0200
+
libunistring (0.9.10-4) unstable; urgency=high
* Fix ftbfs with dh_missing (Closes: #961960).
diff --git a/debian/control b/debian/control
index 367933a2..f8e7e509 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.0
+Standards-Version: 4.5.1
Section: libs
Rules-Requires-Root: no
Homepage: https://www.gnu.org/software/libunistring/
diff --git a/debian/copyright b/debian/copyright
index 78320b6f..cb0d99f4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=202
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libunistring
Upstream-Contact: Bruno Haible <bruno@clisp.org>
Source: http://ftp.gnu.org/gnu/libunistring/
@@ -14,16 +14,6 @@ License: FreeSoftware
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
-Files: m4/init-package-version.m4
- build-aux/ltmain.sh
-Copyright: 1992-2009, 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
- 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: doc/*
Copyright: 2001-2017 Free Software Foundation, Inc.
License: GPL-3+ or GFDL-1.2+
@@ -36,6 +26,16 @@ Files: build-aux/*
Copyright: 1995-2017 Free Software Foundation, Inc.
License: GPL-2+
+Files: m4/init-package-version.m4
+ build-aux/ltmain.sh
+Copyright: 1992-2009, 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
+ 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/texi2html
Copyright: 1999-2005 Patrice Dumas <dumas@centre-cired.fr>,
1999-2005 Derek Price <derek@ximbiot.com>,
@@ -48,7 +48,7 @@ License: MIT
Files: debian/*
Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org>
- 2017-2020 Jörg Frings-Fürst <debian@jff.email>
+ 2017-2021 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 3062d8a2..88d0c92d 100644
--- a/debian/libunistring2.symbols
+++ b/debian/libunistring2.symbols
@@ -1,4 +1,5 @@
libunistring.so.2 libunistring2 #MINVER#
+* Build-Depends-Package: libunistring-dev
UC_CATEGORY_C@Base 0.9.7
UC_CATEGORY_Cc@Base 0.9.7
UC_CATEGORY_Cf@Base 0.9.7
diff --git a/debian/libunistring2.symbols.hurd-i386 b/debian/libunistring2.symbols.hurd-i386
index 0b6067bb..13b5edb3 100644
--- a/debian/libunistring2.symbols.hurd-i386
+++ b/debian/libunistring2.symbols.hurd-i386
@@ -1,4 +1,5 @@
libunistring.so.2 libunistring2 #MINVER#
+* Build-Depends-Package: libunistring-dev
UC_CATEGORY_C@Base 0.9.7
UC_CATEGORY_Cc@Base 0.9.7
UC_CATEGORY_Cf@Base 0.9.7
diff --git a/debian/patches/0005-fix_build_musl.patch b/debian/patches/0005-fix_build_musl.patch
new file mode 100644
index 00000000..6c0c0a2f
--- /dev/null
+++ b/debian/patches/0005-fix_build_musl.patch
@@ -0,0 +1,21 @@
+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/series b/debian/patches/series
index 496de810..746190bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0005-fix_build_musl.patch
0100-float-endian-detection.patch
0700-multiarch-libc.patch
0705-gcc-9.patch