From a934fa46bbf3e98e7ae3ff6b40c3bfee93fa1378 Mon Sep 17 00:00:00 2001
From: Yuval Adam <yuval@y3xz.com>
Date: Sun, 13 Mar 2016 13:17:29 +0200
Subject: Bump tails-installer to v4.4.8

Remove syslinux paths patch since it was merged upstream
---
 .SRCINFO                 | 14 ++++++++------
 0001-syslinux-path.patch | 34 ----------------------------------
 PKGBUILD                 | 17 +++++------------
 3 files changed, 13 insertions(+), 52 deletions(-)
 delete mode 100644 0001-syslinux-path.patch

diff --git a/.SRCINFO b/.SRCINFO
index 8db42f9..e73a761 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Feb 16 09:29:31 UTC 2016
+# Sun Mar 13 11:16:46 UTC 2016
 pkgbase = tails-installer
 	pkgdesc = Installer for the Tails live operating system
-	pkgver = 4.4.7
-	pkgrel = 2
+	pkgver = 4.4.8
+	pkgrel = 1
 	url = https://tails.boum.org/
 	arch = x86_64
 	arch = i686
@@ -15,15 +15,17 @@ pkgbase = tails-installer
 	depends = e2fsprogs
 	depends = gptfdisk
 	depends = gtk3
+	depends = mtools
 	depends = p7zip
+	depends = parted
 	depends = python2-configobj
+	depends = python2-distutils-extra
+	depends = python2-gobject
 	depends = syslinux
 	depends = udisks2
 	depends = urlgrabber
-	source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.7
-	source = 0001-syslinux-path.patch
+	source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.8
 	sha256sums = SKIP
-	sha256sums = 9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27
 
 pkgname = tails-installer
 
diff --git a/0001-syslinux-path.patch b/0001-syslinux-path.patch
deleted file mode 100644
index 628c507..0000000
--- a/0001-syslinux-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65a2b31fa89ff27251ae30ad3bb3a22d4ef6dff0 Mon Sep 17 00:00:00 2001
-From: Yuval Adam <yuval@y3xz.com>
-Date: Mon, 15 Feb 2016 23:08:00 +0200
-Subject: [PATCH] Add additional syslinux paths
-
-This path exists on Arch Linux systems, and since liveusb-creator is now
-packaged for Arch we should probably add it
----
- tails_installer/creator.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tails_installer/creator.py b/tails_installer/creator.py
-index 38ec961..4683c3c 100755
---- a/tails_installer/creator.py
-+++ b/tails_installer/creator.py
-@@ -997,6 +997,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
-             for com32mod in com32modules:
-                 copied = False
-                 for orig_dir in ('/usr/lib/syslinux/modules/bios',
-+                                 '/usr/lib/syslinux/bios',
-                                  '/usr/share/syslinux',
-                                  '/usr/lib/syslinux'):
-                     com32path = os.path.join(orig_dir, com32mod)
-@@ -1227,6 +1228,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
-             for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin',
-                             '/usr/lib/SYSLINUX/gptmbr.bin',
-                             '/usr/lib/syslinux/gptmbr.bin',
-+                            '/usr/lib/syslinux/bios/gptmbr.bin',
-                             '/usr/share/syslinux/gptmbr.bin'):
-                 if os.path.exists(mbr_bin):
-                     return mbr_bin
--- 
-2.7.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 1356d65..973739b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,20 @@
 # Maintainer: Yuval Adam <yuval at y3xz dot com> PGP-Key: 271386AA2EB7672F
 
 pkgname=tails-installer
-pkgver=4.4.7
-pkgrel=2
+pkgver=4.4.8
+pkgrel=1
 pkgdesc="Installer for the Tails live operating system"
 arch=('x86_64' 'i686')
 url="https://tails.boum.org/"
 license=(GPL)
-depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'p7zip' 'python2-configobj' 'syslinux' 'udisks2' 'urlgrabber')
+depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'mtools' 'p7zip' 'parted' 'python2-configobj' 'python2-distutils-extra' 'python2-gobject' 'syslinux' 'udisks2' 'urlgrabber')
 makedepends=('git')
-source=(
-  "git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}"
-  "0001-syslinux-path.patch"
-)
-sha256sums=(
-  'SKIP'
-  '9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27'
-)
+source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}")
+sha256sums=('SKIP')
 _pkgname=liveusb-creator
 
 prepare() {
   cd "${srcdir}/${_pkgname}"
-  patch -p1 -i "${srcdir}/0001-syslinux-path.patch"
 }
 
 package() {
-- 
cgit v1.3.1