mknbi (1.4.4-7) debian-dir only changes

--- mknbi-1.4.4.orig/debian/rules
+++ mknbi-1.4.4/debian/rules
@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+export FIRSTRELOCS=0x82800 0x92800
+
+%:
+	dh ${@} --with quilt
+
+override_dh_auto_clean:
+	rm -f nfl menu
+	rm -f first32\@0x82800.linux
+	rm -f first32\@0x82800.linux
+	rm -f first32elf\@0x92800.linux
+	rm -f first32elf\@0x92800.linux
+
+	$(MAKE) clean
+
+override_dh_auto_build:
+	$(MAKE) PREFIX=/usr
+
+override_dh_auto_install:
+	mkdir -p debian/mknbi/usr/lib/mknbi
+
+	cp mknbi debian/mknbi/usr/lib/mknbi/mknbi
+	cp disnbi.pl debian/mknbi/usr/lib/mknbi/disnbi
+	cp dismbr.pl debian/mknbi/usr/lib/mknbi/dismbr
+	cp disdosbb.pl debian/mknbi/usr/lib/mknbi/disdosbb
+
+	cp Nbi.pm Elf.pm TruncFD.pm \
+	$(foreach i,$(FIRSTRELOCS),first32@$(i).linux first32elf@$(i).linux) \
+	first.dos first.fdos menu debian/mknbi/usr/lib/mknbi
+
+override_dh_install_changelogs:
+	dh_installchangelogs LOG
+
+override_dh_fixperms:
+	dh_fixperms
+
+	chmod 0644 debian/mknbi/usr/lib/mknbi/*.linux
+	chmod 0644 debian/mknbi/usr/lib/mknbi/*.pm
+	chmod 0644 debian/mknbi/usr/lib/mknbi/menu
--- mknbi-1.4.4.orig/debian/control
+++ mknbi-1.4.4/debian/control
@@ -0,0 +1,25 @@
+Source: mknbi
+Section: admin
+Priority: optional
+Maintainer: Debian Syslinux Maintainers <syslinux@lists.debian-maintainers.org>
+Uploaders: Daniel Baumann <daniel@debian.org>
+Build-Depends:
+ debhelper (>= 7.0.50~), gcc-multilib, nasm, perl, quilt (>= 0.46-7)
+Standards-Version: 3.9.1
+Homepage: http://www.etherboot.org/
+Vcs-Browser: http://git.debian-maintainers.org/?p=syslinux/mknbi.git
+Vcs-Git: git://git.debian-maintainers.org/git/syslinux/mknbi.git
+
+Package: mknbi
+Depends: ${misc:Depends}, perl
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
+Description: Create tagged images for Etherboot or Netboot
+ With mknbi you can create tagged images for Etherboot. Tagged images are data
+ files, which contain the necessary files for booting up (kernel+root for
+ Linux, kernel+minifs for DOS, ...) bundled together with a special format.
+ .
+ These tagged images are downloaded and understood by Etherboot and Netboot
+ during the boot process.
+ .
+ This package should be used on the server and not on the client. It doesn't
+ contain code which handles the network card, downloads the image, etc.
--- mknbi-1.4.4.orig/debian/README.source
+++ mknbi-1.4.4/debian/README.source
@@ -0,0 +1,37 @@
+Package Repositories
+--------------------
+
+Backports for the current stable debian distribution as well as snapshots of
+unreleased versions may be available in repositories listed on the maintainers
+homepage. The current URL of the maintainer homepage can be seen in
+debian/copyright.
+
+
+Source Access
+-------------
+
+You can obtain the sources of this package with:
+
+  $ apt-get source ${PACKAGE}
+
+whereas '${PACKAGE}' has to be replaced with the actual name of the package.
+
+This package is maintained with the Git version control system. The current git
+source tree can be obtained with:
+
+  $ git clone ${GIT_URI}
+
+whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
+repository. The current Git URI can be seen in debian/control in the extracted
+package sources.
+
+More information about Git can be found in the git-core package.
+
+This package may use the Quilt patch system to manage all modifications to the
+upstream source. Changes, if any, are stored in the source package as diffs in
+debian/diff and are applied during the build. Current modifications can be
+applied to the source tree with:
+
+  $ QUILT_PATCHES=debian/patches quilt push -a
+
+More information about Quilt can be found in the quilt package.
--- mknbi-1.4.4.orig/debian/mknbi.docs
+++ mknbi-1.4.4/debian/mknbi.docs
@@ -0,0 +1,3 @@
+README
+*.html
+*.txt
--- mknbi-1.4.4.orig/debian/copyright
+++ mknbi-1.4.4/debian/copyright
@@ -0,0 +1,50 @@
+Upstream-Contact: Etherboot project <gpxe@etherboot.org>
+Upstream-Homepage: http://www.etherboot.org/
+Maintainer-Contact: Debian Syslinux Maintainers <syslinux@lists.debian-maintainers.org>
+Maintainer-Homepage: http://syslinux.debian-maintainers.org/
+
+Files: *
+Copyright:
+ (C) 1991-1992 Linus Torvalds
+ (C) 1996-1998 Gero Kuhlmann
+ (C) 1997 M. Gutschke
+ (C) 2003 Robb Main
+ (C) 2003 Eric Biederman
+ (C) 1999-2004 Ken Yap <ken_yap@users.sourceforge.net>
+License: GPL-2
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; version 2
+ of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
+
+Files: debian/*
+Copyright: (C) 2009-2010 Daniel Baumann <daniel@debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
--- mknbi-1.4.4.orig/debian/changelog
+++ mknbi-1.4.4/debian/changelog
@@ -0,0 +1,134 @@
+mknbi (1.4.4-7) unstable; urgency=low
+
+  * Adding patch from Colin Watson <cjwatson@ubuntu.com> to pass
+    appropriate options to ld and as to make multilib build work
+    (Closes: #593609).
+  * Updating standards version to 3.9.1.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 01 Sep 2010 10:19:19 +0200
+
+mknbi (1.4.4-6) unstable; urgency=low
+
+  * Updating standards version to 3.9.0.
+  * Building with gcc-multilib (Closes: #587734).
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 01 Jul 2010 14:53:45 +0200
+
+mknbi (1.4.4-5) unstable; urgency=low
+
+  * Correcting yet another spelling error in package long-description
+    (Closes: #584708).
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 06 Jun 2010 09:35:07 +0200
+
+mknbi (1.4.4-4) unstable; urgency=low
+
+  * Correcting another spelling error in package long-description
+    (Closes: #584618).
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 05 Jun 2010 08:32:16 +0200
+
+mknbi (1.4.4-3) unstable; urgency=low
+
+  * Updating year in copyright file.
+  * Updating to standards 3.8.4.
+  * Correcting spelling error in package long-description (Closes:
+    #584131).
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 04 Jun 2010 17:30:33 +0200
+
+mknbi (1.4.4-2) unstable; urgency=low
+
+  * New maintainer, taking over package from Gergely with thanks for all his
+    past work on it.
+  * Redone debian packaging from scratch, including:
+    - adding amd64 into architecture list (Closes: #427478).
+    - adding kfreebsd-amd64 and kfreebsd-i386 into architecture list
+      (Closes: #366409).
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 16 Dec 2009 13:51:06 +0100
+
+mknbi (1.4.4-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix bashism in debian/rules (Closes: #478407)
+  * debian/control:
+    - Bump Standards-Version to 3.8.0.
+    - Move upstream URL to Homepage: field
+
+ -- Chris Lamb <chris@chris-lamb.co.uk>  Sat, 07 Jun 2008 22:38:23 +0100
+
+mknbi (1.4.4-1) unstable; urgency=low
+
+  * New upstream release (closes: #323733, #329453)
+  * Improvements from Erik Schanze (closes: #329452)
+
+ -- RISKO Gergely <risko@debian.org>  Thu, 17 Nov 2005 20:41:04 +0100
+
+mknbi (1.4.3-2) unstable; urgency=low
+
+  * fix version string bugs (probably forever with help of Mark Williams
+    (closes: #255139)
+  * better copyright file written and included
+
+ -- RISKO Gergely <risko@debian.org>  Fri, 13 Aug 2004 16:24:20 +0200
+
+mknbi (1.4.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- RISKO Gergely <risko@debian.org>  Thu, 20 May 2004 17:11:26 +0200
+
+mknbi (1.4.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #201304)
+
+ -- RISKO Gergely <risko@debian.org>  Tue, 15 Jul 2003 11:33:47 +0200
+
+mknbi (1.2.12-2) unstable; urgency=low
+
+  * fix version in debian/rules
+
+ -- RISKO Gergely <risko@debian.org>  Wed, 26 Mar 2003 22:37:36 +0100
+
+mknbi (1.2.12-1) unstable; urgency=low
+
+  * New upstream release (closes: #171764)
+
+ -- RISKO Gergely <risko@debian.org>  Fri, 17 Jan 2003 15:42:52 +0100
+
+mknbi (1.2.7-2) unstable; urgency=low
+
+  * fix version string in dosnbi (closes: Bug#144498)
+
+ -- RISKO Gergely <risko@debian.org>  Sun,  5 May 2002 16:25:03 +0200
+
+mknbi (1.2.7-1) unstable; urgency=low
+
+  * new upstream (closes: Bug#140284)
+
+ -- RISKO Gergely <risko@debian.org>  Thu, 28 Mar 2002 14:05:26 +0100
+
+mknbi (1.2-4) unstable; urgency=low
+
+  * changed the totally bad description. (closes: Bug#133983)
+
+ -- RISKO Gergely <risko@debian.org>  Fri, 15 Feb 2002 18:45:01 +0100
+
+mknbi (1.2-3) unstable; urgency=high
+
+  * fixed a very nasty bug (files missing from /usr/lib/mknbi)
+
+ -- RISKO Gergely <risko@debian.org>  Thu, 27 Dec 2001 10:47:57 +0100
+
+mknbi (1.2-2) unstable; urgency=low
+
+  * divert the old netboot files (closes: Bug#122403)
+
+ -- RISKO Gergely <risko@debian.org>  Sun, 16 Dec 2001 14:31:22 +0100
+
+mknbi (1.2-1) unstable; urgency=low
+
+  * Initial Release. (closes: Bug#119553)
+
+ -- RISKO Gergely <risko@debian.org>  Wed, 14 Nov 2001 19:02:41 +0100
--- mknbi-1.4.4.orig/debian/mknbi.manpages
+++ mknbi-1.4.4/debian/mknbi.manpages
@@ -0,0 +1 @@
+*.1
--- mknbi-1.4.4.orig/debian/mknbi.links
+++ mknbi-1.4.4/debian/mknbi.links
@@ -0,0 +1,16 @@
+/usr/lib/mknbi/disnbi		/usr/bin/disnbi
+
+/usr/lib/mknbi/mknbi		/usr/bin/mkelf-linux
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mkelf-linux.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mkelf-menu
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mkelf-menu.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mknbi-dos
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mknbi-dos.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mknbi-fdos
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mknbi-fdos.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mknbi-linux
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mknbi-linux.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mknbi-menu
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mknbi-menu.1.gz
+/usr/lib/mknbi/mknbi		/usr/bin/mknbi-rom
+/usr/share/man/man1/mknbi.1.gz	/usr/share/man/man1/mknbi-rom.1.gz
--- mknbi-1.4.4.orig/debian/compat
+++ mknbi-1.4.4/debian/compat
@@ -0,0 +1 @@
+7
--- mknbi-1.4.4.orig/debian/patches/series
+++ mknbi-1.4.4/debian/patches/series
@@ -0,0 +1,3 @@
+01-conglomeration.patch
+02-gcc-multilib.patch
+03-gcc-multilib-harder.patch
--- mknbi-1.4.4.orig/debian/patches/02-gcc-multilib.patch
+++ mknbi-1.4.4/debian/patches/02-gcc-multilib.patch
@@ -0,0 +1,15 @@
+Author: Daniel Baumann <daniel@debian.org>
+Description: Build with gcc-multilib (Closes: #587734).
+
+diff -Naurp mknbi.orig//Makefile mknbi/Makefile
+--- mknbi.orig//Makefile	2010-07-01 14:41:36.745016394 +0200
++++ mknbi/Makefile	2010-07-01 14:41:13.661057745 +0200
+@@ -18,7 +18,7 @@ ASM=nasm
+ FIRSTRELOCS=	0x92800 0x82800
+ OLDGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
+ CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
+-		-mcpu=i386 \
++		-m32 -mcpu=i386 \
+ 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
+ LDBINARYFLAG=	--oformat binary
+ FIRST32SIZE=	6144
--- mknbi-1.4.4.orig/debian/patches/03-gcc-multilib-harder.patch
+++ mknbi-1.4.4/debian/patches/03-gcc-multilib-harder.patch
@@ -0,0 +1,36 @@
+Author: Colin Watson <cjwatson@ubuntu.com>
+Description:
+ Pass appropriate options to ld and as to make multilib build work
+ (Closes: #593609).
+
+diff -Naurp mknbi.orig/Makefile mknbi/Makefile
+--- mknbi.orig/Makefile	2010-09-01 08:17:50.000000000 +0000
++++ mknbi/Makefile	2010-09-01 08:17:55.000000000 +0000
+@@ -20,7 +20,8 @@ OLDGAS:=	$(shell $(AS) --version | grep
+ CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
+ 		-m32 -mcpu=i386 \
+ 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
+-LDBINARYFLAG=	--oformat binary
++LDBINARYFLAG=	--oformat binary -m elf_i386
++ASFLAGS=	--32
+ FIRST32SIZE=	6144
+ 
+ # for first32dos
+@@ -101,7 +102,7 @@ first32elf@%.dos:	start32@%.o first32dos
+ 	$(LD) -N -Ttext $* -e _start $(LDBINARYFLAG) -o $@ start32@$*.o first32dos.o printf.o string.o
+ 
+ start32@%.o:	start32.S
+-	gcc -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) -o start32@$*.o
++	gcc -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) $(ASFLAGS) -o start32@$*.o
+ 
+ first32.o:	first32.c etherboot.h start32.h
+ 	gcc $(CFLAGS) -o first32.o -c first32.c
+@@ -161,7 +162,7 @@ lua/bin/lua:
+ 	cd lua; make
+ 
+ startmenu.o:	startmenu.S startmenu.h
+-	gcc -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o
++	gcc -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) $(ASFLAGS) -o startmenu.o
+ 
+ menu.o:		menu.c stddef.h string.h printf.h ansiesc.h \
+ 		misc.h linux-asm-io.h etherboot.h
--- mknbi-1.4.4.orig/debian/patches/01-conglomeration.patch
+++ mknbi-1.4.4/debian/patches/01-conglomeration.patch
@@ -0,0 +1,15 @@
+Author: n/a
+Description: n/a
+
+diff -Naurp mknbi-1.4.4/nfl.c deb/nfl.c
+--- mknbi-1.4.4/nfl.c	2003-09-22 16:47:08.000000000 +0200
++++ deb/nfl.c	2009-12-16 13:21:10.000000000 +0100
+@@ -124,7 +124,7 @@ static unsigned short menu_rows = 0x0800
+ static unsigned short menu_cols = 0x0800;
+ 
+ /* Terminal types.  */
+-static int terminal = TERMINAL_CONSOLE;
++int terminal = TERMINAL_CONSOLE;
+ 
+ /* Defined in ANSI.C */
+ extern unsigned short rows, columns, attr;