r35335 - in /packages/scilab/trunk/debian: control patches/link-doc.diff patches/link.diff patches/malloc.diff patches/series

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Wed Nov 19 17:28:12 UTC 2008 

Author: sylvestre-guest
Date: Wed Nov 19 17:28:12 2008
New Revision: 35335

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35335
Log:
Disable the custom malloc ... force the build of the doc in french ... old dep removed

Added:
    packages/scilab/trunk/debian/patches/link-doc.diff   (contents, props changed)
      - copied, changed from r35327, packages/scilab/trunk/debian/patches/link.diff
    packages/scilab/trunk/debian/patches/malloc.diff
Removed:
    packages/scilab/trunk/debian/patches/link.diff
Modified:
    packages/scilab/trunk/debian/control
    packages/scilab/trunk/debian/patches/series

Modified: packages/scilab/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/control?rev=35335&op=diff
==============================================================================
--- packages/scilab/trunk/debian/control (original)
+++ packages/scilab/trunk/debian/control Wed Nov 19 17:28:12 2008
@@ -4,7 +4,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>, Aurélien GÉRÔME <ag at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: autoconf, cdbs, debhelper (>= 5), cdbs, gfortran, g++, 
- java-gcj-compat-dev,  openjdk-6-jdk, chrpath, ocaml-nox
+ openjdk-6-jdk, chrpath, ocaml-nox
  quilt, tcl8.5-dev, tk8.5-dev, libxml2-dev, libpcre3-dev, 
  gettext, libreadline-dev, 
 # numerical library

Copied: packages/scilab/trunk/debian/patches/link-doc.diff (from r35327, packages/scilab/trunk/debian/patches/link.diff)
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/link-doc.diff?rev=35335&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/link.diff (original)
+++ packages/scilab/trunk/debian/patches/link-doc.diff Wed Nov 19 17:28:12 2008
@@ -1,5 +1,6 @@
---- /data/scilab-5.0.3.orig/Makefile.am	2008-11-05 18:42:13.000000000 +0100
-+++ scilab-5.0.3/Makefile.am	2008-11-12 15:08:45.000000000 +0100
+diff -u plop/scilab-5.0.3.orig/Makefile.am scilab-5.0.3/Makefile.am
+--- plop/scilab-5.0.3.orig/Makefile.am	2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/Makefile.am	2008-11-20 02:49:33.000000000 +0100
 @@ -32,6 +32,7 @@
  scilab_bin_LDADD = $(top_builddir)/modules/libscilab.la \
  $(top_builddir)/modules/shell/libscishell.la \
@@ -8,8 +9,25 @@
  $(top_builddir)/modules/core/libscicore.la
  
  if NEED_JAVA
---- /data/scilab-5.0.3.orig/Makefile.in	2008-11-05 18:42:13.000000000 +0100
-+++ scilab-5.0.3/Makefile.in	2008-11-12 15:09:19.000000000 +0100
+@@ -104,11 +105,11 @@
+ 	- at if test -x $(top_builddir)/scilab-bin; then \
+ 		cd $(top_builddir);\
+ 		echo "-- Building documentation (English) --"; \
+-		echo "$(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e \"xmltojar();exit;\"";\
+-		DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
++		echo "LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar();exit;\"";\
++		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
+ 		echo "-- Building documentation (French) --"; \
+-		echo "$(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e \"xmltojar();exit;\""; \
+-		DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
++		echo "SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"setlanguage('fr'); xmltojar();exit;\""; \
++		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "setlanguage('fr'); xmltojar();exit;"; \
+ 	else \
+ 		echo "Cannot find Scilab binary"; \
+ 	fi
+diff -u plop/scilab-5.0.3.orig/Makefile.in scilab-5.0.3/Makefile.in
+--- plop/scilab-5.0.3.orig/Makefile.in	2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/Makefile.in	2008-11-20 02:47:43.000000000 +0100
 @@ -93,6 +93,7 @@
  scilab_bin_DEPENDENCIES = $(top_builddir)/modules/libscilab.la \
  	$(top_builddir)/modules/shell/libscishell.la \
@@ -26,3 +44,19 @@
  $(top_builddir)/modules/core/libscicore.la
  
  #	$(X_EXTRA_LIBS) -lXt -lX11 -lSM -lGLU
+@@ -1093,11 +1095,11 @@
+ @BUILD_HELP_TRUE@	- at if test -x $(top_builddir)/scilab-bin; then \
+ @BUILD_HELP_TRUE@		cd $(top_builddir);\
+ @BUILD_HELP_TRUE@		echo "-- Building documentation (English) --"; \
+- at BUILD_HELP_TRUE@		echo "$(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e \"xmltojar();exit;\"";\
+- at BUILD_HELP_TRUE@		DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "xmltojar();exit;";\
++ at BUILD_HELP_TRUE@		echo "LANG=C SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar();exit;\"";\
++ at BUILD_HELP_TRUE@		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l en_US -nouserstartup -nw -e "//xmltojar();exit;";\
+ @BUILD_HELP_TRUE@		echo "-- Building documentation (French) --"; \
+- at BUILD_HELP_TRUE@		echo "$(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e \"xmltojar();exit;\""; \
+- at BUILD_HELP_TRUE@		DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -l fr_FR -nouserstartup -nw -e "xmltojar();exit;"; \
++ at BUILD_HELP_TRUE@		echo "LANG=fr_FR SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e \"xmltojar();exit;\""; \
++ at BUILD_HELP_TRUE@		SCI_DISABLE_TK=1 DOCBOOK_ROOT=$(DOCBOOK_ROOT) $(top_builddir)/bin/scilab -nb -nouserstartup -nw -e "setlanguage('fr'); xmltojar();exit;"; \
+ @BUILD_HELP_TRUE@	else \
+ @BUILD_HELP_TRUE@		echo "Cannot find Scilab binary"; \
+ @BUILD_HELP_TRUE@	fi

