diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
commit | 3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch) | |
tree | 05623159a5ae88f6eed2414db216bc9a0d2d71c5 /community/geany | |
parent | d4157e6db6dd7e03802aa9c361a1902e81c2545a (diff) | |
parent | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/geany/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.conf
community/linux-tools/cpupower.rc
community/stk/PKGBUILD
core/patch/PKGBUILD
core/systemd/PKGBUILD
extra/lftp/PKGBUILD
extra/lftp/lftp-4.3.8-gets.patch
extra/mysql/PKGBUILD
extra/qt/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/systemd/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/geany')
-rw-r--r-- | community/geany/PKGBUILD | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index e132fcdad..8cab17da6 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $ +# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -7,14 +7,14 @@ pkgname=geany pkgver=1.22 -pkgrel=1 -pkgdesc="Fast and lightweight IDE" +pkgrel=2 +pkgdesc='Fast and lightweight IDE' arch=('i686' 'x86_64' 'mips64el') url="http://www.geany.org/" license=('GPL') -depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') -makedepends=('perlxml' 'intltool') -optdepends=("vte: for terminal support") +depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('perlxml' 'setconf' 'intltool') +optdepends=('vte: for terminal support' 'python2') install=geany.install source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") options=('!libtool') @@ -30,9 +30,9 @@ build() { msg2 "Python2 fix..." sed -i '0,/on/s//on2/' data/templates/files/main.py msg2 "Fixing FS#10318..." - sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop + setconf geany.desktop MimeType '' msg2 "Enabling colors for PKGBUILD files..." - sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf + setconf data/filetype_extensions.conf Sh PKGBUILD } package() { |