r35757 - in /packages/libcgns/trunk/debian: TODO cgns-convert.install changelog control patches/destdir.diff patches/soname.diff rules
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Tue Jun 9 14:40:53 UTC 2009
Author: sylvestre-guest
Date: Tue Jun 9 14:40:53 2009
New Revision: 35757
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35757
Log:
[ Oliver Borm ]
* Installed now more needed header files.
* Packaged the adf2hdf and hdf2adf converters into cgns-convert
* Linked the libcgns against libhdf5
[ Sylvestre Ledru ]
* Merge the different changes of Oliver Borm (Closes: #529971)
* Standards-Version updated to 3.8.1
* Strip adf2hdf and hdf2adf binaries
* ${misc:Depends} added to make lintian happy
Added:
packages/libcgns/trunk/debian/cgns-convert.install
Modified:
packages/libcgns/trunk/debian/TODO
packages/libcgns/trunk/debian/changelog
packages/libcgns/trunk/debian/control
packages/libcgns/trunk/debian/patches/destdir.diff
packages/libcgns/trunk/debian/patches/soname.diff
packages/libcgns/trunk/debian/rules
Modified: packages/libcgns/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/TODO?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/TODO (original)
+++ packages/libcgns/trunk/debian/TODO Tue Jun 9 14:40:53 2009
@@ -1,2 +1,1 @@
Package the lib as static too
-package the tool provided (adf2hdf, hdf2adf)
Added: packages/libcgns/trunk/debian/cgns-convert.install
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/cgns-convert.install?rev=35757&op=file
==============================================================================
--- packages/libcgns/trunk/debian/cgns-convert.install (added)
+++ packages/libcgns/trunk/debian/cgns-convert.install Tue Jun 9 14:40:53 2009
@@ -1,0 +1,1 @@
+debian/tmp/usr/bin/*
Modified: packages/libcgns/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/changelog?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/changelog (original)
+++ packages/libcgns/trunk/debian/changelog Tue Jun 9 14:40:53 2009
@@ -1,3 +1,18 @@
+libcgns (2.5.3-2) unstable; urgency=low
+
+ [ Oliver Borm ]
+ * Installed now more needed header files.
+ * Packaged the adf2hdf and hdf2adf converters into cgns-convert
+ * Linked the libcgns against libhdf5
+
+ [ Sylvestre Ledru ]
+ * Merge the different changes of Oliver Borm (Closes: #529971)
+ * Standards-Version updated to 3.8.1
+ * Strip adf2hdf and hdf2adf binaries
+ * ${misc:Depends} added to make lintian happy
+
+ -- Sylvestre Ledru <sylvestre.ledru at inria.fr> Tue, 09 Jun 2009 16:10:47 +0200
+
libcgns (2.5.3-1) unstable; urgency=low
* Initial release (Closes: #501924)
Modified: packages/libcgns/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/control?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/control (original)
+++ packages/libcgns/trunk/debian/control Tue Jun 9 14:40:53 2009
@@ -4,9 +4,9 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre.ledru at inria.fr>,
Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, quilt, libhdf5-serial-dev,
- chrpath
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, quilt,
+ libhdf5-serial-dev, chrpath
+Standards-Version: 3.8.1
Homepage: http://cgns.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libcgns/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/libcgns/
@@ -15,7 +15,7 @@
Package: libcgns-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, libcgns2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libcgns2 (= ${binary:Version}), ${misc:Depends}
Description: CFD General Notation System library
The CFD General Notation System (CGNS) provides a general, portable, and
extensible standard for the storage and retrieval of computational fluid
@@ -30,7 +30,7 @@
Package: libcgns2
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: CFD General Notation System library
The CFD General Notation System (CGNS) provides a general, portable, and
extensible standard for the storage and retrieval of computational fluid
@@ -41,10 +41,10 @@
Astronautics (AIAA) Recommended Practice.
Package: libcgns2-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
-Depends: libcgns2 (= ${binary:Version})
+Depends: libcgns2 (= ${binary:Version}), ${misc:Depends}
Description: CFD General Notation System library
The CFD General Notation System (CGNS) provides a general, portable, and
extensible standard for the storage and retrieval of computational fluid
@@ -55,3 +55,19 @@
Astronautics (AIAA) Recommended Practice.
.
This package contains the debugging symbols of the library.
+
+Package: cgns-convert
+Section: science
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: CFD General Notation System - Convertion tools
+ The CFD General Notation System (CGNS) provides a general, portable, and
+ extensible standard for the storage and retrieval of computational fluid
+ dynamics (CFD) analysis data. It consists of a collection of conventions, and
+ free and open software implementing those conventions. It is self-descriptive,
+ machine-independent, well-documented, and administered by an international
+ steering committee. It is also an American Institute of Aeronautics and
+ Astronautics (AIAA) Recommended Practice.
+ .
+ This package contains the adf2hdf, hdf2adf tools.
Modified: packages/libcgns/trunk/debian/patches/destdir.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/patches/destdir.diff?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/patches/destdir.diff (original)
+++ packages/libcgns/trunk/debian/patches/destdir.diff Tue Jun 9 14:40:53 2009
@@ -1,6 +1,6 @@
--- cgnslib_2.5.orig/Makefile.in 2008-01-19 04:45:16.000000000 +0100
+++ cgnslib_2.5/Makefile.in 2008-10-16 00:31:07.000000000 +0200
-@@ -75,15 +75,16 @@
+@@ -75,15 +75,21 @@
-$(RM) config.log config.status Makefile
install : $(CGNSLIB)
@@ -11,7 +11,12 @@
+ $(INSTALL_DATA) -D cgnslib.h $(DESTDIR)/$(INCLUDEDIR)/cgnslib.h
+ $(INSTALL_DATA) -D cgnslib_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnslib_f.h
+ $(INSTALL_DATA) -D cgnswin_f.h $(DESTDIR)/$(INCLUDEDIR)/cgnswin_f.h
++ $(INSTALL_DATA) -D cgns_header.h $(DESTDIR)/$(INCLUDEDIR)/cgns_header.h
++ $(INSTALL_DATA) -D adfh/ADF.h $(DESTDIR)/$(INCLUDEDIR)/adfh/ADF.h
++ $(INSTALL_DATA) -D adfh/ADFH.h $(DESTDIR)/$(INCLUDEDIR)/adfh/ADFH.h
+ $(INSTALL_DATA) -D $(CGNSLIB) $(DESTDIR)/$(LIBDIR)/$(INSTLIB).2.0.0
++ $(INSTALL_DATA) -s -D $(OBJDIR)/adf2hdf$(EXE) $(DESTDIR)/usr/bin/adf2hdf$(EXE)
++ $(INSTALL_DATA) -s -D $(OBJDIR)/hdf2adf$(EXE) $(DESTDIR)/usr/bin/hdf2adf$(EXE)
+ (cd $(DESTDIR)/$(LIBDIR)/; ln -s $(INSTLIB).2.0.0 $(INSTLIB); ln -s $(INSTLIB).2.0.0 $(INSTLIB).2)
uninstall :
Modified: packages/libcgns/trunk/debian/patches/soname.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/patches/soname.diff?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/patches/soname.diff (original)
+++ packages/libcgns/trunk/debian/patches/soname.diff Tue Jun 9 14:40:53 2009
@@ -5,10 +5,19 @@
else
CFGFLAGS="-fPIC $CFGFLAGS"
- AR="\$(CC) -shared $SYSCFLAGS -Wl,-rpath,$cgnsdir/\$(SYSTEM)"
-+ AR="\$(CC) -shared $SYSCFLAGS -Wl,-soname,libcgns.so.2"
++ AR="\$(CC) -shared $SYSCFLAGS -Wl,-soname,libcgns.so.2 -lhdf5"
LIBEXT=so
fi
fi
+@@ -478,7 +478,7 @@
+ test -z "$hdf5dir" && \
+ AC_MSG_ERROR(need specify the HDF5 directory with --with-hdf5=DIR)
+ if test -f "$hdf5dir/include/hdf5.h"; then
+- HDF5INC=-I$hdf5dir/include
++ HDF5INC="-I$hdf5dir/include -I/usr/lib/openmpi/include"
+ for a in $exts ; do
+ if test -f $hdf5dir/lib/libhdf5.$a; then
+ HDF5LIB=$hdf5dir/lib/libhdf5.$a
--- cgnslib_2.5.orig/configure 2008-01-19 04:45:16.000000000 +0100
+++ cgnslib_2.5/configure 2008-10-15 23:11:41.000000000 +0200
@@ -2048,7 +2048,7 @@
@@ -16,7 +25,16 @@
else
CFGFLAGS="-fPIC $CFGFLAGS"
- AR="\$(CC) -shared $SYSCFLAGS -Wl,-rpath,$cgnsdir/\$(SYSTEM)"
-+ AR="\$(CC) -shared $SYSCFLAGS -Wl,-soname,libcgns.so.2"
++ AR="\$(CC) -shared $SYSCFLAGS -Wl,-soname,libcgns.so.2 -lhdf5"
LIBEXT=so
fi
fi
+@@ -2143,7 +2143,7 @@
+ test -z "$hdf5dir" && \
+ { echo "configure: error: need specify the HDF5 directory with --with-hdf5=DIR" 1>&2; exit 1; }
+ if test -f "$hdf5dir/include/hdf5.h"; then
+- HDF5INC=-I$hdf5dir/include
++ HDF5INC="-I$hdf5dir/include -I/usr/lib/openmpi/include"
+ for a in $exts ; do
+ if test -f $hdf5dir/lib/libhdf5.$a; then
+ HDF5LIB=$hdf5dir/lib/libhdf5.$a
Modified: packages/libcgns/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libcgns/trunk/debian/rules?rev=35757&op=diff
==============================================================================
--- packages/libcgns/trunk/debian/rules (original)
+++ packages/libcgns/trunk/debian/rules Tue Jun 9 14:40:53 2009
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_CONFIGURE_NORMAL_ARGS += --enable-shared --with-hdf5 --enable-64bit \
+DEB_CONFIGURE_NORMAL_ARGS += --enable-shared=all --with-hdf5=/usr --enable-64bit \
--with-szip --enable-lfs --enable-debug
More information about the debian-science-commits
mailing list