From 8135313396f590c97a5f1e6e39a55a820c831448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Sat, 4 May 2019 14:52:00 +0200
Subject: [PATCH] post-merge: undo version changes

---
 PKGBUILD              | 6 +++---
 PKGBUILD.wayland-only | 6 +++---
 meson.build           | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 5501465..49fdf0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,9 @@ depends=(
 optdepends=('xcb-util-errors: better X error messages')
 source=()
 
-# pkgver() {
-#   git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-# }
+pkgver() {
+  git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 build() {
   meson --buildtype=minsize --prefix=/usr -Dbackend-x11=enabled -Dbackend-wayland=enabled ../
diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only
index f520f7c..b0fa853 100644
--- a/PKGBUILD.wayland-only
+++ b/PKGBUILD.wayland-only
@@ -18,9 +18,9 @@ depends=(
   'libmpdclient')
 source=()
 
-# pkgver() {
-#   git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-# }
+pkgver() {
+  git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 build() {
   meson --buildtype=minsize --prefix=/usr -Dbackend-x11=disabled -Dbackend-wayland=enabled ../
diff --git a/meson.build b/meson.build
index d7080ca..db82e1b 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,5 @@
 project('f00bar', 'c',
         license: 'MIT',
-        version: '1.0.0',
         default_options: ['c_std=c11', 'warning_level=1', 'werror=true'])
 
 add_project_arguments(