diff options
| -rw-r--r-- | deadbeef-plugin-lyricbar-git/.SRCINFO | 7 | ||||
| -rw-r--r-- | deadbeef-plugin-lyricbar-git/PKGBUILD | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/deadbeef-plugin-lyricbar-git/.SRCINFO b/deadbeef-plugin-lyricbar-git/.SRCINFO index 167e5f7..024629f 100644 --- a/deadbeef-plugin-lyricbar-git/.SRCINFO +++ b/deadbeef-plugin-lyricbar-git/.SRCINFO @@ -1,13 +1,18 @@ pkgbase = deadbeef-plugin-lyricbar-git pkgdesc = DeaDBeeF lyric bar plugin +<<<<<<< HEAD + pkgver = r66.g39b9568 + pkgrel = 1 +======= pkgver = r60.ga08374c pkgrel = 2 +>>>>>>> f2177fdbd14794575ba8d65500a2dd3d85f0fb1b url = https://github.com/C0rn3j/deadbeef-lyricbar arch = i686 arch = x86_64 license = MIT makedepends = git - depends = deadbeef-git + depends = deadbeef depends = libxml++ optdepends = gtkmm3 optdepends = gtkmm diff --git a/deadbeef-plugin-lyricbar-git/PKGBUILD b/deadbeef-plugin-lyricbar-git/PKGBUILD index ac38c44..e2860b5 100644 --- a/deadbeef-plugin-lyricbar-git/PKGBUILD +++ b/deadbeef-plugin-lyricbar-git/PKGBUILD @@ -4,13 +4,18 @@ _pkgname=deadbeef-lyricbar pkgname=deadbeef-plugin-lyricbar-git +<<<<<<< HEAD +pkgver=r66.g39b9568 +pkgrel=1 +======= pkgver=r60.ga08374c pkgrel=2 +>>>>>>> f2177fdbd14794575ba8d65500a2dd3d85f0fb1b pkgdesc="DeaDBeeF lyric bar plugin" arch=('i686' 'x86_64') url="https://github.com/C0rn3j/deadbeef-lyricbar" license=('MIT') -depends=('deadbeef-git' 'libxml++') +depends=('deadbeef' 'libxml++') optdepends=('gtkmm3' 'gtkmm') makedepends=('git') source=("${_pkgname}::git+${url}" |