diff -Nru libidn-1.33/debian/changelog libidn-1.33/debian/changelog --- libidn-1.33/debian/changelog 2018-07-23 20:14:03.000000000 +0000 +++ libidn-1.33/debian/changelog 2019-01-29 17:36:42.000000000 +0000 @@ -1,21 +1,16 @@ -libidn (1.33-2.2ubuntu1) cosmic; urgency=medium +libidn (1.33-2.1ubuntu2) disco; urgency=medium - * Do not set as-needed, to work-around a testsuite failure + * debian/patches/link-pthread.patch: + - Fix FTBFS by re-introducing the --no-as-needed patch for test-lock and + test-thread_create tests (LP: #1813584). - -- Gianfranco Costamagna Mon, 23 Jul 2018 22:14:03 +0200 + -- Łukasz 'sil2100' Zemczak Tue, 29 Jan 2019 18:36:42 +0100 -libidn (1.33-2.2) unstable; urgency=medium +libidn (1.33-2.1ubuntu1) bionic; urgency=medium - * Non-maintainer upload. + * Build using default-jdk instead of gcj-jdk. - [ Matthias Klose ] - * Build using default-jdk instead of gcj-jdk (Closes: #892540) - - [ Emilio Pozuelo Monfort ] - * Set libidn11 priority to optional rather than standard. - * Mark libidn11-dev as Multi-Arch same. (Closes: #856159) - - -- Emilio Pozuelo Monfort Tue, 10 Apr 2018 18:03:08 +0200 + -- Matthias Klose Mon, 26 Mar 2018 09:47:20 +0800 libidn (1.33-2.1) unstable; urgency=medium diff -Nru libidn-1.33/debian/control libidn-1.33/debian/control --- libidn-1.33/debian/control 2018-04-10 15:23:25.000000000 +0000 +++ libidn-1.33/debian/control 2019-01-29 17:29:30.000000000 +0000 @@ -1,7 +1,8 @@ Source: libidn Section: libs Priority: optional -Maintainer: Debian Libidn Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Libidn Team Uploaders: Simon Josefsson , Ondřej Surý Standards-Version: 3.9.8 Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint (>= 0.19.3), help2man, texinfo @@ -28,7 +29,6 @@ Architecture: any Depends: libidn11 (= ${binary:Version}), pkg-config, ${misc:Depends} Conflicts: libidn9-dev -Multi-Arch: same Description: Development files for GNU Libidn, an IDN library GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and @@ -39,6 +39,7 @@ information, API man pages, and the Libidn manual. Package: libidn11 +Priority: standard Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libidn9-dev diff -Nru libidn-1.33/debian/patches/link-pthread.patch libidn-1.33/debian/patches/link-pthread.patch --- libidn-1.33/debian/patches/link-pthread.patch 1970-01-01 00:00:00.000000000 +0000 +++ libidn-1.33/debian/patches/link-pthread.patch 2019-01-29 17:36:42.000000000 +0000 @@ -0,0 +1,58 @@ +Index: libidn-1.33/lib/gltests/Makefile.am +=================================================================== +--- libidn-1.33.orig/lib/gltests/Makefile.am ++++ libidn-1.33/lib/gltests/Makefile.am +@@ -342,6 +342,7 @@ libtests_a_SOURCES += glthread/lock.h gl + TESTS += test-lock + check_PROGRAMS += test-lock + test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ ++test_lock_LDFLAGS = $(LDFLAGS) -Wl,--no-as-needed + EXTRA_DIST += test-lock.c + + ## end gnulib module lock-tests +@@ -740,6 +741,7 @@ TESTS += test-thread_self test-thread_cr + check_PROGRAMS += test-thread_self test-thread_create + test_thread_self_LDADD = $(LDADD) @LIBTHREAD@ + test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@ ++test_thread_create_LDFLAGS = $(LDFLAGS) -Wl,--no-as-needed + EXTRA_DIST += test-thread_self.c test-thread_create.c macros.h + + ## end gnulib module thread-tests +Index: libidn-1.33/lib/gltests/Makefile.in +=================================================================== +--- libidn-1.33.orig/lib/gltests/Makefile.in ++++ libidn-1.33/lib/gltests/Makefile.in +@@ -1685,6 +1685,7 @@ AM_LIBTOOLFLAGS = --preserve-dup-deps + test_iconv_LDADD = $(LDADD) @LIBICONV@ + test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD) + test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@ ++test_lock_LDFLAGS = $(LDFLAGS) -Wl,--no-as-needed + + # Because this Makefile snippet defines a variable used by other + # gnulib Makefile snippets, it must be present in all Makefile.am that +@@ -1697,6 +1698,7 @@ WARN_ON_USE_H = warn-on-use.h + test_striconv_LDADD = $(LDADD) @LIBICONV@ + test_thread_self_LDADD = $(LDADD) @LIBTHREAD@ + test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@ ++test_thread_create_LDFLAGS = $(LDFLAGS) -Wl,--no-as-needed + test_u8_check_SOURCES = unistr/test-u8-check.c + test_u8_check_LDADD = $(LDADD) $(LIBUNISTRING) + test_u8_mbtoucr_SOURCES = unistr/test-u8-mbtoucr.c +@@ -1830,7 +1832,7 @@ test-localename$(EXEEXT): $(test_localen + + test-lock$(EXEEXT): $(test_lock_OBJECTS) $(test_lock_DEPENDENCIES) $(EXTRA_test_lock_DEPENDENCIES) + @rm -f test-lock$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(test_lock_OBJECTS) $(test_lock_LDADD) $(test_lock_LDFLAGS) $(LIBS) + + test-malloca$(EXEEXT): $(test_malloca_OBJECTS) $(test_malloca_DEPENDENCIES) $(EXTRA_test_malloca_DEPENDENCIES) + @rm -f test-malloca$(EXEEXT) +@@ -1882,7 +1884,7 @@ test-sys_types$(EXEEXT): $(test_sys_type + + test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES) + @rm -f test-thread_create$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(test_thread_create_LDFLAGS) $(LIBS) + + test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES) + @rm -f test-thread_self$(EXEEXT) diff -Nru libidn-1.33/debian/patches/series libidn-1.33/debian/patches/series --- libidn-1.33/debian/patches/series 2017-12-11 22:13:42.000000000 +0000 +++ libidn-1.33/debian/patches/series 2019-01-29 17:35:03.000000000 +0000 @@ -2,3 +2,4 @@ 0002-Update-intprops.h-for-gcc-7-compatibility.patch 0003-Increase-value-for-Wframe-larger-than-gcc-7.patch 0004-Update-Makefile.gdoc-to-use-GDOC_BIN-instead-of-hard.patch +link-pthread.patch diff -Nru libidn-1.33/debian/rules libidn-1.33/debian/rules --- libidn-1.33/debian/rules 2018-07-23 20:14:02.000000000 +0000 +++ libidn-1.33/debian/rules 2017-12-16 21:55:13.000000000 +0000 @@ -3,7 +3,6 @@ export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all -export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed DOPACKAGES = $(shell dh_listpackages) CONFIGURE_FLAGS :=