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

[Luke Faraone]

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, instead of incrementing the "0ubuntu1" revision for SRUs, we increment the portion after that: "0ubuntu0.10.04.2".

I filled out the SRU information for this bug. In the future, the sponsoree is expected to have already done so.

review: Approve

Unmerged revisions

17. By Geza Kovacs on 2010-10-06

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-11 11:11:22 +0000
+++ debian/changelog	2010-10-06 20:08:57 +0000
@@ -1,3 +1,9 @@
+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)
 
=== modified file 'debian/control'
--- debian/control	2009-09-27 14:48:46 +0000
+++ debian/control	2010-10-06 20:08: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 'unetbootin.cpp'
--- unetbootin.cpp	2010-02-14 09:16:41 +0000
+++ unetbootin.cpp	2010-10-06 20:08: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)