Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

8 files changed, 9 insertions, 9 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 2730e7cf9..ca5650c6a 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -29,7 +29,7 @@ _pkgver=2.72b
 _depver=${_pkgver%[a-z]}
 [[ $_git == no  ]] && pkgver=$_pkgver
 [[ $_git == yes ]] && pkgver=$_pkgver.git1.$_gitcommit
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 epoch=15
 _jpgver=1.5
 _llvmver=3.5
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 99681df3e..318ef9643 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -98,7 +98,7 @@ _debhelper_install() {
 
 prepare() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
-	# {Arch Linux,Parabola}'s gzip doesn't support --rsyncable
+	# {Arch,Parabola}'s gzip doesn't support --rsyncable
 	patch -Np1 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
 }
 
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 0038abd3e..b101effbb 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=filesystem
 pkgver=2014.10
-pkgrel=3.parabola1
+pkgrel=3.parabola2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -32,7 +32,7 @@ md5sums=('d46cb1adf8175888cc827a3dad8857d2'
          'a998d1e6c7cc5791a7f4a2b49b2d10ce'
          '1ec1b16e2a71fad63ab8f147069a5d97'
          '693c97f2c9a519bb97a17008e92c2b74'
-         'f0a5071f50d8864d2810c44e23eb00cc'
+         '49639d107b75fe4e668ae27749da32ab'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
          '83e0de34441a56684db8f813099d62f8'
diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab
index 087d09eee..247bec61c 100644
--- a/libre/filesystem/crypttab
+++ b/libre/filesystem/crypttab
@@ -3,7 +3,7 @@
 # Each mapped device will be created in /dev/mapper, so your /etc/fstab
 # should use the /dev/mapper/<name> paths for encrypted devices.
 #
-# The Arch specific syntax has been deprecated, see crypttab(5) for the
+# The Parabola specific syntax has been deprecated, see crypttab(5) for the
 # new supported syntax.
 #
 # NOTE: Do not list your root (/) partition here, it must be set up
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index d67df30a8..fbc375f75 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -68,7 +68,7 @@ md5sums=('SKIP'
          'SKIP'
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
-         '945527e0de8d384166a4cf23439ae9ee'
+         '43ca769bfbab419d44158656cf63f501'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          '8d1dd54ae4a1b550c097e056892ce953'
diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
index 18d9d520c..18a0a1c16 100644
--- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
+++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch
@@ -1,7 +1,7 @@
 From b470ffd22e43acc7c11231180187a720efd88de1 Mon Sep 17 00:00:00 2001
 From: Keshav Amburay <the.ridikulus.rat@gmail.com>
 Date: Sat, 5 Apr 2014 20:40:51 -0400
-Subject: [PATCH] 10_linux: Detect Arch Linux main and fallback initramfs
+Subject: [PATCH] 10_linux: Detect main and fallback initramfs
  images
 
 ---
diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 1f8a69cc7..c7df0afa5 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin
 pkgver=2014.34260
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/texlive-bin/texmf.cnf b/libre/texlive-bin/texmf.cnf
index 76975ee5c..4d9183e40 100644
--- a/libre/texlive-bin/texmf.cnf
+++ b/libre/texlive-bin/texmf.cnf
@@ -1,4 +1,4 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea.
+% texmf.cnf for TeXLive -- runtime path configuration file for kpathsea.
 % Public domain.
 % 
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is