[silo-llnl] 94/96: Revert

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit 7c8dc86b5a7fb7c290e0437ece365a425c2ffae0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 14 18:52:38 2014 +0000

    Revert
---
 debian/patches/version-script.patch | 391 ++++++++++++++++++++++++++++++++++--
 1 file changed, 375 insertions(+), 16 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 7ca8579..b1d9b1e 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -3,10 +3,10 @@ Description: Add versioned symbols to SILO library
 Last-Updated: 2014-12-14
 Forwarded: no
 
-Index: silo-llnl.git/configure.ac
+Index: silo-llnl-4.10.2/configure.ac
 ===================================================================
---- silo-llnl.git.orig/configure.ac
-+++ silo-llnl.git/configure.ac
+--- silo-llnl-4.10.2.orig/configure.ac
++++ silo-llnl-4.10.2/configure.ac
 @@ -359,6 +359,9 @@ dnl
  dnl     Mark C. Miller, Wed Jul 21 09:31:24 PDT 2010
  dnl     Adjusted logic to support BSD releases which will NOT include
@@ -31,10 +31,10 @@ Index: silo-llnl.git/configure.ac
  
  dnl ----------------------------------------------------------------------
  
-Index: silo-llnl.git/src/Makefile.am
+Index: silo-llnl-4.10.2/src/Makefile.am
 ===================================================================
---- silo-llnl.git.orig/src/Makefile.am
-+++ silo-llnl.git/src/Makefile.am
+--- silo-llnl-4.10.2.orig/src/Makefile.am
++++ silo-llnl-4.10.2/src/Makefile.am
 @@ -101,7 +101,7 @@ if HDF5_DRV_NEEDED
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -44,15 +44,374 @@ Index: silo-llnl.git/src/Makefile.am
  else
    SETTINGSFILE=libsilo.settings
    lib_LTLIBRARIES = libsilo.la
-Index: silo-llnl.git/silo.ver
+Index: silo-llnl-4.10.2/silo.ver
 ===================================================================
