tags 628679 patch wheezy sid tags 634324 patch wheezy sid user ubuntu-de...@lists.ubuntu.com usertags 628679 oneiric ubuntu-patch usertags 634324 oneiric ubuntu-patch thanks
Hi Anibal, libedit has been FTBFS in unstable for a while now with no response on either of these bugs. Since I'm fixing this build failure for the upcoming Ubuntu release anyway, I've gone ahead and prepared a 0-day NMU for the RC build failures for Debian. The NMU patch is attached. It resembles the one originally proposed by Daniel on bug #634324, but rather than suppressing the warnings about deprecated headers, it patches libedit to not use those headers - presumably more future proof since the deprecated headers will probably go away eventually. Since fixing libedit to build with current pmake means installing to the multiarch library directories anyway, I've gone ahead and marked the packages Multi-Arch: same as well. This NMU will be uploaded to incoming shortly. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -u libedit-2.11-20080614/debian/control libedit-2.11-20080614/debian/control --- libedit-2.11-20080614/debian/control +++ libedit-2.11-20080614/debian/control @@ -2,7 +2,7 @@ Section: libs Priority: standard Maintainer: Anibal Monsalve Salazar <ani...@debian.org> -Build-Depends: debhelper (>= 7), quilt, pmake (>= 1.45-8), groff-base, +Build-Depends: debhelper (>= 8.1.3), quilt, pmake (>= 1.111-3), groff-base, libbsd-dev (>= 0.1.3), libncurses5-dev, bsdmainutils Standards-Version: 3.8.2 Vcs-Browser: http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/ @@ -11,6 +11,8 @@ Package: libedit2 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: BSD editline and history libraries The editline library provides generic line editing and @@ -22,6 +24,7 @@ Section: libdevel Priority: optional Architecture: any +Multi-Arch: same Depends: libedit2 (= ${binary:Version}), libbsd-dev (>= 0.1.3), libncurses5-dev Description: BSD editline and history libraries (development files) The editline library provides generic line editing and diff -u libedit-2.11-20080614/debian/libedit2.files libedit-2.11-20080614/debian/libedit2.files --- libedit-2.11-20080614/debian/libedit2.files +++ libedit-2.11-20080614/debian/libedit2.files @@ -1,2 +1,2 @@ -usr/lib/libedit.so.2.11 -usr/lib/libedit.so.2 +usr/lib/*/libedit.so.2.11 +usr/lib/*/libedit.so.2 diff -u libedit-2.11-20080614/debian/rules libedit-2.11-20080614/debian/rules --- libedit-2.11-20080614/debian/rules +++ libedit-2.11-20080614/debian/rules @@ -9,7 +9,7 @@ PKGDIR = ${CURDIR}/debian/tmp PMAKE_ARGS = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= \ SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${major}" \ - LDADD="*.so -lbsd -lcurses" + LDADD="-lbsd -lcurses" EDITLINE_3_LINKS = el_init el_end el_reset el_gets el_getc el_push \ el_parse el_set el_get el_source el_resize el_line \ el_insertstr el_deletestr history_init history_end history @@ -23,6 +23,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld @@ -52,7 +53,7 @@ dh_testdir dh_testroot dh_clean - install -d ${PKGDIR}/usr/lib + install -d ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH) install -d ${PKGDIR}/usr/include/readline install -d ${PKGDIR}/usr/include/libedit install -d ${PKGDIR}/usr/share/man/man3 @@ -66,8 +67,8 @@ cd libedit/readline && \ pmake incinstall DESTDIR=${PKGDIR} ${PMAKE_ARGS} mv ${PKGDIR}/usr/include/readline ${PKGDIR}/usr/include/editline - ln -sf libedit.so.${version} ${PKGDIR}/usr/lib/libedit.so.${major} - ln -sf libedit.so.${major} ${PKGDIR}/usr/lib/libedit.so + ln -sf libedit.so.${version} ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH)/libedit.so.${major} + ln -sf libedit.so.${major} ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH)/libedit.so binary-indep: build install binary-arch: build install diff -u libedit-2.11-20080614/debian/libedit-dev.files libedit-2.11-20080614/debian/libedit-dev.files --- libedit-2.11-20080614/debian/libedit-dev.files +++ libedit-2.11-20080614/debian/libedit-dev.files @@ -4,5 +4,5 @@ -usr/lib/libedit.a -usr/lib/libedit.so +usr/lib/*/libedit.a +usr/lib/*/libedit.so usr/share/man/man3/editline.3el usr/share/man/man5/editrc.5el -usr/lib/pkgconfig/libedit.pc +usr/lib/*/pkgconfig/libedit.pc diff -u libedit-2.11-20080614/debian/changelog libedit-2.11-20080614/debian/changelog --- libedit-2.11-20080614/debian/changelog +++ libedit-2.11-20080614/debian/changelog @@ -1,3 +1,17 @@ +libedit (2.11-20080614-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/fix_gcc_warnings.diff: fix warnings about deprecated + headers. Closes: #634324. + * debian/rules: don't double-link .so files twice into the library. + Closes: #628679. + * debian/rules: cope with pmake switching us to multiarch automatically. + * debian/control: since the package is already multiarched for us by pmake, + mark it as such and bump build-dependencies on debhelper and pmake to + suit. + + -- Steve Langasek <vor...@debian.org> Wed, 17 Aug 2011 00:05:33 +0000 + libedit (2.11-20080614-2) unstable; urgency=high * libedit2.shlibs: Fix minimal dependency version diff -u libedit-2.11-20080614/debian/patches/series libedit-2.11-20080614/debian/patches/series --- libedit-2.11-20080614/debian/patches/series +++ libedit-2.11-20080614/debian/patches/series @@ -8,0 +9 @@ +fix_gcc_warnings.diff only in patch2: unchanged: --- libedit-2.11-20080614.orig/debian/patches/fix_gcc_warnings.diff +++ libedit-2.11-20080614/debian/patches/fix_gcc_warnings.diff @@ -0,0 +1,56 @@ +Description: fix warnings about deprecated headers +Author: Steve Langasek <steve.langa...@canonical.com> +Bug-Debian: http://bugs.debian.org/634324 + +Index: libedit-2.11-20080614/libedit/Makefile +=================================================================== +--- libedit-2.11-20080614.orig/libedit/Makefile ++++ libedit-2.11-20080614/libedit/Makefile +@@ -4,7 +4,7 @@ + OS!= sh -c "case `uname -s` in GNU|GNU/*) echo GNU ;; *) uname -s ;; esac" + + .if ${OS} == GNU || ${OS} == Linux +-CFLAGS += -include bsd/bsd.h ++CFLAGS += -include bsd/sys/cdefs.h -include bsd/stdio.h + MKLINT=no + .endif + +Index: libedit-2.11-20080614/libedit/readline.c +=================================================================== +--- libedit-2.11-20080614.orig/libedit/readline.c ++++ libedit-2.11-20080614/libedit/readline.c +@@ -48,7 +48,7 @@ + #include <fcntl.h> + #include <setjmp.h> + #ifdef HAVE_VIS_H +-#include <vis.h> ++#include <bsd/vis.h> + #else + #include "np/vis.h" + #endif +Index: libedit-2.11-20080614/libedit/filecomplete.c +=================================================================== +--- libedit-2.11-20080614.orig/libedit/filecomplete.c ++++ libedit-2.11-20080614/libedit/filecomplete.c +@@ -47,7 +47,7 @@ + #include <errno.h> + #include <fcntl.h> + #ifdef HAVE_VIS_H +-#include <vis.h> ++#include <bsd/vis.h> + #else + #include "np/vis.h" + #endif +Index: libedit-2.11-20080614/libedit/history.c +=================================================================== +--- libedit-2.11-20080614.orig/libedit/history.c ++++ libedit-2.11-20080614/libedit/history.c +@@ -48,7 +48,7 @@ + #include <stdlib.h> + #include <stdarg.h> + #ifdef HAVE_VIS_H +-#include <vis.h> ++#include <bsd/vis.h> + #else + #include "np/vis.h" + #endif
signature.asc
Description: Digital signature
