diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 20:05:58 -0300 |
| commit | 1872d2123d241e0a3ef01a50fcdc4596b056bcf4 (patch) | |
| tree | a9ba894779ea4dc5df5f6d5a9bceae99f4c44e06 /community/emacs-nox | |
| parent | 5a05be089c68617c86c9c555e63f2b0314451ebf (diff) | |
| parent | 005a14f92ef5d35e4c47d970cb7e69367a835958 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/balsa/PKGBUILD
community/bitcoin/PKGBUILD
community/jack2/PKGBUILD
community/kadu/PKGBUILD
community/oss/PKGBUILD
core/sudo/PKGBUILD
extra/djvulibre/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/dnsutils/PKGBUILD
testing/man-db/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/procps-ng/PKGBUILD
testing/procps-ng/sysctl.conf
testing/sudo/PKGBUILD
testing/xf86-video-nouveau/PKGBUILD
testing/xf86-video-nouveau/xf86-video-nouveau.install
Diffstat (limited to 'community/emacs-nox')
| -rw-r--r-- | community/emacs-nox/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/emacs-nox/emacs-nox.changelog | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD index 85a888af8..6b01bbd4e 100644 --- a/community/emacs-nox/PKGBUILD +++ b/community/emacs-nox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72353 2012-06-12 21:10:00Z jlichtblau $ +# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=emacs-nox -pkgver=24.1 +pkgver=24.2 pkgrel=1 pkgdesc="The Emacs Editor, without X11 support" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL') +license=('GPL3') depends=('dbus-core' 'ncurses' 'perl') provides=('emacs') conflicts=('emacs' 'emacs-cvs') @@ -16,7 +16,7 @@ options=('docs') changelog=$pkgname.changelog install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz) -sha256sums=('60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab') +sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357') build() { cd ${srcdir}/emacs-$pkgver diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog index 5e4d8f206..9fe1ae221 100644 --- a/community/emacs-nox/emacs-nox.changelog +++ b/community/emacs-nox/emacs-nox.changelog @@ -1,3 +1,6 @@ +2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * emacs-nox 24.2-1 + 2012-06-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * emacs-nox 24.1-1 |