diff options
-rw-r--r-- | debian/changelog | 13 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/copyright | 2 | ||||
-rw-r--r-- | debian/files | 1 | ||||
-rw-r--r-- | debian/patches/0705-gcc-9.patch | 19 | ||||
-rw-r--r-- | debian/patches/series | 1 |
7 files changed, 37 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 7d59886..20efc25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +libunistring (0.9.10-2) unstable; urgency=medium + + * New patch debian/patches/0705-gcc-9.patch: + - Fix gcc-9 issue (Closes: #925762, #920824). + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Bump minimum debhelper version in debian/control to >= 12. + * Declare compliance with Debian Policy 4.4.0 (No changes needed). + * debian/copyright: + - Refresh copyright years for debian/* to 2019. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 11 Jul 2019 19:15:05 +0200 + libunistring (0.9.10-1) unstable; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 62934ed..5d85596 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libunistring Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: - debhelper (>= 11), -Standards-Version: 4.1.5 + debhelper (>= 12) +Standards-Version: 4.4.0 Section: libs Homepage: https://www.gnu.org/software/libunistring/ Vcs-Git: git://jff.email/opt/git/libunistring.git diff --git a/debian/copyright b/debian/copyright index d32eee7..7a01cfb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -48,7 +48,7 @@ License: MIT Files: debian/* Copyright: 2009-2011 Andreas Rottmann <rotty@debian.org> - 2017 Jörg Frings-Fürst <debian@jff.email> + 2017-2019 Jörg Frings-Fürst <debian@jff.email> License: GPL-3+ License: LGPL-3+ diff --git a/debian/files b/debian/files deleted file mode 100644 index e99f64e..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -libunistring_0.9.10-1_source.buildinfo libs optional diff --git a/debian/patches/0705-gcc-9.patch b/debian/patches/0705-gcc-9.patch new file mode 100644 index 0000000..986e741 --- /dev/null +++ b/debian/patches/0705-gcc-9.patch @@ -0,0 +1,19 @@ +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 f107ca4..496de81 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0100-float-endian-detection.patch 0700-multiarch-libc.patch +0705-gcc-9.patch |