Package: unetbootin
Version: 585-2

Updating unetbootin to syslinux 6.x.

-- 
Address:        Daniel Baumann, Donnerbuehlweg 3, CH-3012 Bern
Email:          daniel.baum...@progress-technologies.net
Internet:       http://people.progress-technologies.net/~daniel.baumann/

Author: Daniel Baumann <m...@daniel-baumann.ch>
Description: Update unetbootin to syslinux 6.

diff -Naurp unetbootin.orig/debian/control unetbootin/debian/control
--- unetbootin.orig/debian/control
+++ unetbootin/debian/control
@@ -2,7 +2,7 @@ Source: unetbootin
 Section: utils
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
-Build-Depends: debhelper (>= 9), libqt4-dev, syslinux
+Build-Depends: debhelper (>= 9), libqt4-dev, syslinux, syslinux-common
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/collab-maint/unetbootin.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/unetbootin.git;a=summary
@@ -10,7 +10,7 @@ Homepage: http://unetbootin.sourceforge.
 
 Package: unetbootin
 Architecture: amd64 i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, mtools, p7zip-full, syslinux, udev
+Depends: ${misc:Depends}, ${shlibs:Depends}, mtools, p7zip-full, syslinux, syslinux-common, udev
 Recommends: extlinux, unetbootin-translations
 Description: installer of Linux/BSD distributions to a partition or USB drive
  UNetbootin allows for the installation of various Linux/BSD distributions to a
diff -Naurp unetbootin.orig/unetbootin.cpp unetbootin/unetbootin.cpp
--- unetbootin.orig/unetbootin.cpp
+++ unetbootin/unetbootin.cpp
@@ -3365,9 +3365,9 @@ void unetbootin::instIndvfl(QString srcf
 	if (srcfName == "memdisk")
 				srcF.setFileName(QFile::exists("/usr/share/syslinux/memdisk") ? "/usr/share/syslinux/memdisk" : "/usr/lib/syslinux/memdisk");
 	else if (srcfName == "menu.c32")
-				srcF.setFileName(QFile::exists("/usr/share/syslinux/menu.c32") ? "/usr/share/syslinux/menu.c32" : "/usr/lib/syslinux/menu.c32");
+				srcF.setFileName(QFile::exists("/usr/share/syslinux/menu.c32") ? "/usr/share/syslinux/menu.c32" : "/usr/lib/syslinux/menu.c32" : "/usr/lib/syslinux/bios/menu.c32");
 	else if (srcfName == "mbr.bin")
-				srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
+				srcF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr/mbr.bin");
 	else if (srcfName == "ubnsylnx")
 		srcF.setFileName("/usr/bin/syslinux");
 //	else
@@ -4046,7 +4046,7 @@ void unetbootin::runinstusb()
 			QFile usbmbrF(rawtargetDev);
 			QFile mbrbinF(":/mbr.bin");
 			#ifdef NOSTATIC
-			mbrbinF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin");
+			mbrbinF.setFileName(QFile::exists("/usr/share/syslinux/mbr.bin") ? "/usr/share/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr.bin" : "/usr/lib/syslinux/mbr/mbr.bin");
 			#endif
 			usbmbrF.open(QIODevice::WriteOnly);
 			mbrbinF.open(QIODevice::ReadOnly);

Reply via email to