nixmaniack · gkovacs · Aug 25, 2013 · Aug 25, 2013 · Aug 25, 2013 · Aug 25, 2013
diff --git a/._INSTALL b/._INSTALL
diff --git a/._README.TXT b/._README.TXT
diff --git a/._build-nostatic b/._build-nostatic
diff --git a/._customdistrolst.cpp b/._customdistrolst.cpp
diff --git a/._customdistselect.cpp b/._customdistselect.cpp
diff --git a/._distrolst.cpp b/._distrolst.cpp
diff --git a/._distrover.cpp b/._distrover.cpp
diff --git a/._distrovercust.cpp b/._distrovercust.cpp
diff --git a/._main.cpp b/._main.cpp
diff --git a/._unetbootin.cpp b/._unetbootin.cpp
diff --git a/._unetbootin.desktop b/._unetbootin.desktop
diff --git a/._unetbootin.h b/._unetbootin.h
diff --git a/._unetbootin.pro b/._unetbootin.pro
diff --git a/._unetbootin.ts b/._unetbootin.ts
diff --git a/._unetbootin.ui b/._unetbootin.ui
diff --git a/._unetbootin_128.png b/._unetbootin_128.png
diff --git a/._unetbootin_14.png b/._unetbootin_14.png
diff --git a/._unetbootin_16.png b/._unetbootin_16.png
diff --git a/._unetbootin_192.png b/._unetbootin_192.png
diff --git a/._unetbootin_22.png b/._unetbootin_22.png
diff --git a/._unetbootin_24.png b/._unetbootin_24.png
diff --git a/._unetbootin_256.png b/._unetbootin_256.png
diff --git a/._unetbootin_32.png b/._unetbootin_32.png
diff --git a/._unetbootin_48.png b/._unetbootin_48.png
diff --git a/._unetbootin_512.png b/._unetbootin_512.png
diff --git a/._unetbootin_64.png b/._unetbootin_64.png
diff --git a/._unetbootin_am.ts b/._unetbootin_am.ts
diff --git a/._unetbootin_ar.ts b/._unetbootin_ar.ts
diff --git a/._unetbootin_ast.ts b/._unetbootin_ast.ts
diff --git a/._unetbootin_be.ts b/._unetbootin_be.ts
diff --git a/._unetbootin_bg.ts b/._unetbootin_bg.ts
diff --git a/._unetbootin_bn.ts b/._unetbootin_bn.ts
diff --git a/._unetbootin_ca.ts b/._unetbootin_ca.ts
diff --git a/._unetbootin_cs.ts b/._unetbootin_cs.ts
diff --git a/._unetbootin_custom.ts b/._unetbootin_custom.ts
diff --git a/._unetbootin_da.ts b/._unetbootin_da.ts
diff --git a/._unetbootin_de.ts b/._unetbootin_de.ts
diff --git a/._unetbootin_el.ts b/._unetbootin_el.ts
diff --git a/._unetbootin_eo.ts b/._unetbootin_eo.ts
diff --git a/._unetbootin_es.ts b/._unetbootin_es.ts
diff --git a/._unetbootin_et.ts b/._unetbootin_et.ts
diff --git a/._unetbootin_eu.ts b/._unetbootin_eu.ts
diff --git a/._unetbootin_fa.ts b/._unetbootin_fa.ts
diff --git a/._unetbootin_fi.ts b/._unetbootin_fi.ts
diff --git a/._unetbootin_fo.ts b/._unetbootin_fo.ts
diff --git a/._unetbootin_fr.ts b/._unetbootin_fr.ts
diff --git a/._unetbootin_gl.ts b/._unetbootin_gl.ts
diff --git a/._unetbootin_he.ts b/._unetbootin_he.ts
diff --git a/._unetbootin_hr.ts b/._unetbootin_hr.ts
diff --git a/._unetbootin_hu.ts b/._unetbootin_hu.ts
diff --git a/._unetbootin_icons.svg b/._unetbootin_icons.svg
diff --git a/._unetbootin_id.ts b/._unetbootin_id.ts
diff --git a/._unetbootin_it.ts b/._unetbootin_it.ts
diff --git a/._unetbootin_ja.ts b/._unetbootin_ja.ts
diff --git a/._unetbootin_lt.ts b/._unetbootin_lt.ts
diff --git a/._unetbootin_lv.ts b/._unetbootin_lv.ts
diff --git a/._unetbootin_ml.ts b/._unetbootin_ml.ts
diff --git a/._unetbootin_ms.ts b/._unetbootin_ms.ts
diff --git a/._unetbootin_nan.ts b/._unetbootin_nan.ts
diff --git a/._unetbootin_nb.ts b/._unetbootin_nb.ts
diff --git a/._unetbootin_nl.ts b/._unetbootin_nl.ts
diff --git a/._unetbootin_nn.ts b/._unetbootin_nn.ts
diff --git a/._unetbootin_pl.ts b/._unetbootin_pl.ts
diff --git a/._unetbootin_pt.ts b/._unetbootin_pt.ts
diff --git a/._unetbootin_pt_BR.ts b/._unetbootin_pt_BR.ts
diff --git a/._unetbootin_ro.ts b/._unetbootin_ro.ts
diff --git a/._unetbootin_ru.ts b/._unetbootin_ru.ts
diff --git a/._unetbootin_si.ts b/._unetbootin_si.ts
diff --git a/._unetbootin_sk.ts b/._unetbootin_sk.ts
diff --git a/._unetbootin_sl.ts b/._unetbootin_sl.ts
diff --git a/._unetbootin_sr.ts b/._unetbootin_sr.ts
diff --git a/._unetbootin_sv.ts b/._unetbootin_sv.ts
diff --git a/._unetbootin_sw.ts b/._unetbootin_sw.ts
diff --git a/._unetbootin_tr.ts b/._unetbootin_tr.ts
diff --git a/._unetbootin_uk.ts b/._unetbootin_uk.ts
diff --git a/._unetbootin_ur.ts b/._unetbootin_ur.ts
diff --git a/._unetbootin_vi.ts b/._unetbootin_vi.ts
diff --git a/._unetbootin_zh_CN.ts b/._unetbootin_zh_CN.ts
diff --git a/._unetbootin_zh_TW.ts b/._unetbootin_zh_TW.ts
diff --git a/._vcs-name b/._vcs-name
diff --git a/._vcs-revno b/._vcs-revno
diff --git a/README.TXT b/README.TXT
@@ -1,16 +1,16 @@
-UNetbootin Source Revision 575
+UNetbootin Source Revision 613
 Copyright Geza Kovacs
 Homepage at http://unetbootin.sourceforge.net
 Licensed under the GNU GPL v2 and above, components from other projects are licensed under their respective licenses
