Merge lp:~gezakovacs/ubuntu/lucid/unetbootin/fix-10.10-desktop-iso-loading into lp:ubuntu/lucid/unetbootin

[Geza Kovacs]

Fixes generated menu entries when loading Ubuntu 10.10 desktop iso. Has been tested against ubuntu-10.10-rc-desktop-amd64.iso and ubuntu-10.04-desktop-i386.iso

[Luke Faraone (lfaraone)]

FYI, I think you meant to merge this into lucid-updates. I've proposed a merge into -updates for you and will review shortly.

review: Disapprove (procedural)

Unmerged revisions

17. By Geza Kovacs on 2010-10-06

Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)

16. By Luke Faraone on 2010-05-11

Include Ubuntu 10.04 LTS in the dropdown list for Ubuntu. (LP: #578841)

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-14 09:16:41 +0000
+++ debian/changelog	2010-10-06 20:05:57 +0000
@@ -1,3 +1,15 @@
+unetbootin (408-1ubuntu1.10.04.1) lucid-proposed; urgency=low
+
+  * Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)
+
+ -- Geza Kovacs <[e-mail]>  Wed, 06 Oct 2010 15:33:58 -0400
+
+unetbootin (408-1ubuntu0.10.04.1) lucid-proposed; urgency=low
+
+  * Include Ubuntu 10.04 LTS in the dropdown list for Ubuntu. (LP: #578841)
+
+ -- Luke Faraone <[e-mail]>  Tue, 11 May 2010 11:11:22 -0400
+
 unetbootin (408-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2009-09-27 14:48:46 +0000
+++ debian/control	2010-10-06 20:05:57 +0000
@@ -1,7 +1,8 @@
 Source: unetbootin
 Section: utils
 Priority: optional
-Maintainer: Eugene V. Lyubimkin <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Eugene V. Lyubimkin <[e-mail]>
 Build-Depends: syslinux, debhelper (>= 7), libqt4-dev (>= 4.2)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/collab-maint/unetbootin.git

=== modified file 'distrolst.cpp'
--- distrolst.cpp	2010-02-14 09:16:41 +0000
+++ distrolst.cpp	2010-10-06 20:05:57 +0000
@@ -14,7 +14,7 @@
 
 #ifndef ubunturelnamereplace
 #define ubunturelnamereplace \
-	relname.replace("9.10", "karmic").replace("9.04", "jaunty").replace("8.10", "intrepid").replace("8.04", "hardy").replace("7.10", "gutsy").replace("7.04", "feisty").replace("6.10", "edgy").replace("6.06", "dapper");
+	relname.replace("10.04", "lucid").replace("9.10", "karmic").replace("9.04", "jaunty").replace("8.10", "intrepid").replace("8.04", "hardy").replace("7.10", "gutsy").replace("7.04", "feisty").replace("6.10", "edgy").replace("6.06", "dapper");
 #endif
 
 #ifndef ubuntunetinst

=== modified file 'distrover.cpp'
--- distrover.cpp	2010-02-14 09:16:41 +0000
+++ distrover.cpp	2010-10-06 20:05:57 +0000
@@ -14,6 +14,7 @@
 "8.10_NetInstall" << "8.10_NetInstall_x64" << "8.10_HdMedia" << "8.10_HdMedia_x64" << "8.10_Live" << "8.10_Live_x64" << \
 "9.04_NetInstall" << "9.04_NetInstall_x64" << "9.04_HdMedia" << "9.04_HdMedia_x64" << "9.04_Live" << "9.04_Live_x64" << \
 "9.10_NetInstall" << "9.10_NetInstall_x64" << "9.10_HdMedia" << "9.10_HdMedia_x64" << "9.10_Live" << "9.10_Live_x64" << \
+"10.04_NetInstall" << "10.04_NetInstall_x64" << "10.04_HdMedia" << "10.04_HdMedia_x64" << "10.04_Live" << "10.04_Live_x64" << \
 "Daily_Live" << "Daily_Live_x64"
 #endif
 
@@ -129,7 +130,7 @@
 	"<b>Description:</b> Kaspersky Rescue Disk detects and removes malware from your Windows installation.<br/>"
 	"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which malware scans can be launched.") <<
 "Latest_Live"));
