summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQue Quotion2019-03-08 19:42:00 +0900
committerQue Quotion2019-03-08 19:42:00 +0900
commit3836094bf7b9c684f86e9514eac55f34fb3426d3 (patch)
treea7f9b3ae765fdec39d3f471aefece015ca7ad41c
parent79c662cccbe159aa349f6be893035dd816d2e3b1 (diff)
downloadaur-3836094bf7b9c684f86e9514eac55f34fb3426d3.tar.gz
Update dependencies again; git version of granite no longer required; make conflicts() and provides() the same
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92083d5886f..f6bd0a11f28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = wingpanel-standalone-git
license = GPL3
makedepends = meson
makedepends = git
- makedepends = granite-git
makedepends = vala
depends = glib2
depends = glibc
@@ -39,6 +38,10 @@ pkgbase = wingpanel-standalone-git
provides = wingpanel-git
provides = libwingpanel-2.0.so
conflicts = wingpanel
+ conflicts = wingpanel-bzr
+ conflicts = wingpanel-standalone-bzr
+ conflicts = wingpanel-git
+ conflicts = libwingpanel-2.0.so
replaces = wingpanel-standalone-bzr
source = git+https://github.com/elementary/wingpanel.git
source = minus-backgroundmanager.patch
diff --git a/PKGBUILD b/PKGBUILD
index b60049beb24..7064d77136b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ license=('GPL3')
groups=('pantheon-qq')
depends=('glib2' 'glibc' 'gtk3' 'libgee'
'libgranite.so' 'libwnck3' 'cogl')
-makedepends=('meson' 'git' 'granite-git' 'vala')
+makedepends=('meson' 'git' 'vala')
optdepends=("pantheon-applications-menu-git: Application launcher"
wingpanel-indicator-{a11y,bluetooth,datetime,keyboard,network,notifications,power,session,sound}-git": Tray applet"
"wingpanel-indicator-ayatana-git: Unity 7 Tray applets"
@@ -20,7 +20,7 @@ optdepends=("pantheon-applications-menu-git: Application launcher"
"indicator-sensors: Sensors readout applet"
"ubuntu-indicator-weather: Simple weather applet")
provides=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
-conflicts=('wingpanel')
+conflicts=(wingpanel{,{,-standalone}-bzr,-git} 'libwingpanel-2.0.so')
replaces=('wingpanel-standalone-bzr')
source=('git+https://github.com/elementary/wingpanel.git'
'minus-backgroundmanager.patch'