diff -u ncurses-5.7+20090207/debian/rules ncurses-5.7+20090207/debian/rules --- ncurses-5.7+20090207/debian/rules +++ ncurses-5.7+20090207/debian/rules @@ -70,8 +70,8 @@ ifeq ($(DEB_HOST_ARCH),amd64) build_32_target = i486-$(DEB_HOST_GNU_SYSTEM) build_32 = build-32 build-wide-32 -lib32 = /emul/ia32-linux/lib -usr_lib32 = /emul/ia32-linux/usr/lib +lib32 = /lib32 +usr_lib32 = /usr/lib32 endif ifeq ($(DEB_HOST_ARCH),ppc64) @@ -86,6 +86,7 @@ endif CFLAGS = -O2 -g +LDFLAGS = -Wl,-Bsymbolic-functions CONFARGS = --prefix=/usr \ --with-shared \ --mandir='$${datadir}/man' \ @@ -130,7 +131,7 @@ $(objdir)/config.status: patch test -d $(objdir) || mkdir $(objdir) - cd $(objdir) && CFLAGS="$(CFLAGS)" $(srcdir)/configure \ + cd $(objdir) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(srcdir)/configure \ $(CONFARGS) \ --with-install-prefix=$(fulltempdir) \ --enable-overwrite @@ -138,7 +139,7 @@ $(objdir-32)/config.status: patch test -d $(objdir-32) || mkdir $(objdir-32) - cd $(objdir-32) && CFLAGS="$(CFLAGS)" CC="gcc -m32" \ + cd $(objdir-32) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="gcc -m32" \ BUILD_CC="gcc" CXX="g++ -m32" \ $(srcdir)/configure \ $(CONFARGS) \ @@ -155,7 +156,7 @@ # cross compiling; all Debian platforms return unsigned char # for this configure check. cf_cv_type_of_bool='unsigned char'; export cf_cv_type_of_bool; \ - cd $(objdir-64) && CFLAGS="$(CFLAGS)" CC="gcc -m64" \ + cd $(objdir-64) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="gcc -m64" \ BUILD_CC="gcc" CXX="g++ -m64" \ $(srcdir)/configure \ $(CONFARGS) \ @@ -175,7 +176,7 @@ $(wobjdir)/config.status: patch test -d $(wobjdir) || mkdir $(wobjdir) - cd $(wobjdir) && CFLAGS="$(CFLAGS)" $(srcdir)/configure \ + cd $(wobjdir) && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(srcdir)/configure \ $(CONFARGS) \ --with-install-prefix=$(fulltempdir) \ --disable-overwrite --enable-widec @@ -393,6 +394,10 @@ dh_testroot dh_installdocs -s debian/FAQ dh_installchangelogs -s NEWS + rm -f debian/$(package-lib)/usr/share/doc/$(package-lib)/changelog + rm -f debian/$(package-libw)/usr/share/doc/$(package-libw)/changelog + rm -f debian/$(package-lib-32)/usr/share/doc/$(package-lib-32)/changelog + rm -f debian/$(package-lib-64)/usr/share/doc/$(package-lib-64)/changelog dh_installexamples -s dh_strip -s -X$(package-dbg) -X$(package-dbgw) diff -u ncurses-5.7+20090207/debian/control ncurses-5.7+20090207/debian/control --- ncurses-5.7+20090207/debian/control +++ ncurses-5.7+20090207/debian/control @@ -1,7 +1,8 @@ Source: ncurses Section: libs Priority: standard -Maintainer: Daniel Baumann +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), dpatch, g++-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc], libgpm-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] Standards-Version: 3.8.0 Homepage: ftp://invisible-island.net/ncurses/ diff -u ncurses-5.7+20090207/debian/lib32ncursesw5.files ncurses-5.7+20090207/debian/lib32ncursesw5.files --- ncurses-5.7+20090207/debian/lib32ncursesw5.files +++ ncurses-5.7+20090207/debian/lib32ncursesw5.files @@ -1,5 +1,5 @@ -emul/ia32-linux/lib/libncursesw.so.* -emul/ia32-linux/lib/libticw.so.* -emul/ia32-linux/usr/lib/libpanelw.so.* -emul/ia32-linux/usr/lib/libformw.so.* -emul/ia32-linux/usr/lib/libmenuw.so.* +lib32/libncursesw.so.* +lib32/libticw.so.* +usr/lib32/libpanelw.so.* +usr/lib32/libformw.so.* +usr/lib32/libmenuw.so.* diff -u ncurses-5.7+20090207/debian/changelog ncurses-5.7+20090207/debian/changelog --- ncurses-5.7+20090207/debian/changelog +++ ncurses-5.7+20090207/debian/changelog @@ -1,3 +1,13 @@ +ncurses (5.7+20090207-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #323879), Ubuntu remaining changes: + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + - Link using -Bsymbolic-functions. + - Install wide-character patches into /{,usr/}lib32. + - Don't install the upstream changelogs in the runtime library packages. + + -- Alessio Treglia Wed, 11 Feb 2009 19:28:57 +0100 + ncurses (5.7+20090207-1) unstable; urgency=low * Merging upstream version 5.7+20090207. @@ -49,6 +59,16 @@ -- Daniel Baumann Fri, 9 Jan 2009 15:46:41 -0500 +ncurses (5.7+20081220-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #313693 + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + - Link using -Bsymbolic-functions. + - Don't install the upstream changelog in the runtime library packages. + - Install wide-character patches into /{,usr/}lib32 as well + + -- Bhavani Shankar Sun, 04 Jan 2009 17:36:00 +0530 + ncurses (5.7+20081220-1) unstable; urgency=low * Merging upstream version 5.7+20081220. @@ -99,6 +119,17 @@ -- Daniel Baumann Tue, 18 Nov 2008 12:13:00 +0100 +ncurses (5.7-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + - Link using -Bsymbolic-functions. + - Don't install the upstream changelog in the runtime library packages. + + * Install wide-character patches into /{,usr/}lib32 as well. + + -- Scott James Remnant Tue, 11 Nov 2008 16:40:32 +0000 + ncurses (5.7-2) unstable; urgency=low * Replacing obsolete dh_clean -k with dh_prep. @@ -361,6 +392,23 @@ -- Daniel Baumann Fri, 21 Dec 2007 06:37:00 +0100 +ncurses (5.6+20071124-1ubuntu2) hardy; urgency=low + + * debian/lib32ncurses5.files: libncurses.so.5 was missing from the + package due to an incomplete merge for the /emul/ia32-linux -> /lib32 + change, causing the package to fail to build with new dpkg-shlibdeps. + Get all of the libraries into the package that belong. LP: #184213. + + -- Steve Langasek Sat, 23 Feb 2008 22:03:37 +0000 + +ncurses (5.6+20071124-1ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + * Link using -Bsymbolic-functions. + + -- Matthias Klose Tue, 04 Dec 2007 14:43:43 +0100 + ncurses (5.6+20071124-1) unstable; urgency=low * New upstream patch level. @@ -418,6 +466,25 @@ -- Daniel Baumann Tue, 14 Aug 2007 21:28:00 +0200 +ncurses (5.6+20070716-1ubuntu3) gutsy; urgency=low + + * Don't install the upstream changelog in the runtime library packages. + + -- Matthias Klose Sun, 07 Oct 2007 12:29:06 +0200 + +ncurses (5.6+20070716-1ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa. + + -- LaMont Jones Tue, 02 Oct 2007 06:32:47 -0600 + +ncurses (5.6+20070716-1ubuntu1) gutsy; urgency=low + + * Merge with the Debian package, remaining changes: + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + + -- Matthias Klose Tue, 31 Jul 2007 10:59:35 +0200 + ncurses (5.6+20070716-1) unstable; urgency=low * New upstream patch level: @@ -443,6 +510,13 @@ -- Daniel Baumann Fri, 1 Jun 2007 21:36:00 +0200 +ncurses (5.6-3ubuntu1) gutsy; urgency=low + + * Merge with the Debian package, based on 5.6-0ubuntu1; remaining changes: + - On amd64, use /{,usr/}lib32 instead of /emul/ia32-linux/. + + -- Matthias Klose Mon, 11 Jun 2007 18:53:13 +0200 + ncurses (5.6-3) unstable; urgency=low * Really reverting ia32 library directory rename (Closes: #425596). @@ -476,6 +550,34 @@ -- Daniel Baumann Tue, 22 May 2007 10:54:00 +0200 +ncurses (5.6-0ubuntu1) gutsy; urgency=low + + * New upstream version. + - Remove patches applied upstream: ncurses.upstream, signed-chars. + - Update patches: debian-backspace. + * Build-depend on g++-multilib instead of lib{32,64}c*-dev-*. + + -- Matthias Klose Thu, 17 May 2007 09:00:42 +0200 + +ncurses (5.5-5ubuntu3) gutsy; urgency=low + + * lib32ncurses5-dev: Fix .so symlink. Ubuntu #75883. + + -- Matthias Klose Thu, 17 May 2007 08:42:12 +0200 + +ncurses (5.5-5ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:23:00 +0000 + +ncurses (5.5-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Ubuntu Merge-o-Matic Mon, 30 Oct 2006 13:15:18 +0000 + ncurses (5.5-5) unstable; urgency=medium * Fixed /usr/share/doc symlinks (Closes: #390169). @@ -496,6 +598,12 @@ -- Daniel Baumann Mon, 4 Sep 2006 15:57:00 +0200 +ncurses (5.5-2ubuntu1) edgy; urgency=low + + * Synchronize with Debian unstable. + + -- Matthias Klose Wed, 5 Jul 2006 13:48:17 +0000 + ncurses (5.5-2) unstable; urgency=low * Update to upstream patch level 20060422. @@ -529,6 +637,31 @@ -- Margarita Manterola Sat, 15 Apr 2006 01:11:55 -0300 +ncurses (5.5-1ubuntu3) dapper; urgency=low + + * Replace (build-)dependency ia32-libs-dev [amd64] -> libc6-dev-i386 [amd64] + + -- Matthias Klose Fri, 13 Jan 2006 20:21:45 +0000 + +ncurses (5.5-1ubuntu2) dapper; urgency=low + + * Build lib32ncurses5 and lib32ncurses5-dev for amd64. + + -- Matthias Klose Sat, 10 Dec 2005 00:16:03 +0000 + +ncurses (5.5-1ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Tollef Fog Heen Fri, 11 Nov 2005 11:50:33 +0100 + +ncurses (5.5-1.1) unstable; urgency=low + + * NMU to fix missing Makefile escaping in debian/rules (Closes: #355129) + Thanks to Pjotr Kourzanov . + + -- Margarita Manterola Sat, 15 Apr 2006 01:11:55 -0300 + ncurses (5.5-1) unstable; urgency=low * New upstream release. @@ -543,6 +676,34 @@ -- Daniel Jacobowitz Fri, 14 Oct 2005 21:13:00 +0000 +ncurses (5.4-9ubuntu4) breezy; urgency=low + + * Don't set -march/-mtune options for 64bit powerpc build. + + -- Matthias Klose Mon, 22 Aug 2005 16:09:19 +0200 + +ncurses (5.4-9ubuntu3) breezy; urgency=low + + * Explicitely set -march/-mtune options for 64bit i386/powerpc builds. + + -- Matthias Klose Mon, 22 Aug 2005 13:54:35 +0200 + +ncurses (5.4-9ubuntu2) breezy; urgency=low + + * Remove lib32ncurses5 and lib32ncurses5-dev from control file. + + -- Matthias Klose Mon, 22 Aug 2005 12:41:48 +0200 + +ncurses (5.4-9ubuntu1) breezy; urgency=low + + * Build lib64ncurses5 and lib64ncurses5-dev for i386 and powerpc. + * lib64ncurses5: Remove recommendation of libgpmg1. + * debian/patches/configure-no-cross-check.patch: don't try to run + executable built with gcc -m64. + * Build lib32ncurses5 and lib32ncurses5-dev for amd64 (currently disabled). + + -- Matthias Klose Fri, 12 Aug 2005 14:23:02 +0200 + ncurses (5.4-9) unstable; urgency=low * Rebuild with gcc-4.0. diff -u ncurses-5.7+20090207/debian/lib32ncurses5.files ncurses-5.7+20090207/debian/lib32ncurses5.files --- ncurses-5.7+20090207/debian/lib32ncurses5.files +++ ncurses-5.7+20090207/debian/lib32ncurses5.files @@ -1,5 +1,5 @@ -emul/ia32-linux/lib/libncurses.so.* -emul/ia32-linux/lib/libtic.so.* -emul/ia32-linux/usr/lib/libpanel.so.* -emul/ia32-linux/usr/lib/libform.so.* -emul/ia32-linux/usr/lib/libmenu.so.* +lib32/libncurses.so.* +lib32/libtic.so.* +usr/lib32/libpanel.so.* +usr/lib32/libform.so.* +usr/lib32/libmenu.so.* diff -u ncurses-5.7+20090207/debian/lib32ncurses5-dev.files ncurses-5.7+20090207/debian/lib32ncurses5-dev.files --- ncurses-5.7+20090207/debian/lib32ncurses5-dev.files +++ ncurses-5.7+20090207/debian/lib32ncurses5-dev.files @@ -1,11 +1,11 @@ -emul/ia32-linux/usr/lib/libncurses.so -emul/ia32-linux/usr/lib/libtic.so -emul/ia32-linux/usr/lib/libform.so -emul/ia32-linux/usr/lib/libmenu.so -emul/ia32-linux/usr/lib/libpanel.so -emul/ia32-linux/usr/lib/libncurses.a -emul/ia32-linux/usr/lib/libncurses++.a -emul/ia32-linux/usr/lib/libtic.a -emul/ia32-linux/usr/lib/libform.a -emul/ia32-linux/usr/lib/libmenu.a -emul/ia32-linux/usr/lib/libpanel.a +usr/lib32/libncurses.so +usr/lib32/libtic.so +usr/lib32/libform.so +usr/lib32/libmenu.so +usr/lib32/libpanel.so +usr/lib32/libncurses.a +usr/lib32/libncurses++.a +usr/lib32/libtic.a +usr/lib32/libform.a +usr/lib32/libmenu.a +usr/lib32/libpanel.a diff -u ncurses-5.7+20090207/debian/lib32ncursesw5-dev.files ncurses-5.7+20090207/debian/lib32ncursesw5-dev.files --- ncurses-5.7+20090207/debian/lib32ncursesw5-dev.files +++ ncurses-5.7+20090207/debian/lib32ncursesw5-dev.files @@ -1,11 +1,11 @@ -emul/ia32-linux/usr/lib/libncursesw.so -emul/ia32-linux/usr/lib/libticw.so -emul/ia32-linux/usr/lib/libformw.so -emul/ia32-linux/usr/lib/libmenuw.so -emul/ia32-linux/usr/lib/libpanelw.so -emul/ia32-linux/usr/lib/libncursesw.a -emul/ia32-linux/usr/lib/libncurses++w.a -emul/ia32-linux/usr/lib/libticw.a -emul/ia32-linux/usr/lib/libformw.a -emul/ia32-linux/usr/lib/libmenuw.a -emul/ia32-linux/usr/lib/libpanelw.a +usr/lib32/libncursesw.so +usr/lib32/libticw.so +usr/lib32/libformw.so +usr/lib32/libmenuw.so +usr/lib32/libpanelw.so +usr/lib32/libncursesw.a +usr/lib32/libncurses++w.a +usr/lib32/libticw.a +usr/lib32/libformw.a +usr/lib32/libmenuw.a +usr/lib32/libpanelw.a diff -u ncurses-5.7+20090207/debian/lib32ncurses5.dirs ncurses-5.7+20090207/debian/lib32ncurses5.dirs --- ncurses-5.7+20090207/debian/lib32ncurses5.dirs +++ ncurses-5.7+20090207/debian/lib32ncurses5.dirs @@ -1 +1 @@ -emul/ia32-linux/lib +usr/lib32