Point to real upstream, after issue fixes were merged

3 files changed, 11 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a4ebee2af57..85cb6582fabc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = epfl-scripts-git
-	pkgdesc = Collection of scripts for simplifying one's life at the EPFL
-	pkgver = r47.b0979bf
+	pkgdesc = Collection of scripts for simplifying one's life at EPFL
+	pkgver = r50.46ba816
 	pkgrel = 1
-	url = https://gitlab.gnugen.ch/mtweber/epfl-scripts
+	url = https://gitlab.gnugen.ch/gnugen/epfl-scripts
 	changelog = changelog
 	arch = any
 	license = Apache
 	depends = coreutils
 	provides = epfl-scripts
 	conflicts = epfl-scripts
-	source = git+https://gitlab.gnugen.ch/mtweber/epfl-scripts.git
+	source = git+https://gitlab.gnugen.ch/gnugen/epfl-scripts.git
 	md5sums = SKIP
 
 pkgname = epfl-scripts-git
diff --git a/PKGBUILD b/PKGBUILD
index 3184cde5b0dd..1dd9a980f921 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
 
 pkgname=epfl-scripts-git
 _pkgname=epfl-scripts
-pkgver=r47.b0979bf
+pkgver=r50.46ba816
 pkgrel=1
-pkgdesc="Collection of scripts for simplifying one's life at the EPFL"
+pkgdesc="Collection of scripts for simplifying one's life at EPFL"
 arch=('any')
-url='https://gitlab.gnugen.ch/mtweber/epfl-scripts'
+url='https://gitlab.gnugen.ch/gnugen/epfl-scripts'
 license=('Apache')
 provides=(epfl-scripts)
 conflicts=(epfl-scripts)
 depends=(coreutils)
 changelog='changelog'
-source=('git+https://gitlab.gnugen.ch/mtweber/epfl-scripts.git')
+source=('git+https://gitlab.gnugen.ch/gnugen/epfl-scripts.git')
 md5sums=('SKIP')
 
 pkgver() {
diff --git a/changelog b/changelog
index dc6462a6e1e7..8ed3c8cf6be9 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+2017-09-24  Tinu Weber  <martin.weber@epfl.ch>
+	* epfl-scripts-git: Update for upstream merge (no new features downstream)
+
 2017-06-21  Tinu Weber  <martin.weber@epfl.ch>
 	* epfl-scripts-git: Add changelog