diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
commit | 47d70348352503e92ba694a6a683f629eaa18215 (patch) | |
tree | 7fb6f5ec75596b795dee52cfa35e3ef00a047cfb /community/tuxguitar | |
parent | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (diff) | |
parent | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community/discid/PKGBUILD
community/dumb/PKGBUILD
community/dynamite/PKGBUILD
community/echat/PKGBUILD
community/fbdump/PKGBUILD
community/fldiff/PKGBUILD
community/flightgear/PKGBUILD
community/fonteditfs/PKGBUILD
community/freehdl/PKGBUILD
community/unclutter/PKGBUILD
community/unpaper/PKGBUILD
community/wmii/PKGBUILD
community/xkeycaps/PKGBUILD
community/xl2tpd/PKGBUILD
community/xmmsctrl/PKGBUILD
extra/gnutls/PKGBUILD
extra/inkscape/PKGBUILD
extra/ntp/PKGBUILD
extra/transmission/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/libreoffice/PKGBUILD
Diffstat (limited to 'community/tuxguitar')
-rw-r--r-- | community/tuxguitar/PKGBUILD | 4 | ||||
-rw-r--r-- | community/tuxguitar/tuxguitar.install | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD index feb55fae9..a1fae110c 100644 --- a/community/tuxguitar/PKGBUILD +++ b/community/tuxguitar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59148 2011-11-21 12:35:13Z spupykin $ +# $Id: PKGBUILD 65417 2012-02-21 03:31:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: |AhIoRoS| < ahioros@gmail.com > pkgname=tuxguitar pkgver=1.2 -pkgrel=4 +pkgrel=5 _jdk=java-7-openjdk pkgdesc="multitrack guitar tablature editor and player" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/tuxguitar/tuxguitar.install b/community/tuxguitar/tuxguitar.install index 50cd956c2..9069058c8 100644 --- a/community/tuxguitar/tuxguitar.install +++ b/community/tuxguitar/tuxguitar.install @@ -9,4 +9,3 @@ post_upgrade() { [ -x `which update-desktop-database` ] && update-desktop-database /bin/true } - |