[arch-commits] Commit in jhead/repos (3 files)

[Eric Belanger]

    Date: Tuesday, July 8, 2008 @ 21:31:31
  Author: eric
Revision: 4705

Merged revisions 2-4704 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/jhead/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r4681 | eduardo | 2008-07-08 16:27:29 -0400 (Tue, 08 Jul 2008) | 1 line
  
  upgpkg: jhead 2.82-1
........
  r4704 | eric | 2008-07-08 21:31:16 -0400 (Tue, 08 Jul 2008) | 2 lines
  
  upgpkg: jhead 2.82-1
      Added license, FSH man pages
........

Added:
  jhead/repos/extra-x86_64/LICENSE
    (from rev 4704, jhead/trunk/LICENSE)
Modified:
  jhead/repos/extra-x86_64/	(properties)
  jhead/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   12 ++++++++++++
 PKGBUILD |   16 ++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)


Property changes on: jhead/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /jhead/trunk:1
   + /jhead/trunk:1-4704

Copied: jhead/repos/extra-x86_64/LICENSE (from rev 4704, jhead/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2008-07-09 01:31:31 UTC (rev 4705)
@@ -0,0 +1,12 @@
+License:
+
+    Jhead is public domain software - that is, you can do whatever you want
+    with it, and include it software that is licensesed under the GNU or the 
+    BSD license, or whatever other licence you chose, including proprietary
+    closed source licenses.  Although not part of the liscense, I do expect
+    common courtesy, please.
+
+    If you do integrate the code into some software of yours, I'd appreciate
+    knowing about it though. 
+
+Matthias Wandel

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-09 01:31:16 UTC (rev 4704)
+++ extra-x86_64/PKGBUILD	2008-07-09 01:31:31 UTC (rev 4705)
@@ -2,24 +2,24 @@
 # $Id$
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=jhead
-pkgver=2.4
+pkgver=2.82
 pkgrel=1
 pkgdesc="EXIF JPEG info parser and thumbnail remover"
 arch=(i686 x86_64)
 url="http://www.sentex.net/~mwandel/jhead/"
+arch=('i686' 'x86_64')
+license=('custom')
 depends=(glibc)
 conflicts=()
 backup=()
 install=
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('410d01fd323ce8733480816de3621cc0')
+source=($url/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('ef2f3233e22ba054c90ba33068cb0a70' '1f0db611d2642a981719f45252762a45')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/man/man1
   make || return 1
-  cp $pkgname $startdir/pkg/usr/bin
-  cp $pkgname.1.gz $startdir/pkg/usr/man/man1
-
+  install -D -m755 $pkgname $startdir/pkg/usr/bin/$pkgname
+  install -D -m644 $pkgname.1.gz $startdir/pkg/usr/share/man/man1/$pkgname.1.gz
+  install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }