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

[Geza Kovacs]

Fixes issues when loading Ubuntu 10.10 desktop iso. Has been tested against ubuntu-10.10-beta-desktop-amd64.iso. Corresponds to upstream commit http://github.com/gkovacs/unetbootin/commit/feab255c7c67b9663092be2420fb69a1fc32d446#diff-1 (LP: #615285)

[Luke Faraone (lfaraone)]

review: Approve

[Luke Faraone (lfaraone)]

 * You don't need to use "ubuntu0.10.10.1", this isn't a SRU. "ubuntu1" will suffice.
 * Please run update-maintainer to comply with <https://wiki.ubuntu.com/DebianMaintainerField>

review: Needs Fixing

[lp:~gezakovacs/ubuntu/maverick/unetbootin/fix-10.10-desktop-iso-loading]

20. By Geza Kovacs on 2010-09-29

switch to ubuntu1 version suffix (not an SRU), and ran update-maintainer

[Luke Faraone (lfaraone)]

Merged, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-13 21:30:22 +0000
+++ debian/changelog	2010-09-29 19:02:40 +0000
@@ -1,3 +1,9 @@
+unetbootin (471-1ubuntu1) maverick; urgency=low
+
+  * Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285)
+
+ -- Geza Kovacs <[e-mail]>  Wed, 29 Sep 2010 14:54:28 -0400
+
 unetbootin (471-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2010-04-15 20:13:52 +0000
+++ debian/control	2010-09-29 19:02:40 +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.4
 Vcs-Git: git://git.debian.org/git/collab-maint/unetbootin.git
 
=== modified file 'unetbootin.cpp'
--- unetbootin.cpp	2010-06-13 21:30:22 +0000
+++ unetbootin.cpp	2010-09-29 19:02:40 +0000
@@ -2151,7 +2151,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)
@@ -2179,7 +2203,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)
@@ -2207,7 +2255,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)
@@ -2235,7 +2307,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)