r45655 - in /packages/scilab/branches/5.4/debian: changelog control rules scilab.install

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Mar 22 14:00:58 2013
New Revision: 45655

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45655
Log:
* Also install bin/scinotes & bin/xcos
* Sync of the Ubuntu changes
* Made build infrastructure multiarch-aware, fixing FTBFS.

Modified:
    packages/scilab/branches/5.4/debian/changelog
    packages/scilab/branches/5.4/debian/control
    packages/scilab/branches/5.4/debian/rules
    packages/scilab/branches/5.4/debian/scilab.install

Modified: packages/scilab/branches/5.4/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/changelog?rev=45655&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/changelog (original)
+++ packages/scilab/branches/5.4/debian/changelog Fri Mar 22 14:00:58 2013
@@ -1,3 +1,13 @@
+scilab (5.4.1~git20130321-2df5f3a-1~exp2) experimental; urgency=low
+
+  * Also install bin/scinotes & bin/xcos
+  * Sync of the Ubuntu changes
+
+  [ Daniel T Chen ]
+  * Made build infrastructure multiarch-aware, fixing FTBFS.
+
+ --
+
 scilab (5.4.1~git20130321-2df5f3a-1~exp1) experimental; urgency=low
 
   * New snapshot release

Modified: packages/scilab/branches/5.4/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/control?rev=45655&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/control (original)
+++ packages/scilab/branches/5.4/debian/control Fri Mar 22 14:00:58 2013
@@ -6,7 +6,7 @@
 Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran,
  default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
  tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev,
- gettext, libreadline-dev, pkg-config, procps,
+ gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0),
 # numerical libraries
  libblas-dev | librefblas3-dev | libatlas-base-dev, liblapack-dev,
  libarpack2-dev (>= 3.0),

Modified: packages/scilab/branches/5.4/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/rules?rev=45655&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/rules (original)
+++ packages/scilab/branches/5.4/debian/rules Fri Mar 22 14:00:58 2013
@@ -5,6 +5,7 @@
 
 # Detect the arch (with the naming of Sun)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 archdir_map	:= amd64=amd64 i386=i386 lpia=i386 powerpc=ppc sparc=sparc ia64=ia64 armel=arm mips=mips mipsel=mipsel
 archdir		:= $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
@@ -15,7 +16,8 @@
 DEB_CONFIGURE_NORMAL_ARGS += --prefix=$(DEB_CONFIGURE_PREFIX) \
 	--with-pvm --with-fftw --enable-relocatable \
 	--with-umfpack --enable-build-localization \
-	--with-install-help-xml --enable-build-help
+	--with-install-help-xml --enable-build-help \
+	--with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH)
 #	--enable-compilation-tests
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"

Modified: packages/scilab/branches/5.4/debian/scilab.install
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.4/debian/scilab.install?rev=45655&op=diff
==============================================================================
--- packages/scilab/branches/5.4/debian/scilab.install (original)
+++ packages/scilab/branches/5.4/debian/scilab.install Fri Mar 22 14:00:58 2013
@@ -1,4 +1,6 @@
-debian/tmp/usr/bin/scilab
-debian/tmp/usr/bin/scilab-adv-cli
+usr/bin/scilab
+usr/bin/scilab-adv-cli
+usr/bin/scinotes
+usr/bin/xcos
 desktop/scilab.desktop		usr/share/applications
 desktop/scilab-adv-cli.desktop		usr/share/applications