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

Eric Bélanger eric at archlinux.org
Sun Mar 29 22:19:00 UTC 2009


    Date: Sunday, March 29, 2009 @ 18:19:00
  Author: eric
Revision: 32263

Merged revisions 356,2304,32262 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/compface/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-31 01:00:40 -0400 (Sat, 31 May 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r32262 | eric | 2009-03-29 18:18:39 -0400 (Sun, 29 Mar 2009) | 2 lines
  
  upgpkg: compface 1.5.2-2
      Added license, FHS man pages
........

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

----------+
 LICENSE  |   94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   16 +++++-----
 2 files changed, 103 insertions(+), 7 deletions(-)


Property changes on: compface/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /compface/trunk:1
   + /compface/trunk:1-32262

Copied: compface/repos/extra-x86_64/LICENSE (from rev 32262, compface/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-03-29 22:19:00 UTC (rev 32263)
@@ -0,0 +1,94 @@
+Extracted from Debian GNU/Linux's package:
+
+[...]
+
+Compface - 48x48x1 image compression and decompression
+Copyright (c) James Ashton 1990.
+Written 89/11/11
+
+Feel free to distribute this source at will so long as the above
+message and this message are included in full.
+
+This copyright message dosn't specify whether modified version is allowed,
+but the following mail from the author does allow them:
+
+> From: James Ashton <James.Ashton at syseng.anu.edu.au>
+> Subject: Re: Bug#72019: compface not DFSG
+> Date: Wed, 20 Sep 2000 09:48:34 +1100 (EST)
+> 
+> >On Tue, Sep 19, 2000 at 08:58:43AM -0400, Raul Miller wrote:
+> >> Package: compface
+> >> Version: 1989.11.11-17.1
+> >> Severity: important
+> >>
+> >> compface's copyright doesn't grant permission to
+> >> distribute modified versions
+> >
+> >The compface copyright says:
+> >
+> >Feel free to distribute this source at will so long as the above
+> >message and this message are included in full.
+> >
+> >
+> >Which could be interpretated as it is allowed to distribute modified
+> >versions of it. James Ashton is the original author, would you care to
+> >clairify the matter, mr Ashton?
+> 
+> I don't mind modified versions being distributed.  Please included the
+> original copyright notices as specified and also prominently note, if
+> it is a modified version, the nature and author(s) of the
+> modifications.
+> --
+> James Ashton                  VK1XJA                    System Administrator
+> http://wwwsyseng.anu.edu.au/~jaa                   Department of Systems Engineering
+> Voice +61 2 6279 8675  Research School of Information Sciences and Engineering
+> FAX   +61 2 6279 8688                         Australian National University
+> Email James.Ashton at anu.edu.au                    Canberra ACT 0200 Australia
+> 
+
+Another peoblem with the copyright of this source code is that the
+copyright message in the source files and in the readme file is conflicting.
+The following mail from the author should clear that up:
+
+> From: James Ashton <James.Ashton at syseng.anu.edu.au>
+> Subject: Re: libcompface license (again)
+> Date: Thu, 22 Feb 2001 09:32:23 +1100 (EST)
+> 
+> >Hi,
+> >I'm maintaining the debian pkg of your compface lib, and I've talket to you
+> >before about it's license. And now ouer legal people have found another
+> >problem. The sourcefiles contains a diffrent copyright notice than the
+> >redmefile. They say:
+> >
+
+/*
+ *  Compface - 48x48x1 image compression and decompression
+ *
+ *  Copyright (c) James Ashton - Sydney University - June 1990.
+ *
+ *  Written 11th November 1989.
+ *
+ *  Permission is given to distribute these sources, as long as the
+ *  copyright messages are not removed, and no monies are exchanged. 
+ *
+ *  No responsibility is taken for any errors on inaccuracies inherent
+ *  either to the comments or the code of this program, but if reported
+ *  to me, then an attempt will be made to fix them.
+ */
+
+> >
+> >The problem is the last part "no monies are exchanged". As you probably=20
+> >know we do allow third party companies to produce debian CDs and sell them.
+> >So this statement would inmply that we can't have your libcompface in
+> debian
+> >at all.
+> 
+> I'm happy to remove the phrase no monies are exchanged' from the
+> source and allow distribution as per the README file.  Do you need more
+> from me than just this email?
+> --
+> James Ashton                    VK1XJA                    System Administrator
+> http://wwwsyseng.anu.edu.au/~jaa             Department of Systems Engineering
+> Voice +61 2 6125 8675  Research School of Information Sciences and Engineering
+> FAX   +61 2 6125 8660                           Australian National University
+> Email James.Ashton at anu.edu.au                      Canberra ACT 0200 Australia

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-29 22:18:39 UTC (rev 32262)
+++ extra-x86_64/PKGBUILD	2009-03-29 22:19:00 UTC (rev 32263)
@@ -5,19 +5,21 @@
 
 pkgname=compface
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Utils & libs to convert from/to X-Face format."
 arch=(i686 x86_64)
 url="http://ftp.xemacs.org/pub/xemacs/aux/"
+license=('custom')
 depends=('glibc')
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('62f4f79c0861ad292ba3cf77b4c48319')
+source=($url/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('62f4f79c0861ad292ba3cf77b4c48319' '27a0d5a4d695e68b4d3eebe17db77189')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr || return 1
   make || return 1
-  mkdir -p /$startdir/pkg/usr/{man/man{1,3},bin,include,lib}
-  make prefix=$startdir/pkg/usr install
+  make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \
+    INCLUDEDIR=$pkgdir/usr/include install || return 1
+  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 # vim: ts=2 sw=2 et ft=sh




More information about the arch-commits mailing list