diff -u linux86-0.16.17/debian/changelog linux86-0.16.17/debian/changelog --- linux86-0.16.17/debian/changelog +++ linux86-0.16.17/debian/changelog @@ -1,25 +1,26 @@ -linux86 (0.16.17-3.1ubuntu3) quantal; urgency=low +linux86 (0.16.17-3.3) unstable; urgency=medium - * Rebuild for new armel compiler default of ARMv5t. - - -- Colin Watson Fri, 05 Oct 2012 11:33:40 +0100 - -linux86 (0.16.17-3.1ubuntu2) natty; urgency=low - - * debian/rules: - - Replace i486-linux-gnu search with i686-linux-gnu so that elksemu will - be installed. (LP: #706635) + * Non-maintainer upload. + * Mark binary packages as M-A: foreign. Closes: #876165. + * Bump standards version. + * bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify + failures and FTBFS. Closes: #523807. + * Fix some typos in manual pages. Closes: #500978. - -- SevenMachines Fri, 28 Jan 2011 08:22:31 +0000 + -- Matthias Klose Mon, 13 Nov 2017 14:19:59 +0100 -linux86 (0.16.17-3.1ubuntu1) natty; urgency=low +linux86 (0.16.17-3.2) unstable; urgency=medium - * Merge from debian unstable. Remaining changes: (LP: #704233) - - bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify - failures and FTBFS. (Closes: #523807) - * debian/rules: Drop build lpia, this change is obsolete and doesn't work. + * Non-maintainer upload. + * Add mandatory build-* target to debian/rules, patch by Sven Joachim + (Closes: #822048). + * Fix debian/lintian.overrides, patch by Sven Joachim. + * Add explicit debian/source/format. + * Drop elksemu (Closes: #831000). + * Use source:Version instead of binary:Version in elks-libc Depends (Closes: + #439922). - -- Artur Rona Tue, 18 Jan 2011 01:35:52 +0100 + -- Andrey Rahmatullin Thu, 15 Dec 2016 23:19:08 +0500 linux86 (0.16.17-3.1) unstable; urgency=low @@ -29,19 +30,6 @@ -- gregor herrmann Thu, 11 Nov 2010 22:29:38 +0100 -linux86 (0.16.17-3ubuntu2) jaunty; urgency=low - - * bcc/bcc.c: correctly calculate MAXPATHLEN to avoid runtime fortify - failures and FTBFS (LP: #360096, debian bug 523807). - - -- Kees Cook Sun, 12 Apr 2009 09:47:16 -0700 - -linux86 (0.16.17-3ubuntu1) jaunty; urgency=low - - * Merge with Debian; remaining changes: - - -- Matthias Klose Mon, 17 Nov 2008 11:57:41 +0100 - linux86 (0.16.17-3) unstable; urgency=low * Added man pages for ar86, objdump86, size86 and nm86 with patch @@ -79,13 +67,6 @@ -- Moritz Muehlenhoff Tue, 5 Aug 2008 00:18:32 +0200 -linux86 (0.16.17-2ubuntu1) hardy; urgency=low - - * Merge with Debian; remaining changes: - - Build elks-libc for lpia. - - -- Matthias Klose Fri, 07 Dec 2007 20:33:39 +0000 - linux86 (0.16.17-2) unstable; urgency=low * Disable elksemu building in non-i386 architectures @@ -100,19 +81,6 @@ -- Juan Cespedes Sun, 26 Aug 2007 13:42:07 +0200 -linux86 (0.16.14-1.4ubuntu1) gutsy; urgency=low - - * Build elks-libc for lpia. - * Set Ubuntu maintainer address. - - -- Matthias Klose Fri, 10 Aug 2007 19:25:27 +0000 - -linux86 (0.16.14-1.4build1) feisty; urgency=low - - * Rebuild for ldbl128 change (powerpc, sparc). - - -- Matthias Klose Sun, 4 Mar 2007 01:08:58 +0000 - linux86 (0.16.14-1.4) unstable; urgency=low * Non-maintainer upload. @@ -382,0 +351 @@ + diff -u linux86-0.16.17/debian/lintian.overrides linux86-0.16.17/debian/lintian.overrides --- linux86-0.16.17/debian/lintian.overrides +++ linux86-0.16.17/debian/lintian.overrides @@ -4,6 +4,6 @@ -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/i386/libc.a -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/libbsd.a -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/libc.a -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/libc_f.a -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/libc_s.a -elks-libc: arch-independent-package-contains-binary-or-object ./usr/lib/bcc/libdos.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/i386/libc.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/libbsd.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/libc.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/libc_f.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/libc_s.a +elks-libc: arch-independent-package-contains-binary-or-object usr/lib/bcc/libdos.a diff -u linux86-0.16.17/debian/control linux86-0.16.17/debian/control --- linux86-0.16.17/debian/control +++ linux86-0.16.17/debian/control @@ -1,12 +1,12 @@ Source: linux86 Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Juan Cespedes -Standards-Version: 3.8.0 +Maintainer: Juan Cespedes +Standards-Version: 4.1.1 Package: bin86 Architecture: any +Multi-Arch: foreign Priority: optional Depends: ${bin86:Depends} Conflicts: linux86 @@ -17,6 +17,7 @@ Package: bcc Architecture: any +Multi-Arch: foreign Depends: ${bcc:Depends}, bin86 (= ${binary:Version}) Recommends: elks-libc (= ${binary:Version}) Conflicts: linux86 @@ -25,13 +26,11 @@ Description: 16-bit x86 C compiler This is a C-compiler for 8086 cpus which is important for the development of boot loaders or BIOS related 8086 code. - . - It is possible to run 8086 code under i386 Linux using an emulator, - `elksemu', also included in this package. Package: elks-libc Architecture: all -Recommends: bcc (= ${binary:Version}) +Multi-Arch: foreign +Recommends: bcc (>= ${source:Version}) Replaces: bcc (<< 0.14.9), linux86 Conflicts: linux86 Description: 16-bit x86 C library and include files diff -u linux86-0.16.17/debian/rules linux86-0.16.17/debian/rules --- linux86-0.16.17/debian/rules +++ linux86-0.16.17/debian/rules @@ -6,6 +6,8 @@ SHELL = bash +build-arch build-indep: build + build: make all LIBPRE=/usr/ < /dev/null touch build @@ -43,7 +45,6 @@ install -d debian/tmp-elks-libc/usr/share/doc/elks-libc cp -p Changes debian/tmp-elks-libc/usr/share/doc/elks-libc/changelog cp -p Contributors README debian/tmp-elks-libc/usr/share/doc/elks-libc/ - cp -p elksemu/README debian/tmp-elks-libc/usr/share/doc/elks-libc/README.elksemu cp -p libc/README debian/tmp-elks-libc/usr/share/doc/elks-libc/README.libc cp -p libbsd/README.HLU debian/tmp-elks-libc/usr/share/doc/elks-libc/README.libbsd cp -p debian/changelog debian/tmp-elks-libc/usr/share/doc/elks-libc/changelog.Debian @@ -63,11 +64,6 @@ # ``bcc'' specific things: install -d debian/tmp-bcc/usr/bin mv debian/tmp/usr/bin/bcc debian/tmp-bcc/usr/bin -ifeq ($(findstring i686-linux-gnu,$(DEB_BUILD_GNU_TYPE)),i686-linux-gnu) - mv debian/tmp/usr/bin/elksemu debian/tmp-bcc/usr/bin - install -d debian/tmp-bcc/usr/share/man/man1 - mv debian/tmp/usr/man/man1/elksemu.1.gz debian/tmp-bcc/usr/share/man/man1 -endif install -d debian/tmp-bcc/usr/lib/bcc mv debian/tmp/usr/lib/bcc/bcc-cc1 debian/tmp-bcc/usr/lib/bcc mv debian/tmp/usr/lib/bcc/bcc-cpp debian/tmp-bcc/usr/lib/bcc diff -u linux86-0.16.17/man/ar86.1 linux86-0.16.17/man/ar86.1 --- linux86-0.16.17/man/ar86.1 +++ linux86-0.16.17/man/ar86.1 @@ -41,7 +41,7 @@ .B p \fIprint\fP the contents of archive members to standard out. If a file list is included only those members are printed. If the \fBv\fR -modifier is present each file's contents are preceeded by a new line, +modifier is present each file's contents are preceded by a new line, a line with the string \fBmember\fR, a space character, the member name, and two following newlines. .TP only in patch2: unchanged: --- linux86-0.16.17.orig/debian/source/format +++ linux86-0.16.17/debian/source/format @@ -0,0 +1 @@ +1.0 only in patch2: unchanged: --- linux86-0.16.17.orig/man/as86.1 +++ linux86-0.16.17/man/as86.1 @@ -186,7 +186,7 @@ mov ax,[_hello] .fi Absolute addressing, ax is set to contents of location 1234. Note the -third option is not strictly consistant but is in place mainly for asld +third option is not strictly consistent but is in place mainly for asld compatibility. .sp only in patch2: unchanged: --- linux86-0.16.17.orig/man/ld86.1 +++ linux86-0.16.17/man/ld86.1 @@ -108,7 +108,7 @@ Standard C variable for the end of the text segment. .TP .B __edata -Standard C variable for the end of the initilised data. +Standard C variable for the end of the initialized data. .TP .B __end Standard C variable for the end of the bss area. @@ -129,8 +129,8 @@ The top of segment 'X's data area. .TP .B __segXCL -The bottom of segment 'X's 'common data' or unitilised data area. Each -segment has both an initilised and unitilised data area. +The bottom of segment 'X's 'common data' or uninitialized data area. Each +segment has both an initialized and uninitialized data area. .TP .B __segXCH The top of segment 'X's common area.