summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeshav Amburay2015-10-31 19:31:39 -0400
committerKeshav Amburay2015-10-31 19:31:39 -0400
commit651409d134ec4bbd0ca667ff95633e2e7b9343d4 (patch)
treed5a7f9377c3f4127c9a58bd8d7caf7e16101903a
parentae43e188443eaeffd3b59970be3f1a219d23636f (diff)
downloadaur-651409d134ec4bbd0ca667ff95633e2e7b9343d4.tar.gz
Switch to git development branch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4236f351721b..4c7347c05c6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xournalpp-git
pkgdesc = C++ re-write of tablet notetaking app Xournal - GIT string_new branch
- pkgver = 1.0.0.290.gb62f922
+ pkgver = 1.0.0.303.gd162281
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
@@ -19,14 +19,14 @@ pkgbase = xournalpp-git
depends = glibmm
depends = texlive-bin
depends = desktop-file-utils
- provides = xournal=1.0.0.290.gb62f922
- provides = xournal-dmgerman=1.0.0.290.gb62f922 xournalpp=1.0.0.290.gb62f922
+ provides = xournal=1.0.0.303.gd162281
+ provides = xournal-dmgerman=1.0.0.303.gd162281 xournalpp=1.0.0.303.gd162281
conflicts = xournal
conflicts = xournalpp
conflicts = xournal-dmgerman
conflicts = xournal-image-patched
conflicts = xournalpp-svn
- source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=string_new
+ source = xournalpp::git+https://github.com/xournalpp/xournalpp.git#branch=development
sha1sums = SKIP
pkgname = xournalpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 6354202db741..28909444a403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.0.290.gb62f922
+pkgver=1.0.0.303.gd162281
pkgrel=1
pkgdesc="C++ re-write of tablet notetaking app Xournal - GIT string_new branch"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('gtk2' 'boost-libs' 'glib2' 'libglade' 'poppler-glib' 'glibmm' 'texlive
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=string_new")
+source=("${_pkgname}::git+https://github.com/xournalpp/xournalpp.git#branch=development")
sha1sums=('SKIP')
pkgver() {