summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorquininer kel2016-12-18 20:00:58 +0800
committerquininer kel2016-12-18 20:01:37 +0800
commit3326852120505fa8b23d9c81ce9cea174ad57cdd (patch)
treeacfb1676dc0d581d812e55a1777a773b894cf691
parentdc7b62bd260168ae633c3fc7c7f401d61be54758 (diff)
downloadaur-3326852120505fa8b23d9c81ce9cea174ad57cdd.tar.gz
switch to master
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD6
2 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f73db00af093..7ccce7cc8e3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Nov 30 16:22:27 UTC 2016
+# Sun Dec 18 12:01:35 UTC 2016
pkgbase = xournalpp-git
- pkgdesc = C++ re-write of tablet notetaking app Xournal - GIT development branch
- pkgver = 1.0.0.328.gbb3c205
+ pkgdesc = C++ re-write of tablet notetaking app Xournal
+ pkgver = 1.0.0.333.g38d235d
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
@@ -20,14 +20,14 @@ pkgbase = xournalpp-git
depends = poppler-glib
depends = glibmm
depends = desktop-file-utils
- provides = xournal=1.0.0.328.gbb3c205
- provides = xournal-dmgerman=1.0.0.328.gbb3c205 xournalpp=1.0.0.328.gbb3c205
+ provides = xournal=1.0.0.333.g38d235d
+ provides = xournal-dmgerman=1.0.0.333.g38d235d xournalpp=1.0.0.333.g38d235d
conflicts = xournal
conflicts = xournalpp
conflicts = xournal-dmgerman
conflicts = xournal-image-patched
conflicts = xournalpp-svn
- source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=development
+ source = xournalpp::git+https://github.com/xournalpp/xournalpp.git
sha256sums = SKIP
pkgname = xournalpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 98e6daefa679..e4342af7c18b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.328.gbb3c205
+pkgver=1.0.0.333.g38d235d
pkgrel=1
-pkgdesc="C++ re-write of tablet notetaking app Xournal - GIT development branch"
+pkgdesc="C++ re-write of tablet notetaking app Xournal"
arch=('i686' 'x86_64')
url="https://github.com/xournalpp/xournalpp"
license=('GPL3')
@@ -14,7 +14,7 @@ depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'desktop
provides=("xournal=${pkgver}" "xournal-dmgerman=${pkgver} xournalpp=${pkgver}")
conflicts=('xournal' 'xournalpp' 'xournal-dmgerman' 'xournal-image-patched' 'xournalpp-svn')
install="xournalpp.install"
-source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=development")
+source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git")
sha256sums=('SKIP')
pkgver() {