From aac4d9c8db9c3f585e91ffdd54cfe997790a97d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 11 Jul 2019 18:30:30 +0200 Subject: fix gcc-9 issue --- debian/changelog | 7 +++++++ debian/control | 1 + debian/files | 1 - debian/patches/0705-gcc-9.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 +++ 6 files changed, 31 insertions(+), 1 deletion(-) delete mode 100644 debian/files create mode 100644 debian/patches/0705-gcc-9.patch diff --git a/debian/changelog b/debian/changelog index 7d59886..41e0afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libunistring (0.9.10-2) UNRELEASED; urgency=medium + + * New patch debian/patches/0705-gcc-9.patch: + - Fix gcc-9 issue. + + -- Jörg Frings-Fürst Thu, 11 Jul 2019 18:05:24 +0200 + libunistring (0.9.10-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 62934ed..a05b5f6 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 11), + gcc-9 Standards-Version: 4.1.5 Section: libs Homepage: https://www.gnu.org/software/libunistring/ 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 +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 diff --git a/debian/rules b/debian/rules index 2e22b6b..3545212 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,9 @@ DEB_MAKE_CHECK_TARGET = check VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') +export CC=gcc-9 +export CXX=g++-9 + %: dh $@ -- cgit v1.2.3 From 6731f0fdba44fda146894a36c289463922ac9e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 11 Jul 2019 19:01:17 +0200 Subject: Migrate to debhelper 12 --- debian/changelog | 6 +++++- debian/compat | 2 +- debian/control | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41e0afa..c46fe28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ libunistring (0.9.10-2) UNRELEASED; urgency=medium * New patch debian/patches/0705-gcc-9.patch: - - Fix gcc-9 issue. + - 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). -- Jörg Frings-Fürst Thu, 11 Jul 2019 18:05:24 +0200 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 a05b5f6..f909866 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: libunistring Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 11), + debhelper (>= 12), gcc-9 -Standards-Version: 4.1.5 +Standards-Version: 4.4.0 Section: libs Homepage: https://www.gnu.org/software/libunistring/ Vcs-Git: git://jff.email/opt/git/libunistring.git -- cgit v1.2.3 From 9ffd732a73fb43370593f7dc845d5d4377deae00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 11 Jul 2019 19:04:14 +0200 Subject: Refresh copyright years for debian/* to 2019 --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c46fe28..a32b63c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ libunistring (0.9.10-2) UNRELEASED; urgency=medium - 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 Thu, 11 Jul 2019 18:05:24 +0200 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 - 2017 Jörg Frings-Fürst + 2017-2019 Jörg Frings-Fürst License: GPL-3+ License: LGPL-3+ -- cgit v1.2.3 From d964f2ddb9167cb40d4dcc86633db52a3710ddc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 11 Jul 2019 19:12:58 +0200 Subject: remove gcc-9 testing staff --- debian/control | 3 +-- debian/rules | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/control b/debian/control index f909866..5d85596 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: libunistring Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 12), - gcc-9 + debhelper (>= 12) Standards-Version: 4.4.0 Section: libs Homepage: https://www.gnu.org/software/libunistring/ diff --git a/debian/rules b/debian/rules index 3545212..2e22b6b 100755 --- a/debian/rules +++ b/debian/rules @@ -17,9 +17,6 @@ DEB_MAKE_CHECK_TARGET = check VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') -export CC=gcc-9 -export CXX=g++-9 - %: dh $@ -- cgit v1.2.3 From e5f1fe26c2280ea8014e93f70bfc8ab479f04cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 11 Jul 2019 19:16:11 +0200 Subject: d/changelog: change date/time to release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a32b63c..20efc25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libunistring (0.9.10-2) UNRELEASED; urgency=medium +libunistring (0.9.10-2) unstable; urgency=medium * New patch debian/patches/0705-gcc-9.patch: - Fix gcc-9 issue (Closes: #925762, #920824). @@ -9,7 +9,7 @@ libunistring (0.9.10-2) UNRELEASED; urgency=medium * debian/copyright: - Refresh copyright years for debian/* to 2019. - -- Jörg Frings-Fürst Thu, 11 Jul 2019 18:05:24 +0200 + -- Jörg Frings-Fürst Thu, 11 Jul 2019 19:15:05 +0200 libunistring (0.9.10-1) unstable; urgency=medium -- cgit v1.2.3