diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-04 09:51:11 +0100 |
| commit | 6b67b8c583b321bc955bc8efd24befe40d15e9fc (patch) | |
| tree | 61148cd550443788030ce27e3d7bee9fb9daf57e /libre/pacman | |
| parent | 8ba6ee51e836f2a5b78c7d6ca0096ddb5f847833 (diff) | |
| parent | 3a8d026e8e859ff4c9aa813d5f1eb2afa5663e78 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang-sdl/PKGBUILD
community/nautilus-sound-converter/PKGBUILD
community/shapelib/PKGBUILD
core/libarchive/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/evince/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/libgxps/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qt5/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
libre/kernel26-libre-lts/PKGBUILD
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.mips64el | 2 | ||||
| -rw-r--r-- | libre/pacman/pacman.conf.x86_64 | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 0cfb73c55..4e92336c2 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,17 +1,17 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $ +# $Id: PKGBUILD 178901 2013-02-28 17:05:39Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pacman pkgver=4.0.3 -pkgrel=5.1 # no difference from 5 unless on mips64el +pkgrel=7 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" license=('GPL') -groups=('base') -depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4' +groups=('base' 'base-devel') +depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring') makedepends=('asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') @@ -29,11 +29,11 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' '1a70392526c8768470da678b31905a6e' '1a9b79788640907a2b34e8671cacc94a' - 'a9ddd43891bed364e1e97d27b2887bf1' + 'a9ddd43891bed364e1e97d27b2887bf1' '2e8cbf55a94b1954b167c5dee6b62317' - '080d9f76f56e135cc62205874636aa0f' - 'ce9943fc8086d491890565e91ea1a0d8' - 'eb8dba9bd0b315230fbf0e5dc0a7335b' + '6f284de1facaead73de918b4f380fa7f' + 'f2213945821548c05d654a299ce077f7' + 'a45ce4bd0bafb2d60181da5cfa7ceede' 'debc512689a1aa8c124fe0ccf27f5758') build() { diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf index 115217b59..59e55cf0b 100644 --- a/libre/pacman/pacman.conf +++ b/libre/pacman/pacman.conf @@ -96,7 +96,7 @@ SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index f286c3290..3c32ddb78 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -96,7 +96,7 @@ SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 index 4c67b089f..6a28406eb 100644 --- a/libre/pacman/pacman.conf.x86_64 +++ b/libre/pacman/pacman.conf.x86_64 @@ -107,7 +107,7 @@ Include = /etc/pacman.d/mirrorlist #Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find -# them check out this wiki page: http://wiki.parabolagnulinux.org/Repositories +# them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. |