From 000010772d9fd4654c3b2150f09b0f91e53572ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 26 Nov 2020 21:16:25 +0700
Subject: [PATCH] xye: merge xye-data in

---
 srcpkgs/xye-data     |  1 -
 srcpkgs/xye/template | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/xye-data

diff --git a/srcpkgs/xye-data b/srcpkgs/xye-data
deleted file mode 120000
index cd83cc4aee2..00000000000
--- a/srcpkgs/xye-data
+++ /dev/null
@@ -1 +0,0 @@
-xye
\ No newline at end of file
diff --git a/srcpkgs/xye/template b/srcpkgs/xye/template
index 11094ab555b..d36a89c9ad2 100644
--- a/srcpkgs/xye/template
+++ b/srcpkgs/xye/template
@@ -1,16 +1,16 @@
 # Template file for 'xye'
 pkgname=xye
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 makedepends="SDL_image-devel SDL_ttf-devel"
-depends="${pkgname}-data"
 short_desc="Puzzle game inspired by Kye"
 maintainer="Adrian Siekierka <asiekierka@gmail.com>"
-license="Zlib, Custom"
+license="Zlib, custom:resource"
 homepage="http://xye.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8
+replaces="xye-data>=0"
 
 post_install() {
 	vdoc ReadMe.html
@@ -20,11 +20,3 @@ post_install() {
 	vlicense COPYING
 	vlicense res/detailed_COPYING
 }
-
-xye-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/xye
-	}
-}