summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXZS2016-05-11 15:59:43 +0200
committerXZS2016-05-11 15:59:43 +0200
commite53dc7be3267870bbfa5b8a57cc69208362a1db7 (patch)
treeb4241af8df31de5c55a96dd7d31c4e193c6fe34a
parentb7ecdcde446b2feb254c85813f08d15fccad41b6 (diff)
downloadaur-e53dc7be3267870bbfa5b8a57cc69208362a1db7.tar.gz
remove nonexistent package relations
Neither the *-bin packages nor the non-suffixed variant exist in AUR4. Enough time has passed that any leftover installation should be outdated and incompatible so that they are not relevant for an update any longer. This only affects relations to no longer preset packages, which will not disturb existing installations, so they do not need to be triggered to update with a pkgrel increment.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5156087582..aa1923d68ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,12 +11,8 @@ pkgbase = mozilla-extension-gnome-keyring-git
provides = firefox-gnome-keyring
provides = thunderbird-gnome-keyring
provides = mozilla-extension-gnome-keyring=0.11
- conflicts = firefox-gnome-keyring
conflicts = firefox-gnome-keyring-git
- conflicts = firefox-gnome-keyring-bin
- conflicts = thunderbird-gnome-keyring
conflicts = thunderbird-gnome-keyring-git
- conflicts = thunderbird-gnome-keyring-bin
conflicts = mozilla-extension-gnome-keyring
source = mozilla-extension-gnome-keyring::git+https://github.com/swick/moz-gnome-keyring-integration
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 59d01edbc5b..a33092e6d53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ license=(GPLv3)
depends=(libgnome-keyring)
optdepends=(firefox thunderbird)
provides=({firefox,thunderbird}-gnome-keyring)
-conflicts=({firefox,thunderbird}-gnome-keyring{,-git,-bin})
+conflicts=({firefox,thunderbird}-gnome-keyring-git)
makedepends+=('git')
source+=("${_gitname:=${pkgname%-git}}::${_giturl:-git+$url}")