-Build generated on 2012年  4月 28日 土曜日 03:50:55 EDT
+Build generated on Mon Jul 20 01:43:12 PDT 2015
 
 Download using git:
-git clone git://unetbootin.git.sourceforge.net/gitroot/unetbootin
+git clone https://github.com/gkovacs/unetbootin.git
 cd unetbootin
-git checkout 9aecb24137db35061859233f16dd80c037a0cd04
+git checkout cbf30e41bbd2ad57f31feb29c559d6a2046f0d6c
 
 Download using bzr:
-bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r575
+bzr branch http://bazaar.launchpad.net/~vcs-imports/unetbootin/trunk -r613
 
 Build instructions at http://sourceforge.net/apps/trac/unetbootin/wiki/compile
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,44 @@
+unetbootin (613-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Geza Kovacs <[email protected]>  Mon, 20 Jul 2015 02:11:34 -0700
+
+unetbootin (611-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Geza Kovacs <[email protected]>  Sun, 19 Jul 2015 16:00:43 -0700
+
+unetbootin (608-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Geza Kovacs <[email protected]>  Sun, 19 Jul 2015 15:18:37 -0700
+
+unetbootin (603-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Geza Kovacs <[email protected]>  Mon, 21 Apr 2014 21:10:48 -0400
+
+unetbootin (602-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Geza Kovacs <[email protected]>  Mon, 21 Apr 2014 20:42:16 -0400
+
+unetbootin (585-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+   - Bumped Standards-Version to 3.9.4
+   - Added Geza Kovacs to Uploaders
+  * debian/copyright
+   - Corrected copyright header format
+
+ -- Geza Kovacs <[email protected]>  Sun, 25 Aug 2013 16:30:09 -0700
+
 unetbootin (575-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
@@ -2,8 +2,9 @@ Source: unetbootin
 Section: utils
 Priority: optional
 Maintainer: Muneeb Shaikh <[email protected]>
+Uploaders: Geza Kovacs <[email protected]>
 Build-Depends: debhelper (>= 7), libqt4-dev, syslinux
-Standards-Version: 3.9.3
+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
 Homepage: http://unetbootin.sourceforge.net

diff --git a/debian/copyright b/debian/copyright
@@ -4,12 +4,13 @@ Upstream-Contact: Geza Kovacs <[email protected]>
 Source: http://sourceforge.net/projects/unetbootin/files/
 
 Files: *
-Copyright: (C) 2007-2011 Geza Kovacs <[email protected]>
+Copyright: Copyright 2007-2011 Geza Kovacs <[email protected]>
 License: GPL-2+
 
 Files: debian/*
-Copyright: (C) 2008-2011 Eugene V. Lyubimkin <[email protected]>
-Copyright: (C) 2011-2012 Muneeb Shaikh <[email protected]>
+Copyright:
+ Copyright 2008-2011 Eugene V. Lyubimkin <[email protected]>
+ Copyright 2011-2012 Muneeb Shaikh <[email protected]>
 License: GPL-3
 
 License: GPL-2+

diff --git a/distrolst.cpp b/distrolst.cpp
@@ -11,13 +11,20 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 #define debianrelnamereplace \
 	relname \
 	.replace("unstable", "sid") \
-	.replace("testing", "wheezy") \
-	.replace("stable", "squeeze");
+    .replace("testing", "jessie") \
+    .replace("stable", "wheezy");
 #endif
 
 #ifndef ubunturelnamereplace
 #define ubunturelnamereplace \
 	relname \
+    .replace("15.10", "wily") \
+    .replace("15.04", "vivid") \
+    .replace("14.10", "utopic") \
+    .replace("14.04", "trusty") \
+	.replace("13.10", "saucy") \
+	.replace("13.04", "raring") \
+	.replace("12.10", "quantal") \
 	.replace("12.04", "precise") \
 	.replace("11.10", "oneiric") \
 	.replace("11.04", "natty") \
@@ -102,7 +109,7 @@ if (nameDistro == "Elive")
 	, 524288000, 1048576000, QList<QRegExp>() << 
 	QRegExp(".iso$", Qt::CaseInsensitive) << 
 	QRegExp("elive\\S{0,}.iso$", Qt::CaseInsensitive)
-	), isotmpf);
+    ), isotmpf);
 	extractiso(isotmpf);
 }
 
@@ -237,10 +244,26 @@ if (nameDistro == "CentOS")
 	{
 		cpuarch = "i386";
 	}
-	downloadfile(QString("http://isoredirect.centos.org/centos/%1/os/%2/images/pxeboot/vmlinuz").arg(relname, cpuarch), QString("%1ubnkern").arg(targetPath));
-	downloadfile(QString("http://isoredirect.centos.org/centos/%1/os/%2/images/pxeboot/initrd.img").arg(relname, cpuarch), QString("%1ubninit").arg(targetPath));
-	postinstmsg = unetbootin::tr("\n*IMPORTANT* After rebooting, ignore any error messages and select back if prompted for a CD, then go to the main menu, select the 'Start Installation' option, choose 'Network' as the source, choose 'HTTP' as the protocol, enter 'mirrors.kernel.org' when prompted for a server, and enter '/centos/%1/os/%2' when asked for the folder.").arg(nameVersion, cpuarch);
-	kernelOpts = "splash=silent showopts";
+	if (islivecd)
+	{
+		downloadfile(fileFilterNetDir(QStringList() <<
+		QString("http://mirrors.kernel.org/centos/%1/isos/%2/").arg(relname, cpuarch) <<
+		QString("http://mirror.stanford.edu/yum/pub/centos/%1/isos/%2/").arg(relname, cpuarch) <<
+		QString("http://ftp.osuosl.org/pub/centos/%1/isos/%2/").arg(relname, cpuarch) <<
+		QString("http://mirrors.usc.edu/pub/linux/distributions/centos/%1/isos/%2/").arg(relname, cpuarch)
+		, 524288000, 1048576000, QList<QRegExp>() <<
+		QRegExp(".iso$", Qt::CaseInsensitive) <<
+		QRegExp("LiveCD\\S{0,}.iso$", Qt::CaseInsensitive)
+		), isotmpf);
+		extractiso(isotmpf);
+	}
+	else
+	{
+		downloadfile(QString("http://isoredirect.centos.org/centos/%1/os/%2/images/pxeboot/vmlinuz").arg(relname, cpuarch), QString("%1ubnkern").arg(targetPath));
+		downloadfile(QString("http://isoredirect.centos.org/centos/%1/os/%2/images/pxeboot/initrd.img").arg(relname, cpuarch), QString("%1ubninit").arg(targetPath));
+		postinstmsg = unetbootin::tr("\n*IMPORTANT* After rebooting, ignore any error messages and select back if prompted for a CD, then go to the main menu, select the 'Start Installation' option, choose 'Network' as the source, choose 'HTTP' as the protocol, enter 'mirrors.kernel.org' when prompted for a server, and enter '/centos/%1/os/%2' when asked for the folder.").arg(nameVersion, cpuarch);
+		kernelOpts = "splash=silent showopts";
+	}
 }
 
 if (nameDistro == "CloneZilla")
@@ -350,50 +373,41 @@ if (nameDistro == "Elive")
 
 if (nameDistro == "Fedora")
 {
+    QString minorarch = "";
 	if (isarch64)
 	{
 		cpuarch = "x86_64";
+        minorarch = "x86_64";
 	}
 	else
 	{
 		cpuarch = "i386";
+        minorarch = "i686";
 	}
 	if (islivecd)
 	{
-		if (!isarch64)
-		{
-			cpuarch = "i686";
-		}
-		if (relname == "8")
-		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Live/%2/Fedora-%1-Live-%2.iso").arg(relname, cpuarch), isotmpf);
-		}
-		else if (relname == "10")
-		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Live/%2/F%1-%2-Live.iso").arg(relname, cpuarch), isotmpf);
-		}
-		else if (relname == "11" || relname == "12" || relname == "13")
-		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Live/%2/Fedora-%1-%2-Live.iso").arg(relname, cpuarch), isotmpf);
-		}
-		else
-		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Live/%2/Fedora-%1-%2-Live-Desktop.iso").arg(relname, cpuarch), isotmpf);
-		}
-		extractiso(isotmpf);
+        downloadfile(fileFilterNetDir(QStringList() <<
+        "http://download.fedoraproject.org/pub/fedora/linux/releases/"+relname+"/Live/"+cpuarch+"/"
+        , 524288000, 2233125376, QList<QRegExp>() <<
+        QRegExp(".iso$", Qt::CaseInsensitive) <<
+        QRegExp("Fedora", Qt::CaseInsensitive) <<
+        QRegExp("Live", Qt::CaseInsensitive) <<
+        QRegExp("LXDE", Qt::CaseInsensitive)
+        ), isotmpf);
+        extractiso(isotmpf);
 	}
 	else
 	{
 		if (relname == "rawhide")
 		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/development/%1/os/images/pxeboot/vmlinuz").arg(cpuarch), QString("%1ubnkern").arg(targetPath));
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/development/%1/os/images/pxeboot/initrd.img").arg(cpuarch), QString("%1ubninit").arg(targetPath));
+            downloadfile(QString("download.fedoraproject.org/pub/fedora/linux/development/%1/os/images/pxeboot/vmlinuz").arg(cpuarch), QString("%1ubnkern").arg(targetPath));
+            downloadfile(QString("download.fedoraproject.org/pub/fedora/linux/development/%1/os/images/pxeboot/initrd.img").arg(cpuarch), QString("%1ubninit").arg(targetPath));
 			postinstmsg = unetbootin::tr("\n*IMPORTANT* After rebooting, ignore any error messages and select back if prompted for a CD, then go to the main menu, select the 'Start Installation' option, choose 'Network' as the source, choose 'HTTP' as the protocol, enter 'download.fedora.redhat.com' when prompted for a server, and enter '/pub/fedora/linux/development/%1/os' when asked for the folder.").arg(cpuarch);
-		}
+        }
 		else
 		{
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Fedora/%2/os/images/pxeboot/vmlinuz").arg(relname, cpuarch), QString("%1ubnkern").arg(targetPath));
-			downloadfile(QString("http://download.fedora.redhat.com/pub/fedora/linux/releases/%1/Fedora/%2/os/images/pxeboot/initrd.img").arg(relname, cpuarch), QString("%1ubninit").arg(targetPath));
+            downloadfile(QString("http://download.fedoraproject.org/pub/fedora/linux/releases/%1/Fedora/%2/os/images/pxeboot/vmlinuz").arg(relname, cpuarch), QString("%1ubnkern").arg(targetPath));
+            downloadfile(QString("http://download.fedoraproject.org/pub/fedora/linux/releases/%1/Fedora/%2/os/images/pxeboot/initrd.img").arg(relname, cpuarch), QString("%1ubninit").arg(targetPath));
 			postinstmsg = unetbootin::tr("\n*IMPORTANT* After rebooting, ignore any error messages and select back if prompted for a CD, then go to the main menu, select the 'Start Installation' option, choose 'Network' as the source, choose 'HTTP' as the protocol, enter 'download.fedora.redhat.com' when prompted for a server, and enter '/pub/fedora/linux/releases/%1/Fedora/%2/os' when asked for the folder.").arg(relname, cpuarch);
 		}
 		kernelOpts = "splash=silent showopts";
@@ -572,37 +586,20 @@ if (nameDistro == "LinuxConsole")
 
 if (nameDistro == "Linux Mint")
 {
-	if (relname == "9" || relname == "10")
-	{
-		if (isarch64)
-		{
-			cpuarch = "amd64";
-		}
-		else
-		{
-			cpuarch = "i386";
-		}
-	}
+    if (isarch64)
+    {
+        cpuarch = "64";
+    }
 	else
-	{
-		if (isarch64)
-		{
-			cpuarch = "-x64";
-		}
-		else
-		{
-			cpuarch = "";
-		}
+    {
+        cpuarch = "32";
 	}
 	QList<QRegExp> mintregex = QList<QRegExp>() <<
 		QRegExp(".iso$", Qt::CaseInsensitive) <<
 		QRegExp("linuxmint", Qt::CaseInsensitive) <<
-		QRegExp(cpuarch, Qt::CaseInsensitive);
-	if (relname == "9" || relname == "10")
-	{
-		mintregex.append(QRegExp("cd", Qt::CaseInsensitive));
-		mintregex.append(QRegExp("gnome", Qt::CaseInsensitive));
-	}
+        QRegExp(cpuarch, Qt::CaseInsensitive) <<
+        QRegExp("^((?!nocodecs).)*$", Qt::CaseInsensitive) <<
+        QRegExp("cinnamon", Qt::CaseInsensitive);
 	downloadfile(fileFilterNetDir(QStringList() <<
 	QString("http://ftp.heanet.ie/pub/linuxmint.com/stable/%1/").arg(relname) <<
 	QString("http://mira.sunsite.utk.edu/linuxmint/stable/%1/").arg(relname) <<
@@ -794,25 +791,7 @@ if (nameDistro == "Parted Magic")
 	}
 	else
 	{
-		if (isarch64)
-		{
-			cpuarch = "x86_64";
-		}
-		else
-		{
-			cpuarch = "i\\d86";
-		}
-		downloadfile(fileFilterNetDir(QStringList() << 
-		"http://exo.enarel.eu/mirror/partedmagic/" << 
-		"http://fulloffacts.com/get/partedmagic/" <<
-		"http://www.digitalincursion.net/partedmagic/"
-		, 10485760, 209715200, QList<QRegExp>() << 
-		QRegExp("^pmagic", Qt::CaseInsensitive) << 
-		QRegExp(cpuarch, Qt::CaseInsensitive) <<
-		QRegExp(".iso.zip$", Qt::CaseInsensitive) << 
-		QRegExp("\\d.iso.zip$", Qt::CaseInsensitive) << 
-		QRegExp("^pmagic-\\d", Qt::CaseInsensitive)
-		), isotmpf);
+        downloadfile("http://partedmagic.com/partedmagic-latest.iso", isotmpf);
 		extractiso(isotmpf);
 	}
 }