Fix conflicts

4 files changed, 1 insertions, 32 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index fb03b6cc24b9..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgbase = peazip-qt-build
-	pkgdesc = Free cross-platform file archiver (compiles from source)
-	pkgver = 5.5.3
-	pkgrel = 2
-	url = http://peazip.org
-	arch = i686
-	arch = x86_64
-	license = GPL3
-	makedepends = lazarus-qt
-	makedepends = icoutils
-	depends = qt4pas
-	provides = peazip-qt
-	conflicts = peazip-qt
-	source = http://sourceforge.net/projects/peazip/files/5.5.3/peazip-5.5.3.src.zip
-	source = peazip.desktop
-	source = altconf.txt
-
-pkgname = peazip-qt-build
-
diff --git a/PKGBUILD b/PKGBUILD
index 6ca7ab6a0184..f2ea91d68cbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
 depends=('qt4pas')
 makedepends=('lazarus-qt' 'icoutils')
 provides=('peazip')
-conflicts=('peazip''peazip-gtk2' 'peazip-qt')
+conflicts=('peazip' 'peazip-gtk2' 'peazip-qt')
 install=peazip.install
 source=("https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.src.zip"
         "https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip_portable-$pkgver.LINUX.Qt.tar.gz")
diff --git a/altconf.txt b/altconf.txt
deleted file mode 100644
index dec562eac4c0..000000000000
--- a/altconf.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[alternative configuration's path: specify a location for bookmarks.txt, conf.txt and rnd (either absolute or relative path, use " and ' if needed); write "same" to use this path, "appdata" to use user's application data or home path]
-appdata
diff --git a/peazip.desktop b/peazip.desktop
deleted file mode 100644
index 80ad9cfacc3b..000000000000
--- a/peazip.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Peazip
-Comment=Archiver utility
-Exec=peazip
-Icon=peazip
-Terminal=false
-StartupNotify=false
-Categories=Application;Utility;