diff options
| -rw-r--r-- | kernels/linux-libre-lts-knock/PKGBUILD | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-pae/PKGBUILD | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/bfgminer-parabola/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/cups-filters-parabola/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/linux-libre-firmware/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/linux-libre-manpages/PKGBUILD | 6 | ||||
| -rw-r--r-- | pcr/acpi_call-parabola-grsec/PKGBUILD (renamed from libre/acpi_call-parabola-grsec/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/acpi_call-parabola-grsec/kmod.install (renamed from libre/acpi_call-parabola-grsec/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/bbswitch-parabola-grsec/PKGBUILD (renamed from libre/bbswitch-parabola-grsec/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/bbswitch-parabola-grsec/kmod.install (renamed from libre/bbswitch-parabola-grsec/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/bbswitch-parabola-lts/PKGBUILD (renamed from libre/bbswitch-parabola-lts/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/bbswitch-parabola-lts/kmod.install (renamed from libre/bbswitch-parabola-lts/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/PKGBUILD (renamed from libre/lirc-parabola-grsec/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/irexec.service (renamed from libre/lirc-parabola-grsec/irexec.service) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/kmod.install (renamed from libre/lirc-parabola-grsec/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/lirc-utils.install (renamed from libre/lirc-parabola-grsec/lirc-utils.install) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/lirc.logrotate (renamed from libre/lirc-parabola-grsec/lirc.logrotate) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/lirc.tmpfiles (renamed from libre/lirc-parabola-grsec/lirc.tmpfiles) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-grsec/wpc8769l-build-fix.patch (renamed from libre/lirc-parabola-grsec/wpc8769l-build-fix.patch) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/PKGBUILD (renamed from libre/lirc-parabola-lts/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/irexec.service (renamed from libre/lirc-parabola-lts/irexec.service) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/kmod.install (renamed from libre/lirc-parabola-lts/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/lirc-utils.install (renamed from libre/lirc-parabola-lts/lirc-utils.install) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/lirc.logrotate (renamed from libre/lirc-parabola-lts/lirc.logrotate) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/lirc.tmpfiles (renamed from libre/lirc-parabola-lts/lirc.tmpfiles) | 0 | ||||
| -rw-r--r-- | pcr/lirc-parabola-lts/wpc8769l-build-fix.patch (renamed from libre/lirc-parabola-lts/wpc8769l-build-fix.patch) | 0 | ||||
| -rw-r--r-- | pcr/tp_smapi-parabola-grsec/PKGBUILD (renamed from libre/tp_smapi-parabola-grsec/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/tp_smapi-parabola-grsec/kmod.install (renamed from libre/tp_smapi-parabola-grsec/kmod.install) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-grsec/60-vhba.rules (renamed from libre/vhba-module-parabola-grsec/60-vhba.rules) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-grsec/PKGBUILD (renamed from libre/vhba-module-parabola-grsec/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-grsec/vhba-module.install (renamed from libre/vhba-module-parabola-grsec/vhba-module.install) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-lts/60-vhba.rules (renamed from libre/vhba-module-parabola-lts/60-vhba.rules) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-lts/PKGBUILD (renamed from libre/vhba-module-parabola-lts/PKGBUILD) | 0 | ||||
| -rw-r--r-- | pcr/vhba-module-parabola-lts/vhba-module.install (renamed from libre/vhba-module-parabola-lts/vhba-module.install) | 0 |
36 files changed, 13 insertions, 13 deletions
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 89228825f..497090999 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -15,7 +15,7 @@ _knockpatchver=3.10 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} -_archpkgver=${pkgver%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f73b1afe4..4f6344e7e 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -14,7 +14,7 @@ _pkgver=3.16.1-gnu _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} -_archpkgver=${pkgver%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686') diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index d8f6b4b31..11070f889 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -19,7 +19,7 @@ _rtpatchver=rt9 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} -_archpkgver=${pkgver%-*}_${_rtpatchver} +_archpkgver=${_pkgver%-*}_${_rtpatchver} pkgver=${_pkgver//-/.}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index ac2e18378..84617de44 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -14,7 +14,7 @@ _pkgver=3.16.1-gnu _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} -_archpkgver=${pkgver%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1 arch=('i686') diff --git a/libre/bfgminer-parabola/PKGBUILD b/libre/bfgminer-parabola/PKGBUILD index a7309d7ee..51fbc80a4 100644 --- a/libre/bfgminer-parabola/PKGBUILD +++ b/libre/bfgminer-parabola/PKGBUILD @@ -10,9 +10,9 @@ pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') makedepends=('uthash' 'yasm') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) +replaces=("${_pkgname}" "${_pkgname}-libre") +conflicts=("${_pkgname}" "${_pkgname}-libre") +provides=("${_pkgname}=$pkgver") url='http://bfgminer.org/' license=('GPL3') source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz diff --git a/libre/cups-filters-parabola/PKGBUILD b/libre/cups-filters-parabola/PKGBUILD index fd91bd6dc..7d8af05b1 100644 --- a/libre/cups-filters-parabola/PKGBUILD +++ b/libre/cups-filters-parabola/PKGBUILD @@ -18,8 +18,8 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf etc/cups/cups-browsed.conf) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) provides=("${_pkgname}=${pkgver}" 'foomatic-filters') -replaces=("${_pkgname}" 'foomatic-filters') -conflicts=("${_pkgname}" 'foomatic-filters') +replaces=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") +conflicts=("${_pkgname}" 'foomatic-filters' "${_pkgname}-libre") md5sums=('0143ef62cd229e99fd3b03e827b1c122') build() { diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 7634b5110..8bb1a3c5e 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -7,7 +7,7 @@ _pkgver=3.16-gnu _srcname=linux-${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=2 pkgdesc='Firmware files for Linux-libre' arch=('any') url=('http://linux-libre.fsfla.org/') diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 3abe280fd..cd413c18e 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -8,7 +8,7 @@ pkgname=linux-libre-manpages _pkgver=3.14-gnu _srcname=linux-${_pkgver%-*} -_archpkgver=${pkgver%-*} +_archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} pkgrel=1.1 pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel" @@ -16,8 +16,8 @@ arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') -replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') -conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') +replaces=('kernel26-manpages' 'linux-manpages') +conflicts=('kernel26-manpages' 'linux-manpages') provides=('kernel26-manpages' "linux-manpages=${_archpkgver}") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/linux-libre-${_pkgver}.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b') diff --git a/libre/acpi_call-parabola-grsec/PKGBUILD b/pcr/acpi_call-parabola-grsec/PKGBUILD index 05bf0c697..05bf0c697 100644 --- a/libre/acpi_call-parabola-grsec/PKGBUILD +++ b/pcr/acpi_call-parabola-grsec/PKGBUILD diff --git a/libre/acpi_call-parabola-grsec/kmod.install b/pcr/acpi_call-parabola-grsec/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/acpi_call-parabola-grsec/kmod.install +++ b/pcr/acpi_call-parabola-grsec/kmod.install diff --git a/libre/bbswitch-parabola-grsec/PKGBUILD b/pcr/bbswitch-parabola-grsec/PKGBUILD index 393ef3d73..393ef3d73 100644 --- a/libre/bbswitch-parabola-grsec/PKGBUILD +++ b/pcr/bbswitch-parabola-grsec/PKGBUILD diff --git a/libre/bbswitch-parabola-grsec/kmod.install b/pcr/bbswitch-parabola-grsec/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/bbswitch-parabola-grsec/kmod.install +++ b/pcr/bbswitch-parabola-grsec/kmod.install diff --git a/libre/bbswitch-parabola-lts/PKGBUILD b/pcr/bbswitch-parabola-lts/PKGBUILD index 6182e10c7..6182e10c7 100644 --- a/libre/bbswitch-parabola-lts/PKGBUILD +++ b/pcr/bbswitch-parabola-lts/PKGBUILD diff --git a/libre/bbswitch-parabola-lts/kmod.install b/pcr/bbswitch-parabola-lts/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/bbswitch-parabola-lts/kmod.install +++ b/pcr/bbswitch-parabola-lts/kmod.install diff --git a/libre/lirc-parabola-grsec/PKGBUILD b/pcr/lirc-parabola-grsec/PKGBUILD index b0e04451f..b0e04451f 100644 --- a/libre/lirc-parabola-grsec/PKGBUILD +++ b/pcr/lirc-parabola-grsec/PKGBUILD diff --git a/libre/lirc-parabola-grsec/irexec.service b/pcr/lirc-parabola-grsec/irexec.service index dffbbf5e0..dffbbf5e0 100644 --- a/libre/lirc-parabola-grsec/irexec.service +++ b/pcr/lirc-parabola-grsec/irexec.service diff --git a/libre/lirc-parabola-grsec/kmod.install b/pcr/lirc-parabola-grsec/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/lirc-parabola-grsec/kmod.install +++ b/pcr/lirc-parabola-grsec/kmod.install diff --git a/libre/lirc-parabola-grsec/lirc-utils.install b/pcr/lirc-parabola-grsec/lirc-utils.install index f7faa07eb..f7faa07eb 100644 --- a/libre/lirc-parabola-grsec/lirc-utils.install +++ b/pcr/lirc-parabola-grsec/lirc-utils.install diff --git a/libre/lirc-parabola-grsec/lirc.logrotate b/pcr/lirc-parabola-grsec/lirc.logrotate index 623c4f328..623c4f328 100644 --- a/libre/lirc-parabola-grsec/lirc.logrotate +++ b/pcr/lirc-parabola-grsec/lirc.logrotate diff --git a/libre/lirc-parabola-grsec/lirc.tmpfiles b/pcr/lirc-parabola-grsec/lirc.tmpfiles index 0b80e2e47..0b80e2e47 100644 --- a/libre/lirc-parabola-grsec/lirc.tmpfiles +++ b/pcr/lirc-parabola-grsec/lirc.tmpfiles diff --git a/libre/lirc-parabola-grsec/wpc8769l-build-fix.patch b/pcr/lirc-parabola-grsec/wpc8769l-build-fix.patch index 5e25693ab..5e25693ab 100644 --- a/libre/lirc-parabola-grsec/wpc8769l-build-fix.patch +++ b/pcr/lirc-parabola-grsec/wpc8769l-build-fix.patch diff --git a/libre/lirc-parabola-lts/PKGBUILD b/pcr/lirc-parabola-lts/PKGBUILD index 15a503e3a..15a503e3a 100644 --- a/libre/lirc-parabola-lts/PKGBUILD +++ b/pcr/lirc-parabola-lts/PKGBUILD diff --git a/libre/lirc-parabola-lts/irexec.service b/pcr/lirc-parabola-lts/irexec.service index dffbbf5e0..dffbbf5e0 100644 --- a/libre/lirc-parabola-lts/irexec.service +++ b/pcr/lirc-parabola-lts/irexec.service diff --git a/libre/lirc-parabola-lts/kmod.install b/pcr/lirc-parabola-lts/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/lirc-parabola-lts/kmod.install +++ b/pcr/lirc-parabola-lts/kmod.install diff --git a/libre/lirc-parabola-lts/lirc-utils.install b/pcr/lirc-parabola-lts/lirc-utils.install index f7faa07eb..f7faa07eb 100644 --- a/libre/lirc-parabola-lts/lirc-utils.install +++ b/pcr/lirc-parabola-lts/lirc-utils.install diff --git a/libre/lirc-parabola-lts/lirc.logrotate b/pcr/lirc-parabola-lts/lirc.logrotate index 623c4f328..623c4f328 100644 --- a/libre/lirc-parabola-lts/lirc.logrotate +++ b/pcr/lirc-parabola-lts/lirc.logrotate diff --git a/libre/lirc-parabola-lts/lirc.tmpfiles b/pcr/lirc-parabola-lts/lirc.tmpfiles index 0b80e2e47..0b80e2e47 100644 --- a/libre/lirc-parabola-lts/lirc.tmpfiles +++ b/pcr/lirc-parabola-lts/lirc.tmpfiles diff --git a/libre/lirc-parabola-lts/wpc8769l-build-fix.patch b/pcr/lirc-parabola-lts/wpc8769l-build-fix.patch index 5e25693ab..5e25693ab 100644 --- a/libre/lirc-parabola-lts/wpc8769l-build-fix.patch +++ b/pcr/lirc-parabola-lts/wpc8769l-build-fix.patch diff --git a/libre/tp_smapi-parabola-grsec/PKGBUILD b/pcr/tp_smapi-parabola-grsec/PKGBUILD index 79dc1f2ea..79dc1f2ea 100644 --- a/libre/tp_smapi-parabola-grsec/PKGBUILD +++ b/pcr/tp_smapi-parabola-grsec/PKGBUILD diff --git a/libre/tp_smapi-parabola-grsec/kmod.install b/pcr/tp_smapi-parabola-grsec/kmod.install index d4bd8cb34..d4bd8cb34 100644 --- a/libre/tp_smapi-parabola-grsec/kmod.install +++ b/pcr/tp_smapi-parabola-grsec/kmod.install diff --git a/libre/vhba-module-parabola-grsec/60-vhba.rules b/pcr/vhba-module-parabola-grsec/60-vhba.rules index 39ae3a4ec..39ae3a4ec 100644 --- a/libre/vhba-module-parabola-grsec/60-vhba.rules +++ b/pcr/vhba-module-parabola-grsec/60-vhba.rules diff --git a/libre/vhba-module-parabola-grsec/PKGBUILD b/pcr/vhba-module-parabola-grsec/PKGBUILD index 468d7ab0e..468d7ab0e 100644 --- a/libre/vhba-module-parabola-grsec/PKGBUILD +++ b/pcr/vhba-module-parabola-grsec/PKGBUILD diff --git a/libre/vhba-module-parabola-grsec/vhba-module.install b/pcr/vhba-module-parabola-grsec/vhba-module.install index 04d26b27b..04d26b27b 100644 --- a/libre/vhba-module-parabola-grsec/vhba-module.install +++ b/pcr/vhba-module-parabola-grsec/vhba-module.install diff --git a/libre/vhba-module-parabola-lts/60-vhba.rules b/pcr/vhba-module-parabola-lts/60-vhba.rules index 39ae3a4ec..39ae3a4ec 100644 --- a/libre/vhba-module-parabola-lts/60-vhba.rules +++ b/pcr/vhba-module-parabola-lts/60-vhba.rules diff --git a/libre/vhba-module-parabola-lts/PKGBUILD b/pcr/vhba-module-parabola-lts/PKGBUILD index ed17049c8..ed17049c8 100644 --- a/libre/vhba-module-parabola-lts/PKGBUILD +++ b/pcr/vhba-module-parabola-lts/PKGBUILD diff --git a/libre/vhba-module-parabola-lts/vhba-module.install b/pcr/vhba-module-parabola-lts/vhba-module.install index 04d26b27b..04d26b27b 100644 --- a/libre/vhba-module-parabola-lts/vhba-module.install +++ b/pcr/vhba-module-parabola-lts/vhba-module.install |