Date: Friday, November 9, 2018 @ 13:55:53
Author: jelle
Revision: 338452
archrelease: copy trunk to extra-x86_64
Added:
compface/repos/extra-x86_64/LICENSE
(from rev 338451, compface/trunk/LICENSE)
compface/repos/extra-x86_64/PKGBUILD
(from rev 338451, compface/trunk/PKGBUILD)
compface/repos/extra-x86_64/compface-1.5.2-build.patch
(from rev 338451, compface/trunk/compface-1.5.2-build.patch)
Deleted:
compface/repos/extra-x86_64/LICENSE
compface/repos/extra-x86_64/PKGBUILD
compface/repos/extra-x86_64/compface-1.5.2-build.patch
----------------------------+
LICENSE | 188 +++++++++++++++++++++----------------------
PKGBUILD | 77 ++++++++---------
compface-1.5.2-build.patch | 164 ++++++++++++++++++-------------------
3 files changed, 214 insertions(+), 215 deletions(-)
Deleted: LICENSE
===================================================================
--- LICENSE 2018-11-09 13:55:37 UTC (rev 338451)
+++ LICENSE 2018-11-09 13:55:53 UTC (rev 338452)
@@ -1,94 +0,0 @@
-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 <[email protected]>
-> 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 [email protected] 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 <[email protected]>
-> 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 [email protected] Canberra ACT 0200
Australia
Copied: compface/repos/extra-x86_64/LICENSE (from rev 338451,
compface/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2018-11-09 13:55:53 UTC (rev 338452)
@@ -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 <[email protected]>
+> 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 [email protected] 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 <[email protected]>
+> 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 [email protected] Canberra ACT 0200
Australia
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-09 13:55:37 UTC (rev 338451)
+++ PKGBUILD 2018-11-09 13:55:53 UTC (rev 338452)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <[email protected]>
-# Contributor: simo <[email protected]>
-# Contributor: Manolis Tzanidakis
-
-pkgname=compface
-pkgver=1.5.2
-pkgrel=7
-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
- http://mirrors.ibiblio.org/xemacs/aux/$pkgname-$pkgver.tar.gz
- compface-1.5.2-build.patch
- LICENSE)
-md5sums=('62f4f79c0861ad292ba3cf77b4c48319'
- '25874b31f97a53f66ceed54f6b422515'
- '27a0d5a4d695e68b4d3eebe17db77189')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np0 -i ${srcdir}/compface-1.5.2-build.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- CFLAGS="$CFLAGS -fPIC"
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" STRIP=/bin/true install
-
- install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
Copied: compface/repos/extra-x86_64/PKGBUILD (from rev 338451,
compface/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-11-09 13:55:53 UTC (rev 338452)
@@ -0,0 +1,38 @@
+# Maintainer: AndyRTR <[email protected]>
+# Contributor: simo <[email protected]>
+# Contributor: Manolis Tzanidakis
+
+pkgname=compface
+pkgver=1.5.2
+pkgrel=8
+pkgdesc="Utils & libs to convert from/to X-Face format."
+arch=('x86_64')
+url="http://ftp.xemacs.org/pub/xemacs/aux/";
+license=('custom')
+depends=('glibc')
+source=(#$url/$pkgname-$pkgver.tar.gz
+ http://mirrors.ibiblio.org/xemacs/aux/$pkgname-$pkgver.tar.gz
+ compface-1.5.2-build.patch
+ LICENSE)
+md5sums=('62f4f79c0861ad292ba3cf77b4c48319'
+ '25874b31f97a53f66ceed54f6b422515'
+ '27a0d5a4d695e68b4d3eebe17db77189')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np0 -i ${srcdir}/compface-1.5.2-build.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ CFLAGS="$CFLAGS -fPIC"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" STRIP=/bin/true install
+
+ install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: compface-1.5.2-build.patch
===================================================================
--- compface-1.5.2-build.patch 2018-11-09 13:55:37 UTC (rev 338451)
+++ compface-1.5.2-build.patch 2018-11-09 13:55:53 UTC (rev 338452)
@@ -1,82 +0,0 @@
-o Build shared library, link tools against it
-o Make it possible to prevent stripping
-o Add DESTDIR support
-
---- Makefile.in~ 2005-10-04 15:59:49.000000000 +0300
-+++ Makefile.in 2006-08-02 22:23:07.000000000 +0300
-@@ -15,6 +15,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- SHELL = /bin/sh
-+STRIP = strip
-
- NAME = compface
- UNNAME = uncompface
-@@ -25,6 +26,7 @@
- UNEXECUTABLE = $(BINDIR)/$(UNNAMEEXE)
- LIBNAME = lib$(NAME).a
- LIBRARY = $(LIBDIR)/$(LIBNAME)
-+SHLIBNAME = lib$(NAME).so
- MAN1DIR = $(MANDIR)/man1
- MAN3DIR = $(MANDIR)/man3
- OBJECTS = arith.o file.o compress.o gen.o uncompface.o
-@@ -45,11 +47,11 @@
-
- all: $(NAMEEXE) $(UNNAMEEXE)
-
--$(NAMEEXE) : cmain.o compface.o $(LIBNAME)
-- $(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME)
-+$(NAMEEXE) : cmain.o compface.o $(SHLIBNAME)
-+ $(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME)
-
--$(UNNAMEEXE) : uncmain.o $(LIBNAME)
-- $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
-+$(UNNAMEEXE) : uncmain.o $(SHLIBNAME)
-+ $(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME)
-
- $(LIBNAME) : $(OBJECTS)
- ar rc $(LIBNAME) $(OBJECTS)
-@@ -73,25 +75,28 @@
- tar chzf `cat .fname`.tar.gz `cat .fname`
- $(RM) -rf `cat .fname` .fname
-
--install: $(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
-- $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR)
$(INCLUDEDIR)
-- $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE)
-- -chmod 0755 $(EXECUTABLE)
-- -strip $(EXECUTABLE)
-- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
-- -chmod 0755 $(UNEXECUTABLE)
-- -strip $(UNEXECUTABLE)
-- $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
-- cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1
$(UNNAME).1
-- $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
-- cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3
$(UNNAME).3
-- for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA)
$(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
-- $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
-+install: $(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME)
-+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR)
-+ $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE)
-+ -$(STRIP) $(DESTDIR)$(EXECUTABLE)
-+ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE)
$(DESTDIR)$(UNEXECUTABLE)
-+ -$(STRIP) $(DESTDIR)$(UNEXECUTABLE)
-+ $(INSTALL_DATA) $(srcdir)/$(NAME).1
$(DESTDIR)$(MAN1DIR)/$(NAME).1
-+ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S)
$(NAME).1 $(UNNAME).1
-+ $(INSTALL_DATA) $(srcdir)/$(NAME).3
$(DESTDIR)$(MAN3DIR)/$(NAME).3
-+ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S)
$(NAME).3 $(UNNAME).3
-+ for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA)
$(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
-+ $(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME)
$(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0
-+ $(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1
-+ $(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME)
-
- shar :
- shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
- compress $(NAME).sh
-
-+$(SHLIBNAME): $(OBJECTS)
-+ $(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME)
$(OBJECTS)
-+
- .c.o:
- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
-
-
Copied: compface/repos/extra-x86_64/compface-1.5.2-build.patch (from rev
338451, compface/trunk/compface-1.5.2-build.patch)
===================================================================
--- compface-1.5.2-build.patch (rev 0)
+++ compface-1.5.2-build.patch 2018-11-09 13:55:53 UTC (rev 338452)
@@ -0,0 +1,82 @@
+o Build shared library, link tools against it
+o Make it possible to prevent stripping
+o Add DESTDIR support
+
+--- Makefile.in~ 2005-10-04 15:59:49.000000000 +0300
++++ Makefile.in 2006-08-02 22:23:07.000000000 +0300
+@@ -15,6 +15,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ SHELL = /bin/sh
++STRIP = strip
+
+ NAME = compface
+ UNNAME = uncompface
+@@ -25,6 +26,7 @@
+ UNEXECUTABLE = $(BINDIR)/$(UNNAMEEXE)
+ LIBNAME = lib$(NAME).a
+ LIBRARY = $(LIBDIR)/$(LIBNAME)
++SHLIBNAME = lib$(NAME).so
+ MAN1DIR = $(MANDIR)/man1
+ MAN3DIR = $(MANDIR)/man3
+ OBJECTS = arith.o file.o compress.o gen.o uncompface.o
+@@ -45,11 +47,11 @@
+
+ all: $(NAMEEXE) $(UNNAMEEXE)
+
+-$(NAMEEXE) : cmain.o compface.o $(LIBNAME)
+- $(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME)
++$(NAMEEXE) : cmain.o compface.o $(SHLIBNAME)
++ $(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME)
+
+-$(UNNAMEEXE) : uncmain.o $(LIBNAME)
+- $(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
++$(UNNAMEEXE) : uncmain.o $(SHLIBNAME)
++ $(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME)
+
+ $(LIBNAME) : $(OBJECTS)
+ ar rc $(LIBNAME) $(OBJECTS)
+@@ -73,25 +75,28 @@
+ tar chzf `cat .fname`.tar.gz `cat .fname`
+ $(RM) -rf `cat .fname` .fname
+
+-install: $(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
+- $(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR)
$(INCLUDEDIR)
+- $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE)
+- -chmod 0755 $(EXECUTABLE)
+- -strip $(EXECUTABLE)
+- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+- -chmod 0755 $(UNEXECUTABLE)
+- -strip $(UNEXECUTABLE)
+- $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+- cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1
$(UNNAME).1
+- $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+- cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3
$(UNNAME).3
+- for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA)
$(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+- $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++install: $(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME)
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
$(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE)
++ -$(STRIP) $(DESTDIR)$(EXECUTABLE)
++ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE)
$(DESTDIR)$(UNEXECUTABLE)
++ -$(STRIP) $(DESTDIR)$(UNEXECUTABLE)
++ $(INSTALL_DATA) $(srcdir)/$(NAME).1
$(DESTDIR)$(MAN1DIR)/$(NAME).1
++ cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S)
$(NAME).1 $(UNNAME).1
++ $(INSTALL_DATA) $(srcdir)/$(NAME).3
$(DESTDIR)$(MAN3DIR)/$(NAME).3
++ cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S)
$(NAME).3 $(UNNAME).3
++ for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA)
$(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++ $(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME)
$(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0
++ $(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1
++ $(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME)
+
+ shar :
+ shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
+ compress $(NAME).sh
+
++$(SHLIBNAME): $(OBJECTS)
++ $(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME)
$(OBJECTS)
++
+ .c.o:
+ $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+
+
