summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-01-03 20:17:49 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-01-03 20:17:49 -0200
commite2588d09f76b745ca5160cf43a8554cea93660b0 (patch)
treec1fe7d225402ee40c1229d5e1f91330902686c2b /libre
parent787da2f0dd383eed59ea789f864bd9fa8760e582 (diff)
downloadabslibre-e2588d09f76b745ca5160cf43a8554cea93660b0.tar.gz
abslibre-e2588d09f76b745ca5160cf43a8554cea93660b0.tar.bz2
abslibre-e2588d09f76b745ca5160cf43a8554cea93660b0.zip
your-freedom-20150103-1: updating version
Diffstat (limited to 'libre')
-rw-r--r--libre/your-freedom/PKGBUILD11
1 files changed, 3 insertions, 8 deletions
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 13ce2069b..7bdd03d0f 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,13 +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"
-<<<<<<< HEAD
-pkgver=20141213
-_gitver=e20783c6f0a66fd05400ca888683f68e0278c6a7
-=======
-pkgver=20141215
-_gitver=883028227ea883c7ae90ac04b961b59c9daa71bb
->>>>>>> 93dd217e948a8120899d72879def905500a8e4ea
+pkgver=20150103
+_gitver=031665af23195dd58ccd6733d248c794c8dc74b6
pkgrel=1
arch=('any')
@@ -21,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=('277564a425ed9a868d932100450844fe')
+md5sums=('c5d7e96544b19fdfdc339fbe69efbd7e')
package() {
cd "$srcdir"