Propchange: packages/scilab/trunk/debian/patches/link-doc.diff
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: packages/scilab/trunk/debian/patches/malloc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/malloc.diff?rev=35335&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/malloc.diff (added)
+++ packages/scilab/trunk/debian/patches/malloc.diff Wed Nov 19 17:28:12 2008
@@ -1,0 +1,96 @@
+diff -u scilab-5.0.3.orig/libs/MALLOC/Makefile.am scilab-5.0.3/libs/MALLOC/Makefile.am
+--- scilab-5.0.3.orig/libs/MALLOC/Makefile.am	2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/libs/MALLOC/Makefile.am	2008-11-19 22:51:28.000000000 +0100
+@@ -6,7 +6,7 @@
+ MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c 
+ 
+ if IS_64_BITS_CPU
+-MALLOC_C_SOURCES += src/malloc.c
++#MALLOC_C_SOURCES += src/malloc.c
+ endif
+ 
+ libscimalloc_la_includedir=$(pkgincludedir)/malloc
+Only in scilab-5.0.3/libs/MALLOC/: Makefile.am~
+diff -u scilab-5.0.3.orig/libs/MALLOC/Makefile.in scilab-5.0.3/libs/MALLOC/Makefile.in
+--- scilab-5.0.3.orig/libs/MALLOC/Makefile.in	2008-11-05 18:42:13.000000000 +0100
++++ scilab-5.0.3/libs/MALLOC/Makefile.in	2008-11-19 22:51:37.000000000 +0100
+@@ -54,10 +54,9 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at IS_64_BITS_CPU_TRUE@am__append_1 = src/malloc.c
+ DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
+- at NEED_JAVA_TRUE@am__append_2 = java
++ at NEED_JAVA_TRUE@am__append_1 = java
+ subdir = libs/MALLOC
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
+@@ -88,12 +87,9 @@
+ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ libscimalloc_la_DEPENDENCIES =
+-am__libscimalloc_la_SOURCES_DIST = src/sci_mem_alloc.c \
+-	src/getmaxMALLOC.c src/malloc.c
+- at IS_64_BITS_CPU_TRUE@am__objects_1 = libscimalloc_la-malloc.lo
+-am__objects_2 = libscimalloc_la-sci_mem_alloc.lo \
+-	libscimalloc_la-getmaxMALLOC.lo $(am__objects_1)
+-am_libscimalloc_la_OBJECTS = $(am__objects_2)
++am__objects_1 = libscimalloc_la-sci_mem_alloc.lo \
++	libscimalloc_la-getmaxMALLOC.lo
++am_libscimalloc_la_OBJECTS = $(am__objects_1)
+ libscimalloc_la_OBJECTS = $(am_libscimalloc_la_OBJECTS)
+ libscimalloc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimalloc_la_CFLAGS) \
+@@ -111,7 +107,7 @@
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ SOURCES = $(libscimalloc_la_SOURCES)
+-DIST_SOURCES = $(am__libscimalloc_la_SOURCES_DIST)
++DIST_SOURCES = $(libscimalloc_la_SOURCES)
+ libscimalloc_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(libscimalloc_la_include_HEADERS)
+ ETAGS = etags
+@@ -308,8 +304,9 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c \
+-	$(am__append_1)
++MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c 
++
++#MALLOC_C_SOURCES += src/malloc.c
+ libscimalloc_la_includedir = $(pkgincludedir)/malloc
+ libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
+ includes/MALLOC.h \
+@@ -333,7 +330,7 @@
+ #### the procedure will be the same with Microsoft Windows (C)
+ #### and Linux/Unix
+ #######################################################################
+-TARGETS_ALL = $(am__append_2)
++TARGETS_ALL = $(am__append_1)
+ 
+ ################ MACROS ######################
+ # Rule to build a macro
+@@ -444,7 +441,6 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libscimalloc_la-getmaxMALLOC.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libscimalloc_la-malloc.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libscimalloc_la-sci_mem_alloc.Plo at am__quote@
+ 
+ .c.o:
+@@ -482,13 +478,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-getmaxMALLOC.lo `test -f 'src/getmaxMALLOC.c' || echo '$(srcdir)/'`src/getmaxMALLOC.c
+ 
+-libscimalloc_la-malloc.lo: src/malloc.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -MT libscimalloc_la-malloc.lo -MD -MP -MF $(DEPDIR)/libscimalloc_la-malloc.Tpo -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' || echo '$(srcdir)/'`src/malloc.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libscimalloc_la-malloc.Tpo $(DEPDIR)/libscimalloc_la-malloc.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/malloc.c' object='libscimalloc_la-malloc.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimalloc_la_CFLAGS) $(CFLAGS) -c -o libscimalloc_la-malloc.lo `test -f 'src/malloc.c' || echo '$(srcdir)/'`src/malloc.c
+-
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 

Modified: packages/scilab/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/series?rev=35335&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/series (original)
+++ packages/scilab/trunk/debian/patches/series Wed Nov 19 17:28:12 2008
@@ -3,6 +3,6 @@
 addchapter.diff
 adddemo.diff
 docbook.diff
-link.diff
+link-doc.diff
 misctcl.diff
-
+malloc.diff

More information about the debian-science-commits mailing list