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

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Wed Apr 16 16:02:49 2014
New Revision: 46631

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46631
Log:
(Closes: #738456) (LP: #1265929)
* Disable dh_autoreconf call. Disabling of libtool in dh_autoreconf is failing
It messes things up in Ubuntu with the weird Scilab library ordering stuff
(LP: #1307875)

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=46631&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Wed Apr 16 16:02:49 2014
@@ -1,13 +1,16 @@
 scilab (5.5.0-2) unstable; urgency=medium
 
   * Bring back the signal processing library (Don't know why it was missing)
-    (Closes: #738456)
+    (Closes: #738456) (LP: #1265929)
   * Bring back missing changelog items (Closes: #733279)
   * Restrict to the arch on which OpenJDK is available:
     amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
     (Partial Closes of #739235)
-
- -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 13 Apr 2014 13:07:21 +0200
+  * Disable dh_autoreconf call. Disabling of libtool in dh_autoreconf is failing
+    It messes things up in Ubuntu with the weird Scilab library ordering stuff
+    (LP: #1307875)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 16 Apr 2014 16:47:04 +0200
 
 scilab (5.5.0-1) unstable; urgency=medium
 

Modified: packages/scilab/branches/5.5/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/control?rev=46631&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/control	(original)
+++ packages/scilab/branches/5.5/debian/control	Wed Apr 16 16:02:49 2014
@@ -4,7 +4,6 @@
 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,
- dh-autoreconf,
  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),
@@ -107,7 +106,7 @@
 
 Package: scilab-include
 # any because of the bug #550243
-Architecture: amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
+Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Depends: ${misc:Depends}
 Description: Scientific software package for numerical computations (include files)
  Scilab is a matrix-based scientific software package.
@@ -128,7 +127,7 @@
 
 
 Package: scilab-minimal-bin
-Architecture: amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
+Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Depends: ${shlibs:Depends}, scilab-data (= ${source:Version}),
  ${misc:Depends}
 Replaces: scilab-bin, scilab-full-bin (<< 5.4.1-3)
@@ -153,7 +152,7 @@
  Please install the package "scilab" to have all features.
 
 Package: scilab-full-bin
-Architecture: amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
+Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Depends: ${shlibs:Depends}, scilab-minimal-bin (= ${binary:Version}),
  libflexdock-java (>= 1.2.3), libjogl2-java (>= 2.0-rc8), libjrosetta-java (>= 1.0.1),
  libjlatexmath-java (>= 1.0.2), libjlatexmath-fop-java (>= 1.0.2),
@@ -184,7 +183,7 @@
 
 
 Package: scilab-minimal-bin-dbg
-Architecture: amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
+Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Section: debug
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
@@ -208,7 +207,7 @@
  This package contains the architecture specific debugging symbols.
 
 Package: scilab-full-bin-dbg
-Architecture: amd64, armel, armhf, i386, mips, mipsel, powerpc, s390x, arm64, ppc64el
+Architecture: amd64 armel armhf i386 mips mipsel powerpc s390x arm64 ppc64el
 Section: debug
 Priority: extra
 Pre-Depends: ${dpkg:Depends}

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46631&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Wed Apr 16 16:02:49 2014
@@ -2,7 +2,6 @@
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 
 # Detect the arch (with the naming of Sun)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -52,8 +51,9 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = CHANGES_5.3.X CHANGES_5.4.X CHANGES_5.5.X
 
-#debian/stamp-autotools-files:
-#	autoreconf
+# Do not run libtoolize because it can mess up with Scilab library
+debian/stamp-autotools-files:
+	autoreconf
 
 common-install-arch::
 # Remove empty directories