r36167 - in /packages: code-saturne/trunk/debian/ libbft/trunk/debian/ libbft/trunk/debian/patches/ libmei/trunk/debian/ libmei/trunk/debian/patches/

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Sun Feb 14 16:56:04 UTC 2010 

Author: sylvestre
Date: Sun Feb 14 16:56:03 2010
New Revision: 36167

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36167
Log:
various modifs on code saturne and its dependencies

Added:
    packages/libbft/trunk/debian/patches/bft_file.diff
    packages/libmei/trunk/debian/patches/
    packages/libmei/trunk/debian/patches/mei_patch_lm.diff
    packages/libmei/trunk/debian/python-libmei.install
Removed:
    packages/libbft/trunk/debian/patches/libbft+kbsd.diff
Modified:
    packages/code-saturne/trunk/debian/changelog
    packages/code-saturne/trunk/debian/watch
    packages/libbft/trunk/debian/bft-config.1
    packages/libbft/trunk/debian/changelog
    packages/libbft/trunk/debian/control
    packages/libbft/trunk/debian/patches/series
    packages/libbft/trunk/debian/watch
    packages/libmei/trunk/debian/changelog
    packages/libmei/trunk/debian/control
    packages/libmei/trunk/debian/rules
    packages/libmei/trunk/debian/watch

Modified: packages/code-saturne/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/changelog?rev=36167&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/changelog (original)
+++ packages/code-saturne/trunk/debian/changelog Sun Feb 14 16:56:03 2010
@@ -1,3 +1,9 @@
+code-saturne (2.0.0.beta2-3) UNRELEASED; urgency=low
+
+  * watch file updated
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 14 Feb 2010 17:48:00 +0100
+
 code-saturne (2.0.0.beta2-2) unstable; urgency=low
 
   * VCS-*: Wrong links

Modified: packages/code-saturne/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-saturne/trunk/debian/watch?rev=36167&op=diff
==============================================================================
--- packages/code-saturne/trunk/debian/watch (original)
+++ packages/code-saturne/trunk/debian/watch Sun Feb 14 16:56:03 2010
@@ -1,2 +1,3 @@
 version=3
- http://rd.edf.com/the-edf-offers/research-and-development/softwares/code-saturne/code-saturne-download-107009.html .*/ncs-(\d)(\d)(\d)-(.*)\.tgz debian
+http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-80059.html \
+.*/ncs-(\d)(\d)(\d)-(.*)\.tgz debian

Modified: packages/libbft/trunk/debian/bft-config.1
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/bft-config.1?rev=36167&op=diff
==============================================================================
--- packages/libbft/trunk/debian/bft-config.1 (original)
+++ packages/libbft/trunk/debian/bft-config.1 Sun Feb 14 16:56:03 2010
@@ -28,7 +28,7 @@
 .RI [scope]
 .br
 .SH DESCRIPTION
-This script is a tool that is used to determine
+This script is a tool that is used to configure to determine
 the compiler and linker flags that should be used to compile
 and link programs that use
 .BR libbft .

Modified: packages/libbft/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/changelog?rev=36167&op=diff
==============================================================================
--- packages/libbft/trunk/debian/changelog (original)
+++ packages/libbft/trunk/debian/changelog Sun Feb 14 16:56:03 2010
@@ -1,15 +1,27 @@
-libbft (1.1.1-3) unstable; urgency=low
+libbft (1.1.2-5) UNRELEASED; urgency=low
 