---- silo-llnl.git.orig/silo.ver
-+++ silo-llnl.git/silo.ver
-@@ -332,6 +332,7 @@ SILOH5_4_8 {
- SILOH5_4_9_1 { 
-     global:
-     DBGetObjtypeTag;
+--- /dev/null
++++ silo-llnl-4.10.2/silo.ver
+@@ -0,0 +1,366 @@
++SILOH5_4_8 { 
++   global:
++	DBOpenReal;
++	DBCreateReal;
++	DBInqFileReal;
++	DBAllocCompoundarray;
++	DBAllocCurve;
++	DBAllocDefvars;
++	DBAllocMultimesh;
++	DBAllocMultimeshadj;
++	DBAllocMultivar;
++	DBAllocMultimat;
++	DBAllocMultimatspecies;
++	DBAllocCsgmesh;
++	DBAllocQuadmesh;
++	DBAllocPointmesh;
++	DBAllocMeshvar;
++	DBAllocUcdmesh;
++	DBAllocCsgvar;
++	DBAllocQuadvar;
++	DBAllocUcdvar;
++	DBAllocZonelist;
++	DBAllocPHZonelist;
++	DBAllocCSGZonelist;
++	DBAllocEdgelist;
++	DBAllocFacelist;
++	DBAllocMaterial;
++	DBAllocMatspecies;
++	DBAllocNamescheme;
++	DBAllocGroupelmap;
++	DBFreeMatspecies;
++	DBFreeMaterial;
++	DBFreeFacelist;
++	DBFreeEdgelist;
++	DBFreeZonelist;
++	DBFreePHZonelist;
++	DBFreeCSGZonelist;
++	DBResetUcdvar;
++	DBFreeUcdvar;
++	DBResetQuadvar;
++	DBFreeCsgvar;
++	DBFreeQuadvar;
++	DBFreeUcdmesh;
++	DBFreeMeshvar;
++	DBFreePointmesh;
++	DBFreeQuadmesh;
++	DBFreeCsgmesh;
++	DBFreeDefvars;
++	DBFreeMultimesh;
++	DBFreeMultimeshadj;
++	DBFreeMultivar;
++	DBFreeMultimat;
++	DBFreeMultimatspecies;
++	DBFreeCompoundarray;
++	DBFreeCurve;
++	DBFreeNamescheme;
++	DBSetDataReadMask;
++	DBGetDataReadMask;
++	DBSetAllowOverwrites;
++	DBGetAllowOverwrites;
++	DBSetEnableChecksums;
++	DBGetEnableChecksums;
++	DBSetCompression;
++	DBGetCompression;
++	DBSetFriendlyHDF5Names;
++	DBGetFriendlyHDF5Names;
++	DBGuessHasFriendlyHDF5Names;
++	DBSetDeprecateWarnings;
++	DBGetDeprecateWarnings;
++	DBSetUnknownDriverPriorities;
++	DBGetUnknownDriverPriorities;
++	DBRegisterFileOptionsSet;
++	DBUnregisterFileOptionsSet;
++	DBUnregisterAllFileOptionsSets;
++	DBGrabDriver;
++	DBUngrabDriver;
++	DBGetDriverType;
++	DBGetDriverTypeFromPath;
++	DBJoinPath;
++	DBVersion;
++	DBVersionGE;
++	DBFileVersion;
++	DBFileVersionGE;
++	DBShowErrors;
++	DBErrString;
++	DBErrFunc;
++	DBErrFuncname;
++	DBErrfunc;
++	DBErrno;
++	DBErrlvl;
++	DBClose;
++	DBPause;
++	DBContinue;
++	DBInqVarExists;
++	DBForceSingle;
++	DBUninstall;
++	DBMakeOptlist;
++	DBClearOptlist;
++	DBFreeOptlist;
++	DBAddOption;
++	DBGetOption;
++	DBClearOption;
++	DBGetToc;
++	DBNewToc;
++	DBSortObjectsByOffset;
++	DBFilters;
++	DBFilterRegistration;
++	DBGetAtt;
++	DBGetObject;
++	DBChangeObject;
++	DBWriteObject;
++	DBGetComponent;
++	DBGetComponentType;
++	DBWriteComponent;
++	DBWriteSlice;
++        DBWrite;
++	DBCalcExternalFacelist;
++	DBCalcExternalFacelist2;
++	DBGetDir;
++	DBSetDir;
++	DBSetDirID;
++	DBListDir;
++	DBMkDir;
++	DBCpDir;
++	DBReadAtt;
++	DBRead;
++	DBReadVar;
++	DBReadVar1;
++	DBReadVarSlice;
++	DBMakeObject;
++	DBFreeObject;
++	DBClearObject;
++	DBAddVarComponent;
++	DBAddIntComponent;
++	DBAddFltComponent;
++	DBAddDblComponent;
++	DBAddStrComponent;
++	DBGetComponentNames;
++	DBGetCompoundarray;
++	DBGetCurve;
++	DBGetDefvars;
++	DBGetMaterial;
++	DBGetMatspecies;
++	DBGetMultimesh;
++	DBGetMultimeshadj;
++	DBGetMultivar;
++	DBGetMultimat;
++	DBGetMultimatspecies;
++	DBGetPointmesh;
++	DBGetPointvar;
++	DBGetQuadmesh;
++	DBGetQuadvar;
++	DBGetQuadvar1;
++	DBAnnotateUcdmesh;
++	DBGetUcdmesh;
++	DBGetUcdvar;
++	DBGetCsgmesh;
++	DBGetCsgvar;
++	DBGetCSGZonelist;
++	DBGetFacelist;
++	DBGetZonelist;
++	DBGetPHZonelist;
++	DBGetVar;
++	DBGetVarByteLength;
++	DBGetVarLength;
++	DBGetVarDims;
++	DBGetVarType;
++	DBInqFileHasObjects;
++	DBInqMeshname;
++	DBInqMeshtype;
++	DBInqCompoundarray;
++	DBInqVarType;
++	DBPutCompoundarray;
++	DBPutCurve;
++	DBPutDefvars;
++	DBPutFacelist;
++	DBPutMaterial;
++	DBPutMatspecies;
++	DBPutMultimesh;
++	DBPutMultimeshadj;
++	DBPutMultivar;
++	DBPutMultimat;
++	DBPutMultimatspecies;
++	DBPutPointmesh;
++	DBPutPointvar;
++	DBPutPointvar1;
++	DBPutQuadmesh;
++	DBPutQuadvar;
++	DBPutQuadvar1;
++	DBPutUcdmesh;
++	DBPutUcdsubmesh;
++	DBPutUcdvar;
++	DBPutUcdvar1;
++	DBPutZonelist;
++	DBPutZonelist2;
++	DBPutPHZonelist;
++	DBPutCsgmesh;
++	DBPutCSGZonelist;
++	DBPutCsgvar;
++	DBFreeMrgtree;
++	DBPrintMrgtree;
++	DBLinearizeMrgtree;
++	DBWalkMrgtree;
++	DBMakeMrgtree;
++	DBAddRegion;
++	DBAddRegionArray;
++	DBSetCwr;
++	DBGetCwr;
++	DBPutMrgtree;
++        DBGetMrgtree;
++	DBPutMrgvar;
++	DBGetMrgvar;
++	DBFreeMrgvar;
++	DBPutGroupelmap;
++	DBGetGroupelmap;
++	DBFreeGroupelmap;
++	DBFortranAccessPointer;
++	DBFortranAllocPointer;
++	DBFortranRemovePointer;
++	DBVariableNameValid;
++	DBFreeCompressionResources;
++	DBMakeNamescheme;
++	DBGetName;
++	DBStringArrayToStringList;
++	DBStringListToStringArray;
++	DBOpenCB;
++	DBCreateCB;
++	DBFSingleCB;
++	dbsetdirid_;
++	dbgethdfnms_;
++	dbsethdfnms_;
++	dbregfopts_;
++	dbclose_;
++	dbwrite_;
++	dbputgrplmap_;
++	dbaddrcmp_;
++	dbmkmrgtree_;
++	dbputzl_;
++	dbcreate_;
++	dbputmat_;
++	dbsetcwr_;
++	dbpmrgv_;
++	dbmkdir_;
++	dbaddiopt_;
++	dbgetqv1_;
++	dbgetdepwarn_;
++	dbputmmat_;
++	dbgetovrwrt_;
++	dbsetovrwrt_;
++	dbgetca_;
++	dbputpm_;
++	dbsetcksums_;
++	dbinqca_;
++	dbputfl_;
++	dbinqfile_;
++	dbcalcfl_;
++	dbputca_;
++	dbaddropt_;
++	dbfreemrgtree_;
++	dbputcsgv_;
++	dbputqm_;
++	dbfreeobject_;
++	dbfgetca_;
++	dbwriteslice_;
++	dberrno_;
++	dbputmsp_;
++	dbaddccmp_;
++	dbinqlen_;
++	dbaddregion_;
++	dbgetcksums_;
++	dbputmmesh_;
++	db_get_used_file_options_;
++	dbaddcaopt_;
++	dbsetcompress_;
++	dbputuv1_;
++	dbputcsgzl_;
++	dbputzl2_;
++	dbsetdepwarn_;
++	dbmkobject_;
++	dbputqv1_;
++	dbgetcurve_;
++	dbputpv1_;
++	dbset2dstrlen_;
++	dbmkoptlist_;
++	dbputum_;
++	dbaddcopt_;
++	dbputmrgtree_;
++	dbputcsgm_;
++	dbgetcompress_;
++	dbopen_;
++	dbrdvarslice_;
++	dbsetdir_;
++	dbputmvar_;
++	dbmkptr_;
++	dbaddregiona_;
++	dbputqv_;
++	dbaddicmp_;
++	dbrdvar_;	
++	dbrmptr_;
++	dbfreeoptlist_;
++	dbunregafopts_;
++	dbget2dstrlen_;
++	dbadddopt_;
++	dbputdefvars_;
++	dbwrtfl_;
++	dbunregfopts_;
++	dbshowerrors_;
++	dbputcurve_;
++	DBDebugAPI;
++	db_errno; 
++	db_errfunc;
++	safe_strdup;  /* Should this really be here? its neede by browser, etc. */
++	Silo_version*;
++
++	/* filters */
++ 	f_debug_Open;
++	f_ale3d_Open;
++
++        lite_PD_close;
++	lite_PD_create;
++	lite_PD_defstr;
++	lite_PD_open;
++	lite_PD_read;
++	lite_PD_write;
++	lite_PD_write_alt;
++	lite_PD_mkdir;
++	lite_PD_cd;
++	lite_SC_alloc;
++	lite_SC_free;
++};
++
++SILOH5_4_9_1 { 
++    global:
++    DBGetObjtypeTag;
 +    DBmatspecies;
-     DBAllocPointvar;
-     DBFreePointvar;
-     DBGetAllowEmptyObjects;
++    DBAllocPointvar;
++    DBFreePointvar;
++    DBGetAllowEmptyObjects;
++    DBIsEmptyCSGZonelist;
++    DBIsEmptyCsgmesh;
++    DBIsEmptyCsgvar;
++    DBIsEmptyCurve;
++    DBIsEmptyFacelist;
++    DBIsEmptyMaterial;
++    DBIsEmptyMatspecies;
++    DBIsEmptyMeshvar;
++    DBIsEmptyPHZonelist;
++    DBIsEmptyPointmesh;
++    DBIsEmptyPointvar;
++    DBIsEmptyQuadmesh;
++    DBIsEmptyQuadvar;
++    DBIsEmptyUcdmesh;
++    DBIsEmptyUcdvar;
++    DBIsEmptyZonelist;
++    DBSetAllowEmptyObjects;
++    db_hdf5_WriteCKZ;
++    db_num_registered_files;
++    dbaddiaopt_;
++    lite_PD_DEF_CREATM;
++    lite_PD_append;
++    lite_PD_append_as;
++    lite_PD_append_as_alt;
++    lite_PD_defent;
++    local:
++        *;
++} SILOH5_4_8;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git



More information about the debian-science-commits mailing list