summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--.gitignore5
-rw-r--r--Makefile16
-rw-r--r--PKGBUILD2
-rw-r--r--PKGBUILD.in5
5 files changed, 13 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef19afa6542b..3d4e96586a39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = quassel
makedepends = qt5-tools
makedepends = qt5-webengine
makedepends = boost
+ makedepends = rsync
source = git+https://github.com/quassel/quassel.git
source = git+https://github.com/quassel/quassel-i18n.git
md5sums = SKIP
diff --git a/.gitignore b/.gitignore
index 1d65adf6de3a..0d18191c0cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
*
-!PKGBUILD
+!.gitignore
!.SRCINFO
+!Makefile
+!PKGBUILD
+!PKGBUILD.in
diff --git a/Makefile b/Makefile
index cee64797ac13..d64d9e3fb2ec 100644
--- a/Makefile
+++ b/Makefile
@@ -4,21 +4,15 @@ PKG:=$(lastword $(subst /, ,$(dir $(abspath $(lastword $(MAKEFILE_LIST))))))
all: src
-clean:
- rm -rf .SRCINFO \
- ${PKG}.git \
- PKGBUILD \
- src
+clean: .SRCINFO ${PKG}.git PKGBUILD src
+ rm -Rf $^
upload: .${PKG}.git .SRCINFO
- rm -f .git
- ln -s $</.git .
- git commit -am 'bump'
- git push origin master
- rm .git
+ GIT_DIR=$< GIT_WORK_TREE=$(@D) git commit -a
+ GIT_DIR=$< GIT_WORK_TREE=$(@D) git push origin master
.%.git:
- git clone ssh://aur@aur.archlinux.org/$* $@
+ git clone --bare ssh://aur@aur.archlinux.org/$* $@
src: PKGBUILD
makepkg -do
diff --git a/PKGBUILD b/PKGBUILD
index 70d16c2e0dda..4ba5df58dd45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ license=('GPL')
arch=('i686' 'x86_64' 'arm' 'aarch64')
makedepends=('git' 'cmake' 'extra-cmake-modules' 'hicolor-icon-theme'
'knotifyconfig5' 'python' 'qca-qt5' 'qt5-base' 'qt5-script'
- 'qt5-tools' 'qt5-webengine' 'boost')
+ 'qt5-tools' 'qt5-webengine' 'boost' 'rsync')
source=(
'git+https://github.com/quassel/quassel.git'
'git+https://github.com/quassel/quassel-i18n.git'
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 70cc35fcbc62..22ab2041d134 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -16,13 +16,13 @@ pkgname=("${pkgbase}-git"
)
pkgver=0
-pkgrel=1
+pkgrel=6
url='http://quassel-irc.org'
license=('GPL')
arch=('i686' 'x86_64' 'arm' 'aarch64')
makedepends=('git' 'cmake' 'extra-cmake-modules' 'hicolor-icon-theme'
'knotifyconfig5' 'python' 'qca-qt5' 'qt5-base' 'qt5-script'
- 'qt5-tools' 'qt5-webengine' 'boost')
+ 'qt5-tools' 'qt5-webengine' 'boost' 'rsync')
source=(
'git+https://github.com/quassel/quassel.git'
'git+https://github.com/quassel/quassel-i18n.git'
@@ -94,7 +94,6 @@ prepare() {
}
pkgver() {
- #git describe --always | sed 's/-beta/.0.beta/; s/-/./g;'
git -C "${srcdir}/${pkgbase}" describe --always |
sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
}