-  * FTBFS on kfreebsd-i386 on HAVE_LONG_LONG. Thanks to Cyril Brulebois for 
-    the patch (Closes: #557891)
+  * Update of the watch file
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 25 Nov 2009 10:21:31 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 14 Feb 2010 17:46:26 +0100
 
-libbft (1.1.1-2) unstable; urgency=low
+libbft (1.1.2-4) experimental; urgency=low
 
-  * Missing dependency on zlib1g-dev (not mandatory for libbft but better)
+  * with the rule to patch bft_file.diff
 
- -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 24 Nov 2009 18:34:26 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 01 Feb 2010 15:41:19 +0100
+
+libbft (1.1.2-3) experimental; urgency=low
+
+  * Fix a FTBFS - bft_file.diff (Closes: #567687)
+  * Standards-Version updated to version 3.8.4
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 01 Feb 2010 14:19:28 +0100
+
+libbft (1.1.2-2) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 30 Jan 2010 16:57:12 +0100
 
 libbft (1.1.1-1) unstable; urgency=low
 

Modified: packages/libbft/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/control?rev=36167&op=diff
==============================================================================
--- packages/libbft/trunk/debian/control (original)
+++ packages/libbft/trunk/debian/control Sun Feb 14 16:56:03 2010
@@ -3,8 +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: debhelper (>= 7), autotools-dev, cdbs, zlib1g-dev, quilt
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, quilt
+Standards-Version: 3.8.4
 Homepage: http://www.code-saturne.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libbft/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/libbft/

Added: packages/libbft/trunk/debian/patches/bft_file.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/patches/bft_file.diff?rev=36167&op=file
==============================================================================
--- packages/libbft/trunk/debian/patches/bft_file.diff (added)
+++ packages/libbft/trunk/debian/patches/bft_file.diff Sun Feb 14 16:56:03 2010
@@ -1,0 +1,11 @@
+--- libbft-1.1.2.orig/src/bft_file.c	2010-01-19 14:49:32.000000000 +0100
++++ libbft-1.1.2/src/bft_file.c	2010-02-01 14:13:54.000000000 +0100
+@@ -1107,7 +1107,7 @@
+     long _offset = offset;
+ 
+     if (_offset == offset) {
+-      retval = fseek(f->sh, (long)offset, _whence);
++      retval = fseek(f->ptr, (long)offset, _whence);
+       if (retval != 0)
+         _bft_file_error(__FILE__, __LINE__, errno,
+                         _("Error setting position in file \"%s\":\n\n  %s"),

Modified: packages/libbft/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/patches/series?rev=36167&op=diff
==============================================================================
--- packages/libbft/trunk/debian/patches/series (original)
+++ packages/libbft/trunk/debian/patches/series Sun Feb 14 16:56:03 2010
@@ -1,3 +1,3 @@
-# Fix a FTBGS under kfreebsd-i386
-libbft+kbsd.diff
+# Fix a FTBFS
+bft_file.diff
 

Modified: packages/libbft/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/libbft/trunk/debian/watch?rev=36167&op=diff
==============================================================================
--- packages/libbft/trunk/debian/watch (original)
+++ packages/libbft/trunk/debian/watch Sun Feb 14 16:56:03 2010
@@ -1,3 +1,3 @@
 version=3
-
-http://rd.edf.com/the-edf-offers/research-and-development/softwares/code-saturne/code-saturne-download-107009.html .*/bft-(\d)(\d)(\d)\.tgz debian
+http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-80059.html \
+.*/bft-(\d)(\d)(\d)\.tgz debian

Modified: packages/libmei/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/changelog?rev=36167&op=diff
==============================================================================
--- packages/libmei/trunk/debian/changelog (original)
+++ packages/libmei/trunk/debian/changelog Sun Feb 14 16:56:03 2010
@@ -1,3 +1,18 @@
+libmei (1.0.1-3) UNRELEASED; urgency=low
+
+  * watch file updated
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 14 Feb 2010 17:49:24 +0100
+
+libmei (1.0.1-2) experimental; urgency=low
+
+  * Missing files 
+  * Missing detection of the libm. Thanks to David Monfort (mei_patch_lm.diff)
+  * Package python-libmei added with python bindings
+  * Standards-Version updated to version 3.8.4
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 09 Feb 2010 18:14:45 +0100
+
 libmei (1.0.1-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/libmei/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/control?rev=36167&op=diff
==============================================================================
--- packages/libmei/trunk/debian/control (original)
+++ packages/libmei/trunk/debian/control Sun Feb 14 16:56:03 2010
@@ -4,8 +4,8 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, cdbs, swig, libbft-dev (>= 1.1.2),
- python-dev
-Standards-Version: 3.8.3
+ python-dev, quilt
+Standards-Version: 3.8.4
 Homepage: http://www.code-saturne.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libmei/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/libmei/
@@ -32,6 +32,18 @@
  It is destined to be used by scientific codes (Computational Fluid
  Dynamics).
 
+Package: python-libmei
+Architecture: any
+Section: python
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: A Python language binding for libmei
+ MEI stands for Mathematical Expression Interpreter.
+ It is intended to provide interpretation of mathematical formula in a string.
+ It is destined to be used by scientific codes (Computational Fluid
+ Dynamics).
+ . 
+ This package contains the Python binding to libmei.
+
 Package: libmei0-dbg
 Section: debug
 Priority: extra

Added: packages/libmei/trunk/debian/patches/mei_patch_lm.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/patches/mei_patch_lm.diff?rev=36167&op=file
==============================================================================
--- packages/libmei/trunk/debian/patches/mei_patch_lm.diff (added)
+++ packages/libmei/trunk/debian/patches/mei_patch_lm.diff Sun Feb 14 16:56:03 2010
@@ -1,0 +1,13 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 30)
++++ configure.ac	(working copy)
+@@ -192,6 +192,8 @@
+ 
+ fi
+ 
++LIBS="${LIBS} -lm"
++
+ # Optional additional user flags
+ #-------------------------------
+ 

Added: packages/libmei/trunk/debian/python-libmei.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/python-libmei.install?rev=36167&op=file
==============================================================================
--- packages/libmei/trunk/debian/python-libmei.install (added)
+++ packages/libmei/trunk/debian/python-libmei.install Sun Feb 14 16:56:03 2010
@@ -1,0 +1,4 @@
+debian/tmp/usr/lib/python2.5/site-packages/mei/*.so*
+debian/tmp/usr/lib/python2.5/site-packages/mei/*.py
+debian/tmp/usr/lib/python2.5/site-packages/mei/*.a
+

Modified: packages/libmei/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/rules?rev=36167&op=diff
==============================================================================
--- packages/libmei/trunk/debian/rules (original)
+++ packages/libmei/trunk/debian/rules Sun Feb 14 16:56:03 2010
@@ -3,8 +3,13 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_NORMAL_ARGS += --with-bft-lib=/usr/lib/ 
+debian/stamp-autotools-files:
+	autoconf
+	touch $@
+
+DEB_DH_MAKESHLIBS_ARGS_python-libmei = -n
 
 # The website seems to break uscan - it simply does not find the
 # hyperlinks. That is why we are using wget here. :-(

Modified: packages/libmei/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/watch?rev=36167&op=diff
==============================================================================
--- packages/libmei/trunk/debian/watch (original)
+++ packages/libmei/trunk/debian/watch Sun Feb 14 16:56:03 2010
@@ -1,3 +1,3 @@
 version=3
-
-http://research.edf.com/the-edf-offers/research-and-development/softwares/code-saturne/code-saturne-download-107009.html .*/mei-(\d)(\d)(\d)\.tgz debian
+http://research.edf.com/research-and-the-scientific-community/softwares/code-saturne/download-80059.html \
+.*/mei-(\d)(\d)(\d)\.tgz debian

More information about the debian-science-commits mailing list