Merge lp:~noskcaj/ubuntu/trusty/clisp/ftbfs into lp:ubuntu/trusty/clisp

[Jackson Doak]

Fixes ftbfs. We should probably enable PPC64el and arm64 support too.

[Daniel Holbach (dholbach)]

Thanks a lot. Uploaded.

review: Approve

Unmerged revisions

24. By Jackson Doak on 2014-04-02

Remove positive build-depends for s390x. Fixes ftbfs. LP: #1264891

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-01 23:26:46 +0000
+++ debian/changelog	2014-04-02 22:06:52 +0000
@@ -1,8 +1,16 @@
-clisp (1:2.49-8.2build1) trusty; urgency=low
-
-  * No change rebuild against db 5.3.
-
- -- Dmitrijs Ledkovs <[e-mail]>  Fri, 01 Nov 2013 23:26:46 +0000
+clisp (1:2.49-9ubuntu1) trusty; urgency=medium
+
+  * Remove positive build-depends for s390x. Fixes ftbfs. LP: #1264891
+
+ -- Jackson Doak <[e-mail]>  Thu, 03 Apr 2014 07:41:26 +1100
+
+clisp (1:2.49-9) unstable; urgency=medium
+
+  * Enable FFI on arm*
+  * Import patch from Roland Stigge adding support for powerpcspe
+    (Closes: #731648)
+
+ -- Christoph Egger <[e-mail]>  Mon, 23 Dec 2013 20:21:22 +0100
 
 clisp (1:2.49-8.2) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-11-01 23:26:46 +0000
+++ debian/control	2014-04-02 22:06:52 +0000
@@ -1,10 +1,9 @@
 Source: clisp
 Section: lisp
 Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Debian Common Lisp Team <[e-mail]>
+Maintainer: Debian Common Lisp Team <[e-mail]>
 Uploaders: Peter Van Eynde <[e-mail]>, Christoph Egger <[e-mail]>
-Build-Depends: debhelper (>> 7), gettext, bison, libncurses5-dev, groff, libx11-dev, libxext-dev, libxpm-dev, libsigsegv-dev (>= 2.8), libreadline-gplv2-dev, dh-lisp (>= 0.7.1), libdb-dev, libffcall1-dev , libgdbm-dev , libpq-dev [ !armel !armhf !hppa !ia64 !m68k !s390 !mipsel !powerpc], libpcre3-dev, libdbus-1-dev [ !armel !armhf !hppa !ia64 !m68k !s390 !mipsel !powerpc], zlib1g-dev [ !armel !armhf !hppa !ia64 !m68k !s390 !mipsel !powerpc]
+Build-Depends: debhelper (>> 7), gettext, bison, libncurses5-dev, groff, libx11-dev, libxext-dev, libxpm-dev, libsigsegv-dev (>= 2.8), libreadline-gplv2-dev, dh-lisp (>= 0.7.1), libdb-dev, libffcall1-dev , libgdbm-dev , libpq-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe], libpcre3-dev, libdbus-1-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe], zlib1g-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe]
 Build-Conflicts: libsigsegv-dev (<= 2.8), libreadline6-dev
 Standards-Version: 3.9.1.0
 Homepage: http://www.clisp.org/
@@ -12,7 +11,7 @@
 Vcs-Browser: http://git.debian.org/?p=pkg-common-lisp/clisp.git;a=summary
 
 Package: clisp
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390 sparc
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x sparc
 Pre-Depends: ${xlibs:PreDepends}
 Conflicts: clisp-dev (<< 1:2.49-2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,7 +40,7 @@
  GNU CLISP runs Maxima, ACL2 and many other Common Lisp packages.
 
 Package: clisp-dev
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390 sparc
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x sparc
 Depends: clisp, ${misc:Depends}
 Description: GNU CLISP, a Common Lisp implementation (development files)
  This is the link kit of clisp, it can be used to add external modules (written
@@ -79,70 +78,70 @@
 
 
 Package: clisp-module-berkeley-db
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds an interface to Berkeley DB
  This adds a module to clisp that implements an interface to the 
  Berkeley DB.
 
 Package: clisp-module-pcre
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds libpcre support
  This adds a module to clisp that implements an interface to the 
  libpcre which implements Perl-compatible regular expressions. 
 
 Package: clisp-module-bindings-glibc 
-Architecture: alpha amd64 i386 mips kfreebsd-i386 kfreebsd-amd64 hurd-i386 
+Architecture: alpha amd64 armel armhf armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds the glibc bindings
  This adds a module to clisp that implements an interface to the 
  glibc library, adding support for a number of low level functions.
 
 Package: clisp-module-postgresql
-Architecture: alpha amd64 i386 mips kfreebsd-i386 kfreebsd-amd64 hurd-i386 
+Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds a PostgreSQL interface
  This adds a module to clisp that implements an interface to the 
  PostgreSQL DB using the C bindings.
 
 Package: clisp-module-clx	      
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds X11 bindings
  This adds a module to clisp that implements an interface to the 
  X11 called CLX.
 
 Package: clisp-module-rawsock
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds a low level socket interface
  This adds a module to clisp that implements an interface to the 
  socket interfaces.
 
 Package: clisp-module-dbus	      
-Architecture: alpha amd64 i386 mips kfreebsd-i386 kfreebsd-amd64 hurd-i386 
+Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds an interface to D-Bus
  This adds a module to clisp that implements an interface to the 
  D-Bus system.
 
 Package: clisp-module-wildcard
-Architecture: alpha amd64 i386 mips kfreebsd-i386 kfreebsd-amd64 hurd-i386 
+Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds wildcard matching
  This adds a module to clisp that implements a wildcard matching, also
  called shell globbing.
 
 Package: clisp-module-gdbm	      
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 m68k hurd-i386 s390
+Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds an interface to GNU DBM
  This adds a module to clisp that implements an interface to
  GNU DBM.
 
 Package: clisp-module-zlib
-Architecture: alpha amd64 i386 mips kfreebsd-i386 kfreebsd-amd64 hurd-i386 
+Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 
 Depends: ${shlibs:Depends}, clisp, ${misc:Depends}
 Description: clisp module that adds zlib support for vectors
  This adds a module to clisp that implements a zlib interface,

=== modified file 'debian/rules'
--- debian/rules	2013-05-07 20:39:13 +0000
+++ debian/rules	2014-04-02 22:06:52 +0000
@@ -29,7 +29,7 @@
 	 CFLAGS:=-marm ${CFLAGS}
 endif
 
-ifneq (,$(filter armel armhf hppa ia64 m68k s390 mipsel powerpc,$(DEB_BUILD_ARCH)))
+ifneq (,$(filter hppa ia64 m68k s390 mipsel powerpc powerpcspe,$(DEB_BUILD_ARCH)))
         # Disable FFI
         FFI:=--without-dynamic-ffi
         MODULES:=--with-module=gdbm --with-module=berkeley-db --with-module=pcre --with-module=rawsock --with-module=clx/new-clx