--- unetbootin-471.orig/unetbootin.cpp +++ unetbootin-471/unetbootin.cpp @@ -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) --- unetbootin-471.orig/debian/rules +++ unetbootin-471/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +%: + dh $@ + +build: build-stamp +build-stamp: + qmake-qt4 "QMAKE_CXXFLAGS_RELEASE += $(CFLAGS)" + make + touch $@ + +clean: + dh clean + rm -f *.qm + +install: build + dh install -punetbootin + +# Build architecture-independent files here. +binary-indep: + lrelease-qt4 unetbootin.pro + dh_install --sourcedir=$(CURDIR) -punetbootin-translations + +# Build architecture-dependent files here. +binary-arch: install + dh binary-arch + +binary: binary-indep binary-arch +.PHONY: build binary-indep binary-arch install --- unetbootin-471.orig/debian/unetbootin.1 +++ unetbootin-471/debian/unetbootin.1 @@ -0,0 +1,16 @@ +.TH UNETBOOTIN 1 "November 2, 2008" +.SH NAME +unetbootin \- program to install Linux/BSD distributions to a partition or USB drive +.SH SYNOPSIS +.B unetbootin +.SH DESCRIPTION +This manual page documents briefly the +.B unetbootin +command. +.PP +\fBunetbootin\fP allows for the installation of various Linux/BSD distributions to a partition or USB drive, so it's no different from a standard install, only it doesn't need a CD. It can create a dual-boot install, or replace the existing OS entirely. +.SH AUTHOR +unetbootin was written by Geza Kovacs +.PP +This manual page was written by Eugene V. Lyubimkin , +for the Debian project (but may be used by others). --- unetbootin-471.orig/debian/manpages +++ unetbootin-471/debian/manpages @@ -0,0 +1 @@ +debian/unetbootin.1 --- unetbootin-471.orig/debian/watch +++ unetbootin-471/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/unetbootin/ unetbootin-source-(\d+)\.tar\.gz --- unetbootin-471.orig/debian/unetbootin-translations.install +++ unetbootin-471/debian/unetbootin-translations.install @@ -0,0 +1 @@ +*.qm usr/share/unetbootin/ --- unetbootin-471.orig/debian/unetbootin-translations.dirs +++ unetbootin-471/debian/unetbootin-translations.dirs @@ -0,0 +1 @@ +usr/share/unetbootin --- unetbootin-471.orig/debian/unetbootin.dirs +++ unetbootin-471/debian/unetbootin.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/applications --- unetbootin-471.orig/debian/copyright +++ unetbootin-471/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Eugene V. Lyubimkin on +Sun, 02 Nov 2008 20:51:49 +0200. + +It was downloaded from +http://bazaar.launchpad.net/%7Egezakovacs/unetbootin/devel-new/ + +Upstream Author: + Geza Kovacs + +Copyright: + Copyright (C) 2007-2008 Geza Kovacs + +License: + + 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 at + for more details. + +On Debian systems, you can find copy of GPLv2 license at +`/usr/share/common-licenses/GPL-2'. + +The Debian packaging is Copyright (C) 2008, Eugene V. Lyubimkin +and is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. --- unetbootin-471.orig/debian/compat +++ unetbootin-471/debian/compat @@ -0,0 +1 @@ +7 --- unetbootin-471.orig/debian/unetbootin.install +++ unetbootin-471/debian/unetbootin.install @@ -0,0 +1,2 @@ +unetbootin usr/bin +unetbootin.desktop usr/share/applications --- unetbootin-471.orig/debian/control +++ unetbootin-471/debian/control @@ -0,0 +1,30 @@ +Source: unetbootin +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Eugene V. Lyubimkin +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 +Vcs-Browser: http://git.debian.org/?p=collab-maint/unetbootin.git;a=summary +Homepage: http://unetbootin.sourceforge.net + +Package: unetbootin +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, syslinux, p7zip-full, udev +Recommends: unetbootin-translations (>= ${binary:Version}) +Description: installer of Linux/BSD distributions to a partition or USB drive + UNetbootin allows for the installation of various Linux/BSD distributions to a + partition or USB drive, so it's no different from a standard install, only it + doesn't need a CD. It can create a dual-boot install, or replace the existing + OS entirely. + +Package: unetbootin-translations +Architecture: all +Depends: ${misc:Depends} +Recommends: unetbootin +Description: translations for unetbootin distribution installer + UNetbooin is an installer of Linux/BSD distributions to a partition or USB + drive. + . + This package contains translation files for unetbootin. --- unetbootin-471.orig/debian/changelog +++ unetbootin-471/debian/changelog @@ -0,0 +1,211 @@ +unetbootin (471-1ubuntu1) maverick; urgency=low + + * Fixes issues when loading Ubuntu 10.10 desktop iso. (LP: #615285) + + -- Geza Kovacs Wed, 29 Sep 2010 14:54:28 -0400 + +unetbootin (471-1) unstable; urgency=low + + * New upstream release. + + -- Eugene V. Lyubimkin Sun, 13 Jun 2010 21:30:22 +0300 + +unetbootin (442-1) unstable; urgency=low + + * New upstream release. + + -- Eugene V. Lyubimkin Thu, 13 May 2010 10:55:58 +0300 + +unetbootin (429-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Bumped Standards-Version to 3.8.4, no changes needed. + + -- Eugene V. Lyubimkin Thu, 15 Apr 2010 20:13:52 +0300 + +unetbootin (408-1) unstable; urgency=low + + * New upstream release. + - Added an option to download Debian hd-media kernel and initrd. + (Closes: #563738) + + -- Eugene V. Lyubimkin Sun, 14 Feb 2010 09:16:41 +0200 + +unetbootin (377-1) unstable; urgency=low + + * New upstream release. + + -- Eugene V. Lyubimkin Tue, 10 Nov 2009 08:51:36 +0200 + +unetbootin (372-1) unstable; urgency=low + + * New upstream release, includes: + - Force sync before reboot. (Closes: #533832) + * debian/control: + - Bumped Standards-Version to 3.8.3, no changes needed. + - Updated my mail address. + - Removed 'DM-Upload-Allowed' field, it's not needed anymore. + + -- Eugene V. Lyubimkin Sun, 27 Sep 2009 14:48:46 +0300 + +unetbootin (356-1) unstable; urgency=low + + * New upstream release, some changes: + - Added a graceful check for out of space errors (Closes: #531574). + - Added translations: + - Arabic + - pt_BR + - Czech + - Greek + - Chinese (traditional) + + -- Eugene V. Lyubimkin Sat, 20 Jun 2009 11:16:16 +0300 + +unetbootin (344-1) unstable; urgency=low + + * New upstream release: + - Added distributions: + - Kiwi Linux + - xPUD + - SystemRescueCD + - Added support for anti-virus software: + - Dr.Web AntiVirus + - F-Secure Rescue CD + - Kaspersky Rescue Disk + - Added one more mirror for Parted Magic distribution. + - Added translations: + - Romanian + - Turkish + - Spanish + - Vietnamese + - Catalan + - Norwegian Bokmål + - Dutch + + -- Eugene V. Lyubimkin Fri, 05 Jun 2009 19:56:59 +0300 + +unetbootin (323-1) unstable; urgency=low + + * New upstream release: + - Added *Ubuntu Jaunty distributions. + - Updated German translation. + + -- Eugene V. Lyubimkin Sat, 02 May 2009 13:53:51 +0300 + +unetbootin (319-2) unstable; urgency=low + + * debian/control: + - Added syslinux to build-depends, set arch to 'any'. (Closes: #519214) + - Bump 'Standards-Version' to 3.8.1, no changes needed. + + -- Eugene V. Lyubimkin Sat, 21 Mar 2009 13:57:58 +0200 + +unetbootin (319-1) unstable; urgency=low + + * New upstream release: + - Added gNewSense, Super Ubuntu and MEPIS to list of supported distros. + - Added new download location for Parted Magic utility. + - Use right-to-left window layout for right-to-left languages. + - Added he_IL (Hebrew) translation. + + -- Eugene V. Lyubimkin Sun, 08 Mar 2009 10:27:48 +0200 + +unetbootin (312-2) unstable; urgency=low + + * debian/control: + - UNetbootin is useful and installable only on i386 and amd64 architectures. + * debian/copyright: + - Added word 'Copyright' to the copyright entry of Debian packaging, as + suggested by lintian. + + -- Eugene V. Lyubimkin Wed, 18 Feb 2009 20:43:29 +0200 + +unetbootin (312-1) unstable; urgency=low + + * New upstream release: + - Use also 'df' command to determine all drives in system. + - Handle mount point paths with spaces correctly. (Closes: #513948) + + -- Eugene V. Lyubimkin Thu, 05 Feb 2009 20:29:20 +0200 + +unetbootin (308-1) unstable; urgency=low + + * New upstream release, some changes: + - Sabayon Linux support. + + -- Eugene V. Lyubimkin Thu, 29 Jan 2009 10:12:01 +0200 + +unetbootin (304-2) unstable; urgency=low + + * Upload as requested by ftpmaster to test a DM code change. + + -- Eugene V. Lyubimkin Fri, 02 Jan 2009 23:24:58 +0200 + +unetbootin (304-1) unstable; urgency=low + + * New upstream version: + - Added download URL for Fedora 10. + - Updated download URL for Linux Mint. + - Updated Kubuntu, Ubuntu, XUbuntu, Fedora, Linux Mint, OpenSUSE entries. + - Added Norwegian Bokmal translation. + * debian/watch: + - Corrected to not accept non-digit symbols in version. + + -- Eugene V. Lyubimkin Sat, 20 Dec 2008 15:06:40 +0200 + +unetbootin (301-2) unstable; urgency=low + + * debian/rules: + - Don't try to deal with binary-independent files in binary-arch rule. + Fixes FTBFS. (Closes: #508639) + * debian/control: + - Added '{misc:Depends}' to 'Depends' fields, fixes lintian warning. + + -- Eugene V. Lyubimkin Sat, 13 Dec 2008 23:10:40 +0200 + +unetbootin (301-1) unstable; urgency=low + + * New upstream release. + * debian/unetbootin.install: + - Switched to new source patch for .desktop file. + + -- Eugene V. Lyubimkin Tue, 11 Nov 2008 23:55:50 +0200 + +unetbootin (299-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: + - Updated copyright year. + * debian/rules: + - Added passing dpkg-buildpackage-provided CFLAGS to qmake. This enables + handling of 'noopt' in DEB_BUILD_OPTIONS. + * debian/dirs: + - Split into debian/unetbootin.dirs and debian/unetbootin-translations.dirs. + * debian/watch: + - Upstream now provides tarballs with version string. + * debian/rules: + - Stopped passing now unneeded option to qmake. + * debian/unetbootin.{dirs,install}: + - Modified to include desktop file. + * debian/control: + - Project is now maintained at git.debian.org, add Vcs-Git and Vcs-Browser + fields. + + -- Eugene V. Lyubimkin Tue, 11 Nov 2008 23:22:40 +0200 + +unetbootin (298.dfsg-1) unstable; urgency=low + + * New upstream release. + - Detects USB drives by id, not by filesystem. + * debian/rules: + - Stop doing 'lupdate-qt4', this produces unneded changes to diff.gz. + + -- Eugene V. Lyubimkin Tue, 04 Nov 2008 00:35:35 +0200 + +unetbootin (295.dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #500842) + + -- Eugene V. Lyubimkin Sun, 02 Nov 2008 20:51:49 +0200 +