diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-25 05:43:40 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-08-25 05:43:40 -0300 |
| commit | e0a649279af24f9ba1ca7b66fcd8d3db807f6b19 (patch) | |
| tree | a52f2fb7d69d889b5df50a5814d0f0393f672e8b | |
| parent | d6095e8fbbb9f2da15e2e35689bbd0298665affd (diff) | |
| parent | be6d3a23d7c2b7f60b359ede1d0980951493051d (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
| -rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/linux-libre-manpages/PKGBUILD | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2bdf25bbe..f40f2c58f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -40,10 +40,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'f747eeb343d5105bcd1a1b02ce391c746bccbce62e58394b674fc553be844ccc' - '9e7dcc90121995024632476d50286b62dbb73da20a7970653a2d72a0a98406c0' - '35f283689c4f8b346bc05ac57c3cce50a61a1d0c11a665fc1abf519bb3f1beea' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '2114c304b6a2eb7ed6549cd7162ad2312eac30729b3dd5cb5a50aa55d954cf6a' + '76ee0a0d4e2eb6f0fd180c72b17ab1afbc77d280a246816997c8300f3ed0e97b' 'b053633d23d85972e5a99a83dc93bdab9b8aa1ab8450e98e3b84b46faa669fef' + 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index cd413c18e..650aea794 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -10,15 +10,15 @@ _pkgver=3.14-gnu _srcname=linux-${_pkgver%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/.} -pkgrel=1.1 +pkgrel=1.2 pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') -replaces=('kernel26-manpages' 'linux-manpages') -conflicts=('kernel26-manpages' 'linux-manpages') -provides=('kernel26-manpages' "linux-manpages=${_archpkgver}") +replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') +conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages') +provides=("linux-manpages=${_archpkgver}") source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/linux-libre-${_pkgver}.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b') |