Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/cvsps/PKGBUILD
	libre/cdfs-libre/PKGBUILD
	libre/vhba-module-libre/PKGBUILD

1 files changed, 6 insertions, 6 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 2609ad281..af26e178d 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -9,7 +9,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=3
+pkgrel=3.1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -91,7 +91,7 @@ build() {
 }
 
 package_libtraceevent-libre() {
-  pkgdesc='Linux kernel trace event library (built from linux-libre source)'
+  pkgdesc='Linux kernel trace event library'
   depends=('glibc')
   replaces=('libtraceevent')
   conflicts=('libtraceevent')
@@ -103,7 +103,7 @@ package_libtraceevent-libre() {
 }
 
 package_perf-libre() {
-  pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)'
+  pkgdesc='Linux kernel performance auditing tool'
   depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
   replaces=('perf')  
   conflicts=('perf')
@@ -121,7 +121,7 @@ package_perf-libre() {
 }
 
 package_cpupower-libre() {
-  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
@@ -143,7 +143,7 @@ package_cpupower-libre() {
 }
 
 package_x86_energy_perf_policy-libre() {
-  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)'
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
   depends=('glibc')
   replaces=('x86_energy_perf_policy')
   conflicts=('x86_energy_perf_policy')
@@ -155,7 +155,7 @@ package_x86_energy_perf_policy-libre() {
 }
 
 package_usbip-libre() {
-  pkgdesc='An USB device sharing system over IP network (built from linux-libre source)'
+  pkgdesc='An USB device sharing system over IP network'
   depends=('glib2' 'sysfsutils')
   options=('!libtool')
   replaces=('usbip')