-	distroselect->addItem("Kubuntu", (QStringList() << "9.10_Live" <<
+    distroselect->addItem("Kubuntu", (QStringList() << "10.04_Live" <<
 unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.kubuntu.org/\">http://www.kubuntu.org</a><br/>"
 	"<b>Description:</b> Kubuntu is an official Ubuntu derivative featuring the KDE desktop.<br/>"
 	"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
@@ -220,7 +221,7 @@
 	"<b>Description:</b> SystemRescueCD includes various partition management and data recovery and backup tools.<br/>"
 	"<b>Install Notes:</b> SystemRescueCD is booted and run in live mode; no installation is required to use it.") <<
 "Latest_Live"));
-distroselect->addItem("Ubuntu", (QStringList() << "9.10_Live" <<
+distroselect->addItem("Ubuntu", (QStringList() << "10.04_Live" <<
 unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.ubuntu.com/\">http://www.ubuntu.com</a><br/>"
 	"<b>Description:</b> Ubuntu is a user-friendly Debian-based distribution. It is currently the most popular Linux desktop distribution.<br/>"
 	"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<
@@ -230,7 +231,7 @@
 	"<b>Description:</b> xPUD is a lightweight distribution featuring a simple kiosk-like interface with a web browser and media player.<br/>"
 	"<b>Install Notes:</b> The Live version loads the entire system into RAM and boots from memory.") <<
 "Stable_Live" << "Unstable_Live"));
-distroselect->addItem("Xubuntu", (QStringList() << "9.10_Live" <<
+distroselect->addItem("Xubuntu", (QStringList() << "10.04_Live" <<
 unetbootin::tr("<b>Homepage:</b> <a href=\"http://www.xubuntu.org/\">http://www.xubuntu.org</a><br/>"
 	"<b>Description:</b> Xubuntu is an official Ubuntu derivative featuring the XFCE desktop.<br/>"
 	"<b>Install Notes:</b> The Live version allows for booting in Live mode, from which the installer can optionally be launched. The NetInstall version allows for installation over FTP, and can install Kubuntu and other official Ubuntu derivatives. If you would like to use a pre-downloaded alternate (not desktop) install iso, use the HdMedia option, and then place the alternate install iso file on the root directory of your hard drive or USB drive") <<

=== modified file 'unetbootin.cpp'
--- unetbootin.cpp	2010-02-14 09:16:41 +0000
+++ unetbootin.cpp	2010-10-06 20:05:57 +0000
@@ -1636,7 +1636,31 @@
 	{
 		includesfile = includesfile.right(includesfile.size() - 1).trimmed();
 	}
-	QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
+	QStringList includesfileL;
+	for (int i = 0; i < archivefileconts.size(); ++i)
+	{
+		QString curentry = archivefileconts.at(i);
+		if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
+		{
+			curentry = curentry.left(curentry.size() - 1).trimmed();
+		}
+		if (curentry.contains("/"))
+		{
+			curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
+		}
+		else if (curentry.contains(QDir::toNativeSeparators("/")))
+		{
+			curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
+		}
+		if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
+		{
+			includesfileL.append(archivefileconts.at(i));
+		}
+	}
+	if (includesfileL.isEmpty())
+	{
+		includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
+	}
 	if (!includesfileL.isEmpty())
 	{
 		for (int i = 0; i < includesfileL.size(); ++i)
@@ -1660,7 +1684,31 @@
 	{
 		includesfile = includesfile.right(includesfile.size() - 1).trimmed();
 	}
-	QStringList includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
+	QStringList includesfileL;
+	for (int i = 0; i < archivefileconts.size(); ++i)
+	{
+		QString curentry = archivefileconts.at(i);
+		if (curentry.endsWith("/") || curentry.endsWith(QDir::toNativeSeparators("/")))
+		{
+			curentry = curentry.left(curentry.size() - 1).trimmed();
+		}
+		if (curentry.contains("/"))
+		{
+			curentry = curentry.right(curentry.size() - 1 - curentry.indexOf("/"));
+		}
+		else if (curentry.contains(QDir::toNativeSeparators("/")))
+		{
+			curentry = curentry.right(curentry.size() - 1 - curentry.indexOf(QDir::toNativeSeparators("/")));
+		}
+		if (includesfile.compare(curentry, Qt::CaseInsensitive) == 0)
+		{
+			includesfileL.append(archivefileconts.at(i));
+		}
+	}
+	if (includesfileL.isEmpty())
+	{
+		includesfileL = archivefileconts.filter(includesfile, Qt::CaseInsensitive);
+	}
 	if (!includesfileL.isEmpty())
 	{
 		for (int i = 0; i < includesfileL.size(); ++i)