[Debichem-commits] r1155 - in /unstable/openbabel/debian: changelog libopenbabel-dev.install patches/fix_467498_pedantic_issues patches/fix_ftbfs_with_gcc_43.patch
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Tue Feb 26 01:05:48 UTC 2008
Author: dleidert-guest
Date: Tue Feb 26 01:05:47 2008
New Revision: 1155
URL: http://svn.debian.org/wsvn/debichem/?sc=1&rev=1155
Log:
* debian/libopenbabel-dev.install: Fixed plugins path (necessary for
compatibility mode 5).
* debian/patches/fix_ftbfs_with_gcc_43.patch: Added.
- Add missing includes to fix an FTBFS with GCC 4.3 (closes: #455170).
* debian/patches/fix_467498_pedantic_issues: Added.
- Fix some issues -pedantic will complain about (LP: #195497; closes:
#467498).
Added:
unstable/openbabel/debian/patches/fix_467498_pedantic_issues
unstable/openbabel/debian/patches/fix_ftbfs_with_gcc_43.patch
Modified:
unstable/openbabel/debian/changelog
unstable/openbabel/debian/libopenbabel-dev.install
Modified: unstable/openbabel/debian/changelog
URL: http://svn.debian.org/wsvn/debichem/unstable/openbabel/debian/changelog?rev=1155&op=diff
==============================================================================
--- unstable/openbabel/debian/changelog (original)
+++ unstable/openbabel/debian/changelog Tue Feb 26 01:05:47 2008
@@ -14,12 +14,19 @@
* debian/copyright: Updated. Added missing copyright informaton. Added
missing information about libinchi.
* debian/libopenbabel-dev.dirs: Removed (useless).
+ * debian/libopenbabel-dev.install: Fixed plugins path (necessary for
+ compatibility mode 5).
* debian/openbabel.dirs: Ditto.
* debian/openbabel.docs: Removed files that should go into all packages.
Added READMEs regarding povray.
* debian/openbabel.examples: Added example for the newly added READMEs.
* debian/rules: Added DEB_INSTALL_DOCS_ALL for docs to install in all
packages.
+ * debian/patches/fix_ftbfs_with_gcc_43.patch: Added.
+ - Add missing includes to fix an FTBFS with GCC 4.3 (closes: #455170).
+ * debian/patches/fix_467498_pedantic_issues: Added.
+ - Fix some issues -pedantic will complain about (LP: #195497; closes:
+ #467498).
-- Michael Banck <mbanck at debian.org> Sat, 05 Jan 2008 16:56:35 +0100
Modified: unstable/openbabel/debian/libopenbabel-dev.install
URL: http://svn.debian.org/wsvn/debichem/unstable/openbabel/debian/libopenbabel-dev.install?rev=1155&op=diff
==============================================================================
--- unstable/openbabel/debian/libopenbabel-dev.install (original)
+++ unstable/openbabel/debian/libopenbabel-dev.install Tue Feb 26 01:05:47 2008
@@ -1,5 +1,5 @@
debian/tmp/usr/lib/libopenbabel*a usr/lib/
-debian/tmp/usr/lib/libopenbabel*so usr/lib
+debian/tmp/usr/lib/libopenbabel*so usr/lib/
debian/tmp/usr/lib/pkgconfig/openbabel* usr/lib/pkgconfig/
debian/tmp/usr/include/openbabel* usr/include/
-debian/tmp/usr/lib/openbabel/*a usr/lib/openbabel
+debian/tmp/usr/lib/openbabel/2.1/*a usr/lib/openbabel/2.1/
Added: unstable/openbabel/debian/patches/fix_467498_pedantic_issues
URL: http://svn.debian.org/wsvn/debichem/unstable/openbabel/debian/patches/fix_467498_pedantic_issues?rev=1155&op=file
==============================================================================
--- unstable/openbabel/debian/patches/fix_467498_pedantic_issues (added)
+++ unstable/openbabel/debian/patches/fix_467498_pedantic_issues Tue Feb 26 01:05:47 2008
@@ -1,0 +1,101 @@
+--- ./include/openbabel/math/vector3.h.orig 2008-02-25 23:20:03.000000000 +0100
++++ ./include/openbabel/math/vector3.h 2008-02-25 23:20:50.000000000 +0100
+@@ -273,32 +273,32 @@ namespace OpenBabel
+ inline OBAPI vector3 operator+ ( const vector3& v1, const vector3& v2)
+ {
+ return vector3(v1.x()+v2.x(), v1.y()+v2.y(), v1.z()+v2.z());
+- };
++ }
+ //! Vector subtraction
+ inline OBAPI vector3 operator- ( const vector3& v1, const vector3& v2)
+ {
+ return vector3(v1.x()-v2.x(), v1.y()-v2.y(), v1.z()-v2.z());
+- };
++ }
+ //! Unary minus
+ inline OBAPI vector3 operator- ( const vector3& v)
+ {
+ return vector3(-v.x(), -v.y(), -v.z());
+- };
++ }
+ //! Multiplication with a scalar
+ inline OBAPI vector3 operator* ( const double& c, const vector3& v)
+ {
+ return vector3( c*v.x(), c*v.y(), c*v.z());
+- };
++ }
+ //! Multiplication with a scalar
+ inline OBAPI vector3 operator* ( const vector3& v, const double& c)
+ {
+ return vector3( c*v.x(), c*v.y(), c*v.z());
+- };
++ }
+ //! Division by a scalar
+ inline OBAPI vector3 operator/ ( const vector3& v, const double& c)
+ {
+ return vector3( v.x()/c, v.y()/c, v.z()/c);
+- };
++ }
+ // @removed@ misleading operation
+ // friend vector3 operator* ( const vector3 &,const vector3 &);
+
+--- ./include/openbabel/generic.h.orig 2008-02-25 23:22:17.000000000 +0100
++++ ./include/openbabel/generic.h 2008-02-25 23:22:34.000000000 +0100
+@@ -144,7 +144,7 @@ namespace OpenBabel
+ CustomData12 = 16396,
+ CustomData13 = 16397,
+ CustomData14 = 16398,
+- CustomData15 = 16399,
++ CustomData15 = 16399
+ };
+ } // end namespace
+
+--- ./include/openbabel/base.h.orig 2008-02-25 23:23:17.000000000 +0100
++++ ./include/openbabel/base.h 2008-02-25 23:23:29.000000000 +0100
+@@ -86,7 +86,7 @@ namespace OpenBabel
+ if(pOb && clear)// Clear only if this is of target class
+ Clear();
+ return pOb;
+- };
++ }
+
+
+ //! \name Generic data handling methods (via OBGenericData)
+--- ./include/openbabel/residue.h.orig 2008-02-25 23:24:07.000000000 +0100
++++ ./include/openbabel/residue.h 2008-02-25 23:24:33.000000000 +0100
+@@ -267,7 +267,7 @@ namespace OpenBabel {
+ POLAR = 13,
+ POSITIVE = 14,
+ SMALL = 15,
+- SURFACE = 16,
++ SURFACE = 16
+ };
+ }
+
+@@ -285,7 +285,7 @@ namespace OpenBabel {
+ SHAPELY_BACKBONE = 6,
+ SHAPELY_SPECIAL = 7,
+ SIDECHAIN = 8,
+- SUGAR_PHOSPHATE = 9,
++ SUGAR_PHOSPHATE = 9
+ };
+ }
+
+@@ -352,7 +352,7 @@ namespace OpenBabel {
+ NAD = 50,
+ COA = 51,
+ NAP = 52,
+- NDP = 53,
++ NDP = 53
+ };
+ }
+
+@@ -370,7 +370,7 @@ namespace OpenBabel {
+ PURINE = 6,
+ PYRIMIDINE = 7,
+ SOLVENT = 8,
+- WATER = 9,
++ WATER = 9
+ };
+ }
+
Added: unstable/openbabel/debian/patches/fix_ftbfs_with_gcc_43.patch
URL: http://svn.debian.org/wsvn/debichem/unstable/openbabel/debian/patches/fix_ftbfs_with_gcc_43.patch?rev=1155&op=file
==============================================================================
--- unstable/openbabel/debian/patches/fix_ftbfs_with_gcc_43.patch (added)
+++ unstable/openbabel/debian/patches/fix_ftbfs_with_gcc_43.patch Tue Feb 26 01:05:47 2008
@@ -1,0 +1,125 @@
+--- ./include/openbabel/xml.h.orig 2008-02-25 23:44:36.000000000 +0100
++++ ./include/openbabel/xml.h 2008-02-25 23:44:20.000000000 +0100
+@@ -19,6 +19,7 @@ GNU General Public License for more deta
+
+ #include <libxml/xmlreader.h>
+ #include <libxml/xmlwriter.h>
++#include <typeinfo>
+
+ namespace OpenBabel
+ {
+--- ./include/openbabel/obmolecformat.h.orig 2008-02-25 23:44:55.000000000 +0100
++++ ./include/openbabel/obmolecformat.h 2008-02-25 23:45:07.000000000 +0100
+@@ -25,6 +25,7 @@ GNU General Public License for more deta
+
+ #include <openbabel/mol.h>
+ #include <openbabel/obconversion.h>
++#include <typeinfo>
+
+ namespace OpenBabel {
+
+--- ./include/openbabel/data.h.orig 2008-02-25 23:45:32.000000000 +0100
++++ ./include/openbabel/data.h 2008-02-25 23:45:52.000000000 +0100
+@@ -27,6 +27,7 @@ GNU General Public License for more deta
+ #include <fstream>
+ #include <vector>
+ #include <string>
++#include <cstring>
+
+ namespace OpenBabel
+ {
+--- ./include/openbabel/lineend.h.orig 2008-02-25 23:46:03.000000000 +0100
++++ ./include/openbabel/lineend.h 2008-02-25 23:46:15.000000000 +0100
+@@ -21,6 +21,7 @@ General Public License for more details.
+ #define OB_LINEEND_H
+
+ #include <streambuf>
++#include <climits>
+
+ #ifndef OBCONV
+ #define OBCONV
+--- ./src/residue.cpp.orig 2008-02-25 23:40:15.000000000 +0100
++++ ./src/residue.cpp 2008-02-25 23:44:02.000000000 +0100
+@@ -33,6 +33,8 @@ obtained in part or whole from RasMol2 b
+ #include <openbabel/oberror.h>
+ #include <openbabel/bitvec.h>
+ #include <openbabel/bond.h>
++#include <cstring>
++#include <cstdlib>
+
+ using namespace std;
+
+--- ./src/tokenst.cpp.orig 2008-02-25 23:40:44.000000000 +0100
++++ ./src/tokenst.cpp 2008-02-25 23:41:02.000000000 +0100
+@@ -25,6 +25,7 @@ GNU General Public License for more deta
+ #include <algorithm>
+ #include <vector>
+ #include <string>
++#include <cstring>
+
+
+ using namespace std;
+--- ./src/dlhandler_unix.cpp.orig 2008-02-25 23:41:16.000000000 +0100
++++ ./src/dlhandler_unix.cpp 2008-02-25 23:41:35.000000000 +0100
+@@ -25,6 +25,8 @@ GNU General Public License for more deta
+ #include <sys/stat.h>
+ #include <dlfcn.h>
+ #include <cstdlib>
++#include <cstring>
++
+
+ using namespace std;
+
+--- ./src/fingerprint.cpp.orig 2008-02-26 00:01:56.000000000 +0100
++++ ./src/fingerprint.cpp 2008-02-26 00:02:16.000000000 +0100
+@@ -23,6 +23,7 @@ GNU General Public License for more deta
+ #include <iosfwd>
+ #include <vector>
+ #include <fstream>
++#include <cstring>
+
+ #include <openbabel/fingerprint.h>
+ #include <openbabel/oberror.h>
+--- include/openbabel/obconversion.h.orig 2008-02-26 00:09:59.000000000 +0100
++++ include/openbabel/obconversion.h 2008-02-26 00:10:20.000000000 +0100
+@@ -29,6 +29,8 @@ GNU General Public License for more deta
+ #include <vector>
+ #include <map>
+
++#include <cstring>
++
+ #include <openbabel/dlhandler.h>
+ #include <openbabel/oberror.h>
+ #include <openbabel/lineend.h>
+--- ./src/zipstreamimpl.h.orig 2008-02-26 00:10:43.000000000 +0100
++++ ./src/zipstreamimpl.h 2008-02-26 00:11:02.000000000 +0100
+@@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for
+ minor namespace modifications, VC++ compatibility
+ */
+
++#include <cstring>
++
+ //*****************************************************************************
+ // template class basic_zip_streambuf
+ //*****************************************************************************
+--- src/obconversion.cpp.orig 2008-02-26 00:12:12.000000000 +0100
++++ src/obconversion.cpp 2008-02-26 00:12:25.000000000 +0100
+@@ -37,6 +37,7 @@ GNU General Public License for more deta
+ #include <sstream>
+ #include <string>
+ #include <map>
++#include <typeinfo>
+
+ #include <openbabel/obconversion.h>
+
+--- src/formats/rxnformat.cpp.orig 2008-02-26 00:39:29.000000000 +0100
++++ src/formats/rxnformat.cpp 2008-02-26 00:39:47.000000000 +0100
+@@ -18,6 +18,8 @@ GNU General Public License for more deta
+ #pragma warning (disable : 4251) //
+ #endif
+
++#include <typeinfo>
++
+ #include <openbabel/babelconfig.h>
+
+ #include <openbabel/mol.h>
More information about the Debichem-commits
mailing list