[arch-commits] Commit in lha/repos (4 files)
Eric Bélanger
eric at archlinux.org
Wed Apr 29 00:59:33 UTC 2009
Date: Tuesday, April 28, 2009 @ 20:59:32
Author: eric
Revision: 36952
Fixed svn conflict
Added:
lha/repos/extra-i686/LICENSE
(from rev 36951, lha/trunk/LICENSE)
lha/repos/extra-i686/lha.man.en
(from rev 36951, lha/trunk/lha.man.en)
Modified:
lha/repos/extra-i686/ (properties)
lha/repos/extra-i686/PKGBUILD
------------+
LICENSE | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 37 +++---------
lha.man.en | 139 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 322 insertions(+), 26 deletions(-)
Property changes on: lha/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /lha/trunk:1
+ /lha/trunk:1-36951
Copied: lha/repos/extra-i686/LICENSE (from rev 36951, lha/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2009-04-29 00:59:32 UTC (rev 36952)
@@ -0,0 +1,172 @@
+LICENSE taken from Debian package.
+
+Upstream Authors:
+
+ LHarc 0.01-1.00: Yooichi Tagawa (LHa code taken from here, 1988-1989)
+ Nikkei-mix ID: y.tagawa (Now this is defunct BBS, Licensing term
+ in manual page come from his licence for lharc)
+ His new web page seems to be www2s.biglibe.ne.jp/~yex/
+ yooedit2001 at yahoo.co.jp is the contact e-mail address for another
+ software. Page updated at least July/2001
+
+ LHa 0.01-1.00: Masaru Oki (LHa original author, 1991-1992)
+ E-Mail address: oki at netbsd.org
+
+ LHa 1.10-1.14: Nobutaka Watazaki (Last official release? 1993-1995)
+ ALICE-NET ALS00595 Nasty
+ E-Mail JBD02514 at niftyserve.or.jp
+ E-Mail femcs at mbox.kyoto-inet.or.jp
+ NIFTY-Serve JBD02514
+ E-Mail address: watazaki at shimadzu.co.jp
+ E-Mail address: watazaki at shimadzusd.co.jp
+
+ Lha 1.14a-1.14e: Tsugio Okamoto <tsugio at muc.biglobe.ne.jp> (1996-2000)
+ LHa for UNIX V 1.15 Modified 2000 S. K.
+ LHA for UNIX V 1.16 Modified 2001 M. Ishii
+ LHA for UNIX V 1.17 Modified 2002 M. Ishii
+
+
+Copyright:
+
+Original Source Code License Statement:
+
+ /* Copyright (C) MCMLXXXIX Yooichi.Tagawa */
+ /* Modified Nobutaka Watazaki */
+ /* Thanks to H.Yoshizaki. (MS-DOS LHarc) */
+
+
+Original Authors License Statement (from man/lha.man, in Japanese
+EUC-JP):
+
+ ºÆÇÛÉۤˤĤ¤¤Æ
+ °Ê²¼¤Î¾ò·ï¤Ç¡¢ºÆÇÛÉÛ¡¢Å¾ºÜ¡¢²þÊѤòµö²Ä¤·¤Þ¤¹¡£
+
+ 1. Ãøºî¸¢É½¼¨¤òºï½ü¤·¤Ê¤¤¤³¤È¡£
+
+ 2. ÇÛÉÛÆâÍƤˤĤ¤¤Æ¤Ï¡¢
+
+ a. ÇÛÉۤκݤ˸ºß¤¹¤ëÆâÍÆ(¤¹¤Ê¤ï¤Á ¥½¡¼ ¥¹ ¥³¡¼
+ ¥É¡¢ ¥É ¥¥å¥á¥ó¥È¡¢¥×¥í¥°¥é¥Þ¡¼¤Ø¤Î¼ê°ú¤¤Ê
+ ¤É)¤¬ºÆÇÛÉÛ¤µ¤ì¤¿¤â¤Î¤ÎÃæ¤Ëɬ¤ºÂ¸ºß ¤¹ ¤ë ¤³
+ ¤È¡£ ²þ ÊѤµ¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤ì¤òÌÀ¼¨¤·¤¿¥É
+ ¥¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
+
+ b. LHa ¤ËÂФ¹¤ëÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤ÆºÆÇÛÉÛ¤µ¤ì¤ë
+ ¾ì¹ç¤Ë¤Ï¤½¤ì¤é¤â¤Ç¤¤ë¤À¤±´Þ¤á¤ë¤è¤¦ÅØÎϤ¹¤ë
+ ¤³¤È¡£¤Þ¤¿¡¢¤½¤ÎºÝ¤Ë¤ÏÉղòÁÃͤ¬ÉÕ¤±¤é¤ì¤Æ¤¤
+ ¤ë¤³¤È¤òÌÀ¼¨¤·¤¿¥É¥¥å¥á¥ó¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¡£
+
+ c. ¥Ð¥¤¥Ê¥ê¤Î¤ß¤ÎÇÛÉۤϵö¤µ¤ì¤Ê¤¤¡£(ÉղòÁÃÍ ¤Î
+ ¤â¤Î¤â´Þ¤à)
+
+ 3. ºÇ¿·ÈǤÎÇÛÉÛ¤Ë̳¤á¤ë¤³¤È¡£(µÁ̳¤Ï¤Ê¤¤)
+
+ Ãí. ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¢¤ë¤¬¡¢¥Í¥Ã¥È¤Ë
+ ¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢ CDROM ¤Ê ¤É
+ ¤Ë ¤è¤ë¡ËÇÛÉդϡ¢ÇÛÉÕÁ°¤Ë¤³¤Á¤é¤Ë EMail ¤ò¤ª
+ ´ê¤¤¤·¤Þ¤¹¡£ÇÛÉÕÁ°¤Ë½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢¸åÆüɬ¤º
+ EMail ¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£
+
+ 4. ¤³¤Î¥×¥í¥°¥é¥à¤Î¸ºß¤ä»ÈÍѤ·¤¿¤³¤È¤Ë¤è¤Ã¤ÆÀ¸¤¸¤¿Â»
+ ³²¤ÏÁ´¤¯Êݾڤ·¤Ê¤¤¡£
+
+ 5. ºî¼Ô¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËÉÔÈ÷¤¬¤¢¤Ã¤Æ¤â¡¢¤½¤ì¤òÄû Àµ
+ ¤¹¤ëµÁ̳¤òÉé¤ï¤Ê¤¤¡£
+
+ 6. ¤³¤Î¥×¥í¥°¥é¥à¤Î°ìÉô¡¢¤Þ¤¿¤ÏÁ´Éô¤ò¾¤Î¥×¥í¥°¥é¥à¤Ë
+ ÁȤ߹þ¤ó¤ÇÍøÍѤ·¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¡£¤³¤Î¾ì¹ç¡¢¤½¤Î¥× ¥í
+ ¥°¥é¥à¤Ï LHa ¤Ç¤Ï¤Ê¤¯¡¢ LHa ¤È̾¾è¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡£
+
+ 7. ¾¦ÍøÍѤ˴ؤ·¤Æ¤Ï¡¢¾åµ¤Î¾ò·ï¤Ë²Ã¤¨¡¢²¼µ¤Î¾ò·ï¤Î¤â
+ ¤È¤Ë¤³¤ì¤òǧ¤á¤ë¡£
+
+ a. ¤³¤Î¥×¥í¥°¥é¥à¤ò¥á¥¤¥ó¤È¤¹¤ë¾¦ÍøÍÑ¤Ï¶Ø »ß ¤¹
+ ¤ë¡£
+
+ b. ¾¦ÍøÍѤÎÁê¼ê¤¬¤³¤Î¥×¥í¥°¥é¥à¤Î»ÈÍѼԤȤ·¤ÆÉÔ
+ ŬÀÚ¤ÈȽÃǤ·¤¿¾ì¹ç¤Ë¤ÏÇÛÉÛ¤·¤Ê¤¤¡£
+
+ c. ¥¤¥ó¥¹¥È¡¼¥ë¤Î¼êÃʤȤ·¤Æ»ÈÍѤ¹¤ë¾ì¹ç¡¢¤³¤Î¥×
+ ¥í¥°¥é¥à¤ò»È¤¦¤³¤È¤òÁê¼ê¤Ë¶¯À©¤·¤Ê¤¤¡£¤³¤Î¾ì
+ ¹ç¡¢¾¦ÍøÍѼԤ¬ºî¶È¤ò¹Ô¤¦¡£¤Þ¤¿¡¢¤½¤Î¤È¤¤Î»
+ ³²¤Ï¡¢¾¦ÍøÍѼԤ¬Á´ÀÕǤ¤òÉ餦¡£
+
+ d. ¾¦ÍøÍѤòÉղòÁÃͤȤ·¤Æ¹Ô¤¤¤³¤Î¥×¥í¥°¥é¥à¤ò»È
+ ÍѤ¹¤ë¾ì¹ç¡¢¾¦ÍøÍѼԤϡ¢¤½¤Î¥µ¥Ý¡¼¥È¤ò¹Ô¤¦¡£
+
+
+Original Authors License Statement (from man/lha.man, translated by
+Osamu Aoki <debian at aokiconsulting.com>):
+
+ Permission is given for redistribution, copy, and modification provided
+ following conditions are met.
+
+ 1. Do not remove copyright clause.
+ 2. Distribution shall conform:
+ a. The content of redistribution (i.e., source code, documentation,
+ and reference guide for programmers) shall include original contents.
+ If contents are modified, the document clearly indicating
+ the fact of modification must be included.
+ b. If LHa is redistributed with added values, you must put your best
+ effort to include them (Translator comment: If read literally,
+ original Japanese was unclear what "them" means here. But
+ undoubtedly this "them" means source code for the added value
+ portion and this is a typical Japanese sloppy writing style to
+ abbreviate as such) Also the document clearly indicating that
+ added value was added must be included.
+ c. Binary only distribution is not allowed (including added value
+ ones.)
+ 3. You need to put effort to distribute the latest version (This is not
+ your duty).
+
+ NB: Distribution on Internet is free. Please notify me by e-mail or
+ other means prior to the distribution if distribution is done through
+ non-Internet media (Magazine, CDROM etc.) If not, make sure to Email
+ me later.
+
+ 4. Any damage caused by the existence and use of this program will not
+ be compensated.
+
+ 5. Author will not be responsible to correct errors even if program is
+ defective.
+
+ 6. This program, either as a part of this or as a whole of this, may be
+ included into other programs. In this case, that program is not LHa
+ and can not call itself LHa.
+
+ 7. For commercial use, in addition to above conditions, following
+ condition needs to be met.
+
+ a. The program whose content is mainly this program can not be used
+ commercially.
+ b. If the recipient of commercial use deems inappropriate as a
+ program user, you must not distribute.
+ c. If used as a method for the installation, you must not force
+ others to use this program. In this case, commercial user will
+ perform its work while taking full responsibility of its outcome.
+ d. If added value is done under the commercial use by using this
+ program, commercial user shall provide its support.
+
+
+(Osamu Aoki also comments:
+ Here "commercial" may be interpreted as "for-fee". "Added value" seems
+ to mean "feature enhancement". )
+
+
+License Statement by Tsugio Okamoto (in Japanese EUC-JP):
+
+ ¤Ê¤ª¡¢¥Í¥Ã¥È¤Ç¤ÎÇÛÉդϼ«Í³¤Ç¤¹¤¬¡¢¥Í¥Ã¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤¤Ê¤¤Êý¡Ê»¨»ï¤ª¤è¤Ó¡¢
+ CD-ROM ¤Ê¤É¤Ë¤è¤ë¡Ë¤Ø¤ÎÇÛÉդϡ¢ÇÛÉÕÁ°¤Ë¤³¤Á¤é¤Ë Inter-Net ¤ÎÊý¤ËE-Mail
+ ¤ò ¤ª´ê¤¤¤·¤Þ¤¹¡£ ¤É¤³¤½¤³¤Ë¡¢·ÇºÜ¤¹¤ë¤È¤¤¤¦»Ý¤¬¤¢¤ì¤Ð·ë¹½¤Ç¤¹¤Î¤Ç¡£
+ ¤Þ¤¿¡¢¤½¤ì¤â½ÐÍè¤Ê¤¤ºÝ¤Ë¤Ï¡¢¸åÆü E-Mail ¤òɬ¤º¤ª´ê¤¤¤·¤Þ¤¹¡£
+
+
+Translated License Statement by Tsugio Okamoto (translated by
+GOTO Masanori <gotom at debian.org>):
+
+ It's free to distribute on the network, but if you distribute for
+ the people who cannot access the network (by magazine or CD-ROM),
+ please send E-Mail (Inter-Net address) to the author before the
+ distribution. That's well where this software is appeard.
+ If you cannot do, you must send me the E-Mail later.
+
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-04-29 00:58:19 UTC (rev 36951)
+++ extra-i686/PKGBUILD 2009-04-29 00:59:32 UTC (rev 36952)
@@ -1,36 +1,21 @@
# $Id$
-# Maintainer: eric <eric at archlinux.org>
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-#
pkgname=lha
pkgver=1.17
-pkgrel=2
+pkgrel=3
pkgdesc="lha is a compression and archive utility for LH-7 format archives"
-depends=('glibc')
-source=(http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/linux/$pkgname\117.tar.gz)
+arch=('i686')
url="http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/"
-md5sums=('7896188203cfaf5782d153c4dcd19f57')
+license=('custom')
+depends=('glibc')
+source=(http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/linux/$pkgname\117.tar.gz LICENSE lha.man.en)
+md5sums=('7896188203cfaf5782d153c4dcd19f57' 'be11a6fd915099970126b23d683937dd'\
+ '558fa922133507817137ed4b27764cc8')
build() {
- mkdir -p $startdir/pkg/usr/bin
- cd $startdir/src
-
- # NOTE: The upstream author does not distribute the source code unless
- # registering. The binary is available w/o registration, so just to be
- # careful, we'll check the binary against the MD5 computed at the time
- # of this PKGBUILD.
- #
- echo "**> Verifying MD5 of included binary from within PKGBUILD::build()"
- sum=`md5sum lha | awk '{ print $1 }'`
- echo "**> Expected MD5: '9096c827e93420de99035e7706c741b3'"
- echo "**> Computed MD5: '$sum'"
- if [ "$sum" = "9096c827e93420de99035e7706c741b3" ]; then
- echo "**> MD5 check passed: completing build"
- install -D -m755 lha $startdir/pkg/usr/bin/lha
- else
- echo "**> MD5 check failed: please submit a bug to the Arch pkg maintainer"
- return 1
- fi
+ install -D -m755 $srcdir/lha $pkgdir/usr/bin/lha
+ install -D -m644 $srcdir/lha.man $pkgdir/usr/share/man/ja/man1/lha.1
+ install -D -m644 $srcdir/lha.man.en $pkgdir/usr/share/man/man1/lha.1
+ install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
-# vim: ts=2 sw=2 et ft=sh
Copied: lha/repos/extra-i686/lha.man.en (from rev 36951, lha/trunk/lha.man.en)
===================================================================
--- extra-i686/lha.man.en (rev 0)
+++ extra-i686/lha.man.en 2009-04-29 00:59:32 UTC (rev 36952)
@@ -0,0 +1,139 @@
+ .\" lha - LZH un-archiver
+.\" Copyright (c) 1996 Martin Schulze <joey at namib.north.de>
+.\"
+.\" This manual page is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\"
+.\" This manpage is written especially for Debian GNU/Linux.
+.\"
+.\" LHarc for UNIX V 1.02 Copyright(C) 1989 Y.Tagawa
+.\" LHx for MSDOS V C2.01 Copyright(C) 1990 H.Yoshizaki
+.\" LHx(arc) for OSK V 2.01 Modified 1990 Momozou
+.\" LHa for UNIX V 1.00 Copyright(C) 1992 Masaru Oki
+.\"
+.\" Additions by Joerg Boehnke <joerg at oggi.oche.de>
+.\"
+.TH LHA 1 "22 Sept, 1998" "Debian GNU/Linux" "Archiver"
+.SH NAME
+LHa \- LZH un-archiver
+.SH SYNOPSIS
+.B lha
+.B key
+[
+.B -
+]
+.B {axelvudmcp}
+[
+.B qvnfodizg012
+]
+[
+.B w=<dir>
+]
+.I archive_file
+[
+.I flie
+\&.\|.\|. ]
+.br
+.B lha
+.I archive_file
+.SH DESCRIPTION
+The
+.B lha
+program displays or extracts the contents of a LZH archive.
+
+For a list of commands, please refer to the executable. It will
+display a list of valid commands and modifiers if you omit any
+parameter.
+
+.TP
+commands:
+
+.B a
+Add(or replace) to archive
+
+.B x,e
+EXtract from archive
+
+.B l,v
+List / Verbose List
+
+.B u
+Update newer files to archive
+
+.B d
+Delete from archive
+
+.B m
+Move to archive (means 'ad')
+
+.B c
+re-Construct new archive
+
+.B p
+Print to STDOUT from archive
+
+.B t
+Test file CRC in archive
+
+.TP
+options:
+
+.B q
+quiet
+
+.B v
+verbose
+
+.B n
+not execute
+
+.B f
+force (over write at extract)
+
+.B t
+FILES are TEXT file
+
+.B o
+use LHarc compatible method (a/u)
+
+.B w=<dir>
+specify extract directory (x/e)
+
+.B d
+delete FILES after (a/u/c)
+
+.B i
+ignore directory path (x/e)
+
+.B z
+files not compress (a/u)
+
+.B g
+[Generic] format (for compatibility)
+
+.B 0/1/2
+header level (a/u)
+
+.B e
+TEXT code convert from/to EUC
+
+.B y
+filename multibyte convert
+
+.SH BUGS
+
+This manpage is poor, it really should be improved, but the original
+is in Japanese.
+
+Try lha without any command line arguments to get help
More information about the arch-commits
mailing list