diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/0005-fix_build_musl.patch | 21 | ||||
| -rw-r--r-- | debian/patches/0010-AC_INIT.patch | 30 | ||||
| -rw-r--r-- | debian/patches/0705-gcc-9.patch | 19 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
5 files changed, 6 insertions, 75 deletions
diff --git a/debian/changelog b/debian/changelog index d4f63b7c..70f68f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libunistring (1.1-1) unstable; urgency=medium +libunistring (1.1-1~experimental1) experimental; urgency=medium * New upstream release. * Transition from libunistring2 to linunistring5: @@ -11,8 +11,12 @@ libunistring (1.1-1) unstable; urgency=medium + Change dpkg-gensymbols to the new package. - Refresh / Rebuild symbols file. - Remove debian/libunistring5.symbols.hurd-i386. + * Remove unused patches: + - debian/patches/0010-AC_INIT.patch + - debian/patches/0005-fix_build_musl.patch + - debian/patches/0705-gcc-9.patch - -- Jörg Frings-Fürst <debian@jff.email> Mon, 24 Oct 2022 22:26:44 +0200 + -- Jörg Frings-Fürst <debian@jff.email> Thu, 27 Oct 2022 12:51:28 +0200 libunistring (1.0-2) unstable; urgency=medium diff --git a/debian/patches/0005-fix_build_musl.patch b/debian/patches/0005-fix_build_musl.patch deleted file mode 100644 index 6c0c0a2f..00000000 --- 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 d967829e..00000000 --- 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 986e741e..00000000 --- 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 1e1d2cd9..f107ca41 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 |