diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-26 13:09:27 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-26 13:09:27 +0100 |
| commit | 032ac897590a043b6414d0abba4a06ad78db615f (patch) | |
| tree | 897cf1a1b2295d9b63a38b1a418da678f4e8affb /libre/linux-libre | |
| parent | 719eef2cbea3d4967cef09bd22dd5258dae8b0af (diff) | |
| parent | 93079feae1048abe4ebe1ddc66197f31e1206101 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
libre/cdfs-libre/PKGBUILD
libre/vhba-module-libre/PKGBUILD
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 711d8efb5..29a814519 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -393,7 +393,7 @@ _package-headers() { } _package-docs() { - pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") |