general sprucing up

2 files changed, 10 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf347b8edabb..2465ea2c870c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = filezilla-server
 	pkgdesc = A simple FTP, FTPS or SFTP server for ArchLinux.
 	pkgver = 1.5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://filezilla-project.org/download.php?type=server
 	arch = x86_64
-	license = unknown
-	depends = vim
+	license = GPL3
 	optdepends = firefox
 	options = !strip
-	source = https://dl3.cdn.filezilla-project.org/server/FileZilla_Server_1.5.1_x86_64-linux-gnu.deb
+	source = https://download.filezilla-project.org/server/FileZilla_Server_1.5.1_x86_64-linux-gnu.deb
 	sha256sums = 236066c83aea912eeebee3dd794c57389e6d0ee23a5bd8619dee387b88f89fc0
 
 pkgname = filezilla-server
diff --git a/PKGBUILD b/PKGBUILD
index 15d74964c6e6..3e6823697ac9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,19 @@
 
 pkgname=filezilla-server
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple FTP, FTPS or SFTP server for ArchLinux."
 arch=('x86_64')
 url="https://filezilla-project.org/download.php?type=server"
-license=('unknown')
-depends=('vim')
-optdepends=(
-firefox
-)
+license=('GPL3')
+depends=()
+optdepends=('firefox')
 
 options=(!strip)
 
-_debname=FileZilla_Server_1.5.1_x86_64-linux-gnu.deb
+_debname=FileZilla_Server_${pkgver}_x86_64-linux-gnu.deb
 
-source=(https://dl3.cdn.filezilla-project.org/server/FileZilla_Server_1.5.1_x86_64-linux-gnu.deb)
+source=(https://download.filezilla-project.org/server/FileZilla_Server_${pkgver}_x86_64-linux-gnu.deb)
 sha256sums=('236066c83aea912eeebee3dd794c57389e6d0ee23a5bd8619dee387b88f89fc0')
 
 prepare() {
@@ -24,14 +22,9 @@ prepare() {
   msg2 "Decompressing Debian package..."
   ar xv "${_debname}" > /dev/null
   tar -xf data.tar.xz > /dev/null
-
-  #find ./{etc,usr} -type d -exec chmod 755 '{}' \;
-  find ./usr -type d -exec chmod 755 '{}' \;
-  chmod 755 ./usr/local/bin/filezilla/filezilla-server
 }
 
 package() {
   cd "$srcdir"
-  #cp -dpr --no-preserve=ownership {opt,usr} "$pkgdir"
-  cp -dpr --no-preserve=ownership ./usr "$pkgdir"
+  cp -dpr --no-preserve=ownership {etc,opt,usr} "$pkgdir"
 }