[arch-commits] Commit in units/repos (10 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Thu Mar 21 15:11:16 UTC 2013


    Date: Thursday, March 21, 2013 @ 16:11:16
  Author: spupykin
Revision: 86729

archrelease: copy trunk to community-i686, community-x86_64

Added:
  units/repos/community-i686/PKGBUILD
    (from rev 86728, units/trunk/PKGBUILD)
  units/repos/community-i686/units.install
    (from rev 86728, units/trunk/units.install)
  units/repos/community-x86_64/PKGBUILD
    (from rev 86728, units/trunk/PKGBUILD)
  units/repos/community-x86_64/units.install
    (from rev 86728, units/trunk/units.install)
Deleted:
  units/repos/community-i686/PKGBUILD
  units/repos/community-i686/build-fix.patch
  units/repos/community-i686/units.install
  units/repos/community-x86_64/PKGBUILD
  units/repos/community-x86_64/build-fix.patch
  units/repos/community-x86_64/units.install

----------------------------------+
 /PKGBUILD                        |   58 +++++++++++++++++++++++++++++++++++++
 /units.install                   |   36 ++++++++++++++++++++++
 community-i686/PKGBUILD          |   31 -------------------
 community-i686/build-fix.patch   |   27 -----------------
 community-i686/units.install     |   18 -----------
 community-x86_64/PKGBUILD        |   31 -------------------
 community-x86_64/build-fix.patch |   27 -----------------
 community-x86_64/units.install   |   18 -----------
 8 files changed, 94 insertions(+), 152 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-i686/PKGBUILD	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
-# Contributor: Steve Sansom <snsansom at gmail.com>
-
-pkgname=units
-pkgver=2.01
-pkgrel=1
-pkgdesc="converts between different units"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/units/units.html"
-depends=('readline')
-license=("GPL")
-options=('!makeflags')
-install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('81bf85937c56fbbd04b16f2f3f9d8526'
-         'dbb20e628ce0879fe82393f585e9dab6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-#  patch -p1 <$srcdir/build-fix.patch
-  ./configure --prefix=/usr --datadir=/usr/share
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: units/repos/community-i686/PKGBUILD (from rev 86728, units/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-03-21 15:11:16 UTC (rev 86729)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jeff Mickey <jeff at archlinux.org>
+# Contributor: Steve Sansom <snsansom at gmail.com>
+
+pkgname=units
+pkgver=2.01
+pkgrel=2
+pkgdesc="converts between different units"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/units/units.html"
+depends=('readline')
+license=("GPL")
+options=('!makeflags')
+install=units.install
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
+  ./configure --prefix=/usr --datadir=/usr/share
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-i686/build-fix.patch	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,27 +0,0 @@
-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-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT at currency.units':" units_cur > units_cur_inst
- 
- install-support: definitions.units currency.units units_cur_inst
--	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
--	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT at definitions.units
--	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT at currency.units
--	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT at locale.map
-+	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
-+	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT at definitions.units
-+	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT at currency.units
-+	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT at locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- install: units at 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

Deleted: community-i686/units.install
===================================================================
--- community-i686/units.install	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-i686/units.install	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(units.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: units/repos/community-i686/units.install (from rev 86728, units/trunk/units.install)
===================================================================
--- community-i686/units.install	                        (rev 0)
+++ community-i686/units.install	2013-03-21 15:11:16 UTC (rev 86729)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(units.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-x86_64/PKGBUILD	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
-# Contributor: Steve Sansom <snsansom at gmail.com>
-
-pkgname=units
-pkgver=2.01
-pkgrel=1
-pkgdesc="converts between different units"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/units/units.html"
-depends=('readline')
-license=("GPL")
-options=('!makeflags')
-install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('81bf85937c56fbbd04b16f2f3f9d8526'
-         'dbb20e628ce0879fe82393f585e9dab6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-#  patch -p1 <$srcdir/build-fix.patch
-  ./configure --prefix=/usr --datadir=/usr/share
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: units/repos/community-x86_64/PKGBUILD (from rev 86728, units/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-03-21 15:11:16 UTC (rev 86729)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Jeff Mickey <jeff at archlinux.org>
+# Contributor: Steve Sansom <snsansom at gmail.com>
+
+pkgname=units
+pkgver=2.01
+pkgrel=2
+pkgdesc="converts between different units"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/units/units.html"
+depends=('readline')
+license=("GPL")
+options=('!makeflags')
+install=units.install
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
+  ./configure --prefix=/usr --datadir=/usr/share
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-x86_64/build-fix.patch	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,27 +0,0 @@
-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-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT at currency.units':" units_cur > units_cur_inst
- 
- install-support: definitions.units currency.units units_cur_inst
--	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
--	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT at definitions.units
--	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT at currency.units
--	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT at locale.map
-+	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
-+	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT at definitions.units
-+	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT at currency.units
-+	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT at locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- install: units at 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

Deleted: community-x86_64/units.install
===================================================================
--- community-x86_64/units.install	2013-03-21 15:10:58 UTC (rev 86728)
+++ community-x86_64/units.install	2013-03-21 15:11:16 UTC (rev 86729)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(units.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: units/repos/community-x86_64/units.install (from rev 86728, units/trunk/units.install)
===================================================================
--- community-x86_64/units.install	                        (rev 0)
+++ community-x86_64/units.install	2013-03-21 15:11:16 UTC (rev 86729)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(units.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}




More information about the arch-commits mailing list