Merge

2 files changed, 21 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f353d46baa82..247ec4a92e78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Feb 10 18:54:06 UTC 2016
 pkgbase = percolator-bin
 	pkgdesc = Software for postprocessing of shotgun proteomics data + format converters + Elude tool
-	pkgver = 2.08.01
+	pkgver = 2.10
 	pkgrel = 1
 	url = http://per-colator.com/
 	arch = x86_64
@@ -8,22 +10,21 @@ pkgbase = percolator-bin
 	depends = gcc-libs
 	provides = percolator
 	conflicts = percolator-git
-	noextract = percolator-2-08-01-amd64.deb
-	noextract = percolator-converters-2-08-01-amd64.deb
-	noextract = elude-2-08-01-amd64.deb
-	source = percolator-2-08-01-amd64.deb::http://sourceforge.net/projects/percolator/files/v2-08-01/percolator-v2-08-01-linux-amd64.deb/download
-	source = percolator-converters-2-08-01-amd64.deb::http://sourceforge.net/projects/percolator/files/v2-08-01/percolator-converters-v2-08-01-linux-amd64.deb/download
-	source = elude-2-08-01-amd64.deb::http://sourceforge.net/projects/percolator/files/v2-08-01/elude-v2-08-01-linux-amd64.deb/download
-	md5sums = 734847fcc956adf81705400ce5dac48d
-	md5sums = 30a19985fbd2fb2962d836aa8c4e7a8c
-	md5sums = 116fa76bc81fddcfef63871516fdf4b1
+	source = https://github.com/percolator/percolator/releases/download/rel-2-10/ubuntu64.tar.gz
+	md5sums = ff9ec3b71587958697909d6954098700
 
 pkgname = percolator
 	pkgdesc = Percolator and qvality, two post processors for shotgun proteomics data.
+	provides = percolator
+	conflicts = percolator
 
 pkgname = percolator-converters
 	pkgdesc = Parsers of different database search engines to percolator input format.
+	provides = 
+	conflicts = 
 
 pkgname = elude
 	pkgdesc = Software package for prediction of retention times in mass spectorometry experiments.
+	provides = 
+	conflicts = 
 
diff --git a/PKGBUILD b/PKGBUILD
index ef331312b283..63c554e6d96a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Lev Levitsky <levlev@mail.ru>
-pkgbase=('percolator-bin')
+pkgbase='percolator-bin'
 pkgname=('percolator' 'percolator-converters' 'elude')
 pkgver=2.10
 pkgrel=1
@@ -15,18 +15,24 @@ source=("https://github.com/percolator/percolator/releases/download/rel-${pkgver
 md5sums=('ff9ec3b71587958697909d6954098700')
 package_percolator() {
 	pkgdesc="Percolator and qvality, two post processors for shotgun proteomics data."
-	ar x "${srcdir}/percolator-v${pkgver/./-}-linux-amd64.deb"
+	provides=("${pkgname[0]}")
+	conflicts=("${pkgname[0]}")
+	ar x "${srcdir}/${pkgname[0]}-v${pkgver/./-}-linux-amd64.deb"
 	tar -xzf "${srcdir}/data.tar.gz" -C "$pkgdir"
 }
 
 package_percolator-converters() {
 	pkgdesc="Parsers of different database search engines to percolator input format."
-	ar x "${srcdir}/percolator-converters-v${pkgver/./-}-linux-amd64.deb"
+	provides=("${pkgname[1]}")
+	conflicts=("${pkgname[1]}")
+	ar x "${srcdir}/${pkgname[1]}-v${pkgver/./-}-linux-amd64.deb"
 	tar -xzf "${srcdir}/data.tar.gz" -C "$pkgdir"
 }
 
 package_elude() {
 	pkgdesc="Software package for prediction of retention times in mass spectorometry experiments."
-	ar x "${srcdir}/elude-v${pkgver/./-}-linux-amd64.deb"
+	provides=("${pkgname[2]}")
+	conflicts=("${pkgname[2]}")
+	ar x "${srcdir}/${pkgname[2]}-v${pkgver/./-}-linux-amd64.deb"
 	tar -xzf "${srcdir}/data.tar.gz" -C "$pkgdir"
 }