Update version scheme, optdepends descriptions, and use HTTPS.

2 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ba6b482a3e7..e3307fa18c37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec  7 11:34:41 UTC 2017
+# Sat Jan  6 01:05:02 UTC 2018
 pkgbase = gajim-git
 	pkgdesc = Jabber/XMPP instant messenger client written in Python with GTK+
-	pkgver = r14929.94893191e
+	pkgver = 1.0.0.alpha2.r41.g8b2732cf1
 	pkgrel = 1
 	url = https://gajim.org/
 	arch = any
@@ -17,26 +17,26 @@ pkgbase = gajim-git
 	depends = python-cairo
 	depends = libsecret
 	depends = python-distro
-	optdepends = python-dbus: dbus support
+	optdepends = python-dbus: for gajim-remote and zeroconf support
 	optdepends = farstream: for video/voice support
 	optdepends = gst-plugins-bad: for video/voice support
 	optdepends = gst-python: for video/voice support
 	optdepends = gspell: for spell checking support
-	optdepends = libxss: for idle module
-	optdepends = notification-daemon: for desktop notification
-	optdepends = gnome-keyring: to store passwords encrypted in GNOME Keyring
-	optdepends = kded: to store passwords encrypted in KSecretService
+	optdepends = libxss: for idle time checking on X11
+	optdepends = notification-daemon: for desktop notifications
+	optdepends = gnome-keyring: store passwords encrypted in GNOME Keyring
+	optdepends = kded: store passwords encrypted in KSecretService
 	optdepends = python-crypto: support for E2E encryption
 	optdepends = python-docutils: for RST generator support
 	optdepends = gupnp-igd: for UPnP-IGD support
 	optdepends = geoclue2: for sharing your location
-	provides = gajim=0.17
+	provides = gajim
 	conflicts = gajim
 	conflicts = gajim-hg
 	conflicts = gajim-svn
 	replaces = gajim-hg
 	replaces = gajim-svn
-	source = gajim::git+http://dev.gajim.org/gajim/gajim
+	source = gajim::git+https://dev.gajim.org/gajim/gajim
 	md5sums = SKIP
 
 pkgname = gajim-git
diff --git a/PKGBUILD b/PKGBUILD
index ace42dc948a9..ba56eaa85332 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 _name=gajim
 pkgname="$_name-git"
-pkgver=r14929.94893191e
+pkgver=1.0.0.alpha2.r41.g8b2732cf1
 pkgrel=1
 pkgdesc="Jabber/XMPP instant messenger client written in Python with GTK+"
 arch=('any')
@@ -18,31 +18,31 @@ depends=('python-gobject' 'python-pyopenssl' 'hicolor-icon-theme'
          'python-pyasn1' 'python-nbxmpp-git' 'python-cairo' 'libsecret'
          'python-distro')
 makedepends=('git' 'python-setuptools')
-optdepends=('python-dbus: dbus support'
+optdepends=('python-dbus: for gajim-remote and zeroconf support'
             'farstream: for video/voice support'
             'gst-plugins-bad: for video/voice support'
             'gst-python: for video/voice support'
             'gspell: for spell checking support'
-            'libxss: for idle module'
-            'notification-daemon: for desktop notification'
-            'gnome-keyring: to store passwords encrypted in GNOME Keyring'
-            'kded: to store passwords encrypted in KSecretService'
+            'libxss: for idle time checking on X11'
+            'notification-daemon: for desktop notifications'
+            'gnome-keyring: store passwords encrypted in GNOME Keyring'
+            'kded: store passwords encrypted in KSecretService'
             'python-crypto: support for E2E encryption'
             'python-docutils: for RST generator support'
             'gupnp-igd: for UPnP-IGD support'
             'geoclue2: for sharing your location')
-provides=('gajim=0.17')
+provides=('gajim')
 conflicts=('gajim' 'gajim-hg' 'gajim-svn')
 replaces=('gajim-hg' 'gajim-svn')
-source=("$_name::git+http://dev.gajim.org/gajim/gajim")
+source=("$_name::git+https://dev.gajim.org/gajim/gajim")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_name"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd $_name
+  git describe --long --tags | sed 's/^gajim-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-  cd "$srcdir/$_name"
+  cd $_name
   python setup.py install --root="$pkgdir/" --optimize=1
 }