diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-09 21:07:26 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-09 21:07:26 -0200 |
| commit | 66174628313398909679b2a88cab535627fa4dc9 (patch) | |
| tree | b403b67e48e3504f7f8a0ea62c5fe5cc37c5f4cb /libre | |
| parent | b42154133403f057f59444375480b78a8c922be6 (diff) | |
| parent | 2161d99a0e246788462de5377c74142ff250172b (diff) | |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/bumblebee/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/your-freedom/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/your-freedom/your-freedom.install | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libre/bumblebee/PKGBUILD b/libre/bumblebee/PKGBUILD index 78c470584..80ea574ef 100644 --- a/libre/bumblebee/PKGBUILD +++ b/libre/bumblebee/PKGBUILD @@ -3,7 +3,7 @@ pkgname=bumblebee pkgver=3.2.1 -pkgrel=5.parabola1 +pkgrel=5.parabola2 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64' 'mips64el') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -16,9 +16,9 @@ if [ "$CARCH" = "x86_64" ]; then optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun' optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun' fi -replaces=('nvidia-libgl' 'nvidia-340xx-libgl' "$pkgname-libre") -conflicts=('nvidia-libgl' 'nvidia-340xx-libgl' "$pkgname-libre") -provides=('nvidia-libgl' 'nvidia-340xx-libgl') +replaces=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' "$pkgname-libre") +conflicts=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl' "$pkgname-libre") +provides=('nvidia-libgl' 'nvidia-340xx-libgl' 'nvidia-304xx-libgl') url="http://www.$pkgname-project.org" license=("GPL3") install="$pkgname.install" diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 3d4bc7d79..49be3f64c 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20141006 -_gitver=fc8ccd07c43805de79f22b2ca67e842bba088217 +pkgver=20141009 +_gitver=7690b1a5d83bec3746c6555269c26101bd76d0f8 pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('509830202eabcfaa5b3e91658e63d38b') +md5sums=('5b021de3daae178c1484dfc749d16ee4') package() { cd "$srcdir" diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install index e0477cab9..1718cbb2c 100644 --- a/libre/your-freedom/your-freedom.install +++ b/libre/your-freedom/your-freedom.install @@ -15,7 +15,7 @@ pre_install() { If you find out any of the following: * Cascade package removal due to nonfree dependencies, - * Your-freedom conflicting with a *-libre package, + * Your-freedom conflicting with a libre package, * Etc. Please report back to the Parabola Project on the usual channels: |