Version bump to 1.0beta (at current fixed git commit until a release is tagged).

3 files changed, 60 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 503965700f5d..efa893973484 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,32 @@
-# Generated by mksrcinfo v8
-# Sat Feb 17 02:59:36 UTC 2018
 pkgbase = dockbarx
 	pkgdesc = TaskBar with groupping and group manipulation
-	pkgver = 0.93
+	pkgver = 1.0beta+r820+4a5b382
 	pkgrel = 1
 	url = https://github.com/M7S/dockbarx
-	arch = i686
+	install = dockbarx.install
+	arch = i688
 	arch = x86_64
+	arch = armv7h
+	arch = aarch64
 	license = GPL3
-	depends = python2-wnck
-	depends = pygtk
-	depends = python2-xdg
-	depends = python2-dbus
-	depends = python2-numpy
-	depends = python2-pillow
-	depends = python2-keybinder2
-	depends = hicolor-icon-theme
-	depends = python2-xlib
-	depends = python2-gconf
-	depends = python2-six
-	optdepends = avant-window-navigator: AWN DockBarX Plugin
-	optdepends = xfce4-dockbarx-plugin: Xfce4 Panel Plugin
+	makedepends = python-setuptools
+	makedepends = python-polib
+	makedepends = git
+	depends = libkeybinder3
+	depends = python-cairo
+	depends = python-dbus
+	depends = python-gobject
+	depends = python-pillow
+	depends = python-xlib
+	depends = python-xdg
+	optdepends = mate-panel: mate applet
 	optdepends = zeitgeist: recently used file list
-	optdepends = compiz-fusion-plugins-main: opacify plugin
-	optdepends = dockmanager: dockmanager plugins
-	optdepends = cardapio-bzr: required to run menu applet for dockx (standalone dock)
-	conflicts = dockbarx-git
-	source = dockbarx-0.93.tar.gz::https://github.com/M7S/dockbarx/archive/0.93.tar.gz
-	sha256sums = 3f81b39d051c8b961df32e883069276dca10d84bae997b18f7938b004a3577e2
+	optdepends = xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin
+	optdepends = python-pyudev: dockx battery applet
+	optdepends = gconf: export settings from older versions of dockbarx
+	optdepends = python-lxml: import settings script
+	source = dockbarx::git+https://github.com/M7S/dockbarx.git#commit=4a5b382f03402e58cbbaaeb2ee3be4fbbb795aba
+	sha256sums = SKIP
 
 pkgname = dockbarx
 
diff --git a/PKGBUILD b/PKGBUILD
index 7df4cb5fe5cf..f9a1c2855177 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,35 @@
-# Maintainer: twa022 <twa022 at gmail dot com>
-# Contributor: rayman2200 
+# Contributor: twa022 <twa022 at gmail dot com>
 
 pkgname=dockbarx
-pkgver=0.93
+_pkgver=1.0beta
+pkgver=1.0beta+r820+4a5b382
 pkgrel=1
 pkgdesc="TaskBar with groupping and group manipulation"
-arch=('i686' 'x86_64')
+arch=('i688' 'x86_64' 'armv7h' 'aarch64')
 url="https://github.com/M7S/dockbarx"
 license=('GPL3')
-depends=('python2-wnck' 'pygtk' 'python2-xdg' 'python2-dbus' 'python2-numpy' 
-         'python2-pillow' 'python2-keybinder2' 'hicolor-icon-theme' 'python2-xlib'
-         'python2-gconf' 'python2-six')
-optdepends=('avant-window-navigator: AWN DockBarX Plugin'
-            'xfce4-dockbarx-plugin: Xfce4 Panel Plugin'
+depends=('libkeybinder3' 'python-cairo' 'python-dbus' 'python-gobject' 'python-pillow'
+         'python-xlib' 'python-xdg')
+makedepends=('python-setuptools' 'python-polib' 'git')
+optdepends=('mate-panel: mate applet'
             'zeitgeist: recently used file list'
-            'compiz-fusion-plugins-main: opacify plugin'
-            'dockmanager: dockmanager plugins'
-            'cardapio-bzr: required to run menu applet for dockx (standalone dock)')
-conflicts=('dockbarx-git')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/M7S/dockbarx/archive/${pkgver}.tar.gz")
-sha256sums=('3f81b39d051c8b961df32e883069276dca10d84bae997b18f7938b004a3577e2')
+            'xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin'
+            'python-pyudev: dockx battery applet'
+            'gconf: export settings from older versions of dockbarx'
+            'python-lxml: import settings script')
+_commit='4a5b382f03402e58cbbaaeb2ee3be4fbbb795aba'
+source=("${pkgname}::git+https://github.com/M7S/dockbarx.git#commit=${_commit}")
+sha256sums=('SKIP')
+install="${pkgname}.install"
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  python2 setup.py install --root "${pkgdir}"
-
-  mkdir -p "${pkgdir}"/usr/share/avant-window-navigator/applets
-  cp -r AWN/* "${pkgdir}"/usr/share/avant-window-navigator/applets
-  
-  mkdir -p "${pkgdir}"/usr/share/pixmaps
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
+pkgver() {
+  cd "${srcdir}/${pkgname}"
+  printf "%s+r%s+%s" "${_pkgver}" "$( git rev-list --count HEAD )" "$( git rev-parse --short HEAD )"
+}
 
-  sed -i 's:^Categories=.*:Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;:' "${pkgdir}"/usr/share/applications/dbx_preference.desktop
-  sed -i 's:\(/usr/bin/python\)\([^2]\):\12\2:' "${pkgdir}"/usr/bin/{dockbarx_factory,dbx_preference,dockx}
+package() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py install --root "${pkgdir}" --optimize=1
 
+  install -Dm644 "${srcdir}/${pkgname}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
 }
diff --git a/dockbarx.install b/dockbarx.install
new file mode 100644
index 000000000000..e145edef1032
--- /dev/null
+++ b/dockbarx.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  echo "In version 1.0beta configuration is moved from gconf"
+  echo "to gsettings. To migrate your settings you will need to "
+  echo "have the optional dependencies 'gconf' and 'python-lxml' installed."
+  echo 
+  echo "Dump the preferences from GConf: "
+  echo "\$ gconftool --dump /apps/dockbarx > dockbarx.xml"
+  echo 
+  echo "Run the migration tool: "
+  echo "\$ dbx_migrate_settings dockbarx.xml"
+  echo ""
+  echo "Move your application folder: "
+  echo "\$ mv ~/.dockbarx ~/.local/share/dockbarx "
+}