Source: gridengine Version: 6.2u5-7.2 Severity: wishlist Tags: patch
Hi Maintainer For reference, I attach a patch from Ubuntu for the following changes: * Build-depend on libdb-dev, instead of libdb5.1-dev. * Add patch to skip non-existent error defines. Regards Graham
diff -u gridengine-6.2u5/debian/control gridengine-6.2u5/debian/control --- gridengine-6.2u5/debian/control +++ gridengine-6.2u5/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers <[email protected]> XSBC-Original-Maintainer: Debian Grid Engine Maintainers <[email protected]> Uploaders: Michael Banck <[email protected]>, Mark Hymers <[email protected]> -Build-Depends: debhelper (>= 4.0.0), csh, groff, libdb5.1-dev, libssl-dev, +Build-Depends: debhelper (>= 4.0.0), csh, groff, libdb-dev, libssl-dev, libncurses5-dev, libpam0g-dev, libxt-dev, libmotif-dev, libxpm-dev, libxmu-dev, po-debconf, quilt, default-jdk, ant, ant-optional, junit, javacc, libxft-dev, libxp-dev Standards-Version: 3.8.3 diff -u gridengine-6.2u5/debian/changelog gridengine-6.2u5/debian/changelog --- gridengine-6.2u5/debian/changelog +++ gridengine-6.2u5/debian/changelog @@ -1,3 +1,10 @@ +gridengine (6.2u5-7.1ubuntu3) trusty; urgency=low + + * Build-depend on libdb-dev, instead of libdb5.1-dev. + * Add patch to skip non-existent error defines. + + -- Dmitrijs Ledkovs <[email protected]> Mon, 04 Nov 2013 07:40:48 +0000 + gridengine (6.2u5-7.1ubuntu2) saucy; urgency=low * Rebuild with libmotif-dev instead of lesstif2-dev. (LP: #1222747) diff -u gridengine-6.2u5/debian/patches/series gridengine-6.2u5/debian/patches/series --- gridengine-6.2u5/debian/patches/series +++ gridengine-6.2u5/debian/patches/series @@ -21,0 +22 @@ +db5.3.diff only in patch2: unchanged: --- gridengine-6.2u5.orig/debian/patches/db5.3.diff +++ gridengine-6.2u5/debian/patches/db5.3.diff @@ -0,0 +1,31 @@ +--- a/source/libs/spool/berkeleydb/sge_bdb.c ++++ b/source/libs/spool/berkeleydb/sge_bdb.c +@@ -1574,7 +1574,11 @@ + int bdb_errno) + { + /* we lost the connection to a RPC server */ +- if (bdb_errno == DB_NOSERVER || bdb_errno == DB_NOSERVER_ID) { ++ if (bdb_errno == DB_NOSERVER ++#ifdef DB_NOSERVER_ID ++|| bdb_errno == DB_NOSERVER_ID ++#endif ++) { + const char *server = bdb_get_server(info); + const char *path = bdb_get_path(info); + +@@ -1585,6 +1589,7 @@ + path != NULL ? path : "no database path defined"); + + spool_berkeleydb_error_close(info); ++#ifdef DB_NOSERVER_HOME + } else if (bdb_errno == DB_NOSERVER_HOME) { + const char *server = bdb_get_server(info); + const char *path = bdb_get_path(info); +@@ -1596,6 +1601,7 @@ + path != NULL ? path : "no database path defined"); + + spool_berkeleydb_error_close(info); ++#endif + } else if (bdb_errno == DB_RUNRECOVERY) { + answer_list_add_sprintf(answer_list, STATUS_EUNKNOWN, + ANSWER_QUALITY_ERROR,
