r46349 - in /packages/scilab/branches/5.5/debian: changelog control rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Fri Oct 25 00:00:34 2013
New Revision: 46349

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46349
Log:
* Only use gcc 4.7
* Also ship CHANGES_5.5.X

Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/control
    packages/scilab/branches/5.5/debian/rules

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46349&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Fri Oct 25 00:00:34 2013
@@ -1,3 +1,10 @@
+scilab (5.5.0~beta-1-1~exp3) experimental; urgency=low
+
+  * Only use gcc 4.7
+  * Also ship CHANGES_5.5.X
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 25 Oct 2013 01:20:09 +0200
+
 scilab (5.5.0~beta-1-1~exp2) experimental; urgency=low
 
   * Force the usage of gfortran 4.7

Modified: packages/scilab/branches/5.5/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/control?rev=46349&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/control	(original)
+++ packages/scilab/branches/5.5/debian/control	Fri Oct 25 00:00:34 2013
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: autoconf, automake, cdbs, debhelper (>= 7), gfortran-4.7,
+Build-Depends: autoconf, automake, cdbs, debhelper (>= 7),
+ gfortran-4.7, g++-4.7, gcc-4.7,
  default-jdk, chrpath, ocaml-nox (>= 3.11.2-3), fakeroot,
  tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, libcurl4-openssl-dev,
  gettext, libreadline-dev, pkg-config, procps, dpkg-dev (>= 1.16.0),

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46349&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Fri Oct 25 00:00:34 2013
@@ -18,7 +18,8 @@
 	--with-umfpack --enable-build-localization \
 	--with-install-help-xml --enable-build-help \
 	--with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-mpi --disable-static-system-lib F77=gfortran-4.7
+	--enable-mpi --disable-static-system-lib \
+	F77=gfortran-4.7 CC=gcc-4.7 CXX=g++-4.7
 #	--enable-compilation-tests
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"
@@ -44,7 +45,7 @@
 DEB_DH_SHLIBDEPS_ARGS_scilab-full-bin = -Xusr/lib/jni/libjavasci.so
 #DEB_MAKE_CHECK_TARGET = check
 
-DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X
+DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X CHANGES_5.5.X
 
 #debian/stamp-autotools-files:
 #	autoreconf