diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
| commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
| tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /community/units | |
| parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
| parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/units')
| -rw-r--r-- | community/units/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/units/build-fix.patch | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD index 1e51aa0f1..7f95ba95a 100644 --- a/community/units/PKGBUILD +++ b/community/units/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73111 2012-07-01 18:55:45Z spupykin $ +# $Id: PKGBUILD 73248 2012-07-04 09:22:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff Mickey <jeff@archlinux.org> # Contributor: Steve Sansom <snsansom@gmail.com> pkgname=units pkgver=2.00 -pkgrel=1 +pkgrel=2 pkgdesc="converts between different units" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/units/units.html" @@ -16,7 +16,7 @@ install=units.install source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('6d0518d493f9bab5aa318a3c7d0801b2' - 'bf891464e398b0ddadac97dd7ce948c4') + 'dbb20e628ce0879fe82393f585e9dab6') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch index 219c16b85..7361a9e91 100644 --- a/community/units/build-fix.patch +++ b/community/units/build-fix.patch @@ -1,6 +1,6 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in --- units-2.00.org/Makefile.in 2012-05-03 00:37:55.000000000 +0400 -+++ units-2.00/Makefile.in 2012-07-01 22:44:37.000000000 +0400 ++++ units-2.00/Makefile.in 2012-07-04 12:54:20.000000000 +0400 @@ -84,10 +84,10 @@ sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst @@ -16,3 +16,12 @@ diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'` install: units@EXEEXT@ install-doc install-support +diff -wbBur units-2.00.org/units_cur units-2.00/units_cur +--- units-2.00.org/units_cur 2012-05-01 04:51:35.000000000 +0400 ++++ units-2.00/units_cur 2012-07-04 12:53:47.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import urllib + import datetime |