Jenkinsfile

@@ -4,17 +4,12 @@ properties([
         string(name: 'MAKE_VERBOSE', defaultValue: 'VERBOSE=true', description: ''),
         booleanParam(name: 'BUILD_WITH_FORTIFY', defaultValue: false, description: 'Check to build and scan source using HP Fortify tool'),
         booleanParam(name: 'SCAN_WITH_SONARQUBE', defaultValue: false, description: 'Check to perform SonarQube analysis'),
-        string(name: 'GIT_PUBLIC_SERVER_URL', defaultValue: 'https://github.com/ossimlabs', description: ''),
-        string(name: 'GIT_PRIVATE_SERVER_URL', defaultValue: 'https://github.com/Maxar-Corp', description: ''),
-        string(name: 'CREDENTIALS_ID', defaultValue: 'cicdGithub', description: ''),
-
-
         booleanParam(name: 'CLEAN_WORKSPACE', defaultValue: true, description: 'Clean the workspace at the end of the run')
     ]),
     pipelineTriggers([
             [$class: "GitHubPushTrigger"]
     ]),
-    [$class: 'GithubProjectProperty', displayName: '', projectUrlStr: 'https://github.com/ossimlabs/tlv'],
+    [$class: 'GithubProjectProperty', displayName: '', projectUrlStr: 'https://github.com/ossimlabs/ossim'],
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '3', daysToKeepStr: '', numToKeepStr: '20')),
     disableConcurrentBuilds()
 ])
@@ -23,10 +18,12 @@ node ("${BUILD_NODE}"){
 
     try {
         stage( "Download Artifacts" ) {
-            dir( "ossim-ci" ) {
-                git branch: "$BRANCH_NAME",
-                url: "${ GIT_PRIVATE_SERVER_URL }/ossim-ci.git",
-                credentialsId: "${ CREDENTIALS_ID }"
+            env.OPENCV_HOME = "${env.WORKSPACE}/opencv-3.2-minimal-install"
+            withCredentials([string(credentialsId: 'o2-artifact-project', variable: 'o2ArtifactProject')]) {
+                step ([$class: "CopyArtifact",
+                    projectName: o2ArtifactProject,
+                    filter: "common-variables.groovy",
+                    flatten: true])
             }
 
             dir( "${ env.WORKSPACE }" ) {
@@ -48,8 +45,7 @@ node ("${BUILD_NODE}"){
                     """
             }
 
-            load "ossim-ci/jenkins/variables/common-variables.groovy"
-            load "ossim-ci/jenkins/variables/ossim-variables.groovy"
+            load "common-variables.groovy"
         }
 
         stage( "Checkout" ) {
@@ -100,8 +96,8 @@ node ("${BUILD_NODE}"){
                 sh """
                     rm -rf ${ env.WORKSPACE }/build/CMakeCache.txt
                     export PATH=${ PATH }:/opt/HPE_Security/Fortify_SCA_and_Apps_17.20/bin
-                    ${ env.WORKSPACE }/ossim-ci/scripts/ossim-build.sh
-                    ${ env.WORKSPACE }/ossim-ci/scripts/ossim-install.sh
+                    ${ env.WORKSPACE }/ossim/scripts/ossim-build.sh
+                    ${ env.WORKSPACE }/ossim/scripts/ossim-install.sh
                 """
             }
         }
@@ -112,7 +108,7 @@ node ("${BUILD_NODE}"){
                 usernameVariable: 'REPOSITORY_MANAGER_USER',
                 passwordVariable: 'REPOSITORY_MANAGER_PASSWORD']]) {
                     dir( "${ env.WORKSPACE }" ) {
-                        sh "${ env.WORKSPACE }/ossim-ci/scripts/oms-deploy.sh"
+                        sh "${ env.WORKSPACE }/ossim/scripts/oms-deploy.sh"
                     }
             }
         }

apps/curl_apps/omarDataMgrUtil.cpp

@@ -35,6 +35,8 @@
 #include <string>
 #include <vector>
 
+using namespace std;
+
 static std::string ACCESS_TIME_THRESHOLD_KW    = "access_time_threshold";
 static std::string CLEAN_KW                    = "clean";
 static std::string DUMP_FILTERED_IMAGES_KW     = "dump_filtered_images";

apps/ossim-band-merge/ossim-band-merge.cpp

@@ -36,6 +36,8 @@
 #include <ossim/base/ossimApplicationUsage.h>
 #include <iostream>
 #include <exception>
+
+using namespace std;
 static ossimTrace traceDebug("band_merge:main");
 
 static void usage();

apps/ossim-create-bitmask/ossim-create-bitmask.cpp

@@ -27,6 +27,8 @@
 #include <cstdio>
 #include <cstdlib> /* for exit */
 
+using namespace std;
+
 //*************************************************************************************************
 // FINALIZE -- Convenient location for placing debug breakpoint for catching program exit.
 //*************************************************************************************************

apps/ossim-create-cg/ossim-create-cg.cpp

@@ -30,6 +30,8 @@
 #include <ossim/base/ossimArgumentParser.h>
 #include <ossim/base/ossimApplicationUsage.h>
 
+using namespace std;
+
 int main(int argc, char *argv[])
 {
    //---

apps/ossim-create-histo/ossim-create-histo.cpp

@@ -33,6 +33,8 @@
 #include <ossim/base/ossimArgumentParser.h>
 #include <ossim/base/ossimApplicationUsage.h>
 
+using namespace std;
+
 
 void usage()
 {

apps/ossim-dump-ocg/ossim-dump-ocg.cpp

@@ -19,6 +19,8 @@
 #include <ossim/init/ossimInit.h>
 #include <ossim/projection/ossimCoarseGridModel.h>
 
+using namespace std;
+
 int main(int argc, char** argv)
 {
    ossimInit::instance()->initialize(argc, argv);

apps/ossim-envi-cg/ossim-envi-cg.cpp

@@ -22,6 +22,8 @@
 #include <ossim/projection/ossimEnviCgModel.h>
 #include <ossim/imaging/ossimImageGeometry.h>
 
+using namespace std;
+
 // Put your includes here:
 
 int main(int argc, char *argv[])

apps/ossim-icp/ossim-icp.cpp

@@ -42,6 +42,8 @@
 #include <iterator>
 #include <exception>
 
+using namespace std;
+
 static ossimTrace traceDebug("icp:main");
 
 static void usage()

apps/ossim-img2rr/ossim-img2rr.cpp

@@ -43,6 +43,8 @@
 #include <ossim/imaging/ossimPixelFlipper.h> // for its keywords
 #include <ossim/imaging/ossimBitMaskWriter.h> // for its keywords
 
+using namespace std;
+
 static ossimTrace traceDebug = ossimTrace("img2rr:debug");
 static ossimTrace traceTime("time");
 

apps/ossim-pc2dem/ossim-pc2dem.cpp

@@ -42,6 +42,8 @@
 #include <iterator>
 #include <exception>
 
+using namespace std;
+
 static ossimTrace traceDebug("icp:main");
 
 static void usage()

apps/ossim-pixelflip/ossim-pixelflip.cpp

@@ -45,6 +45,8 @@
 #include <ossim/base/ossimArgumentParser.h>
 #include <ossim/base/ossimApplicationUsage.h>
 
+using namespace std;
+
 #ifdef OSSIM_HAS_MPI
 #  if OSSIM_HAS_MPI
 #    include <mpi.h>

apps/ossim-plot-histo/ossim-plot-histo.cpp

@@ -33,6 +33,8 @@
 #include <ossim/base/ossimStdOutProgress.h>
 #include <ossim/base/ossimArgumentParser.h>
 #include <ossim/base/ossimApplicationUsage.h>
+
+using namespace std;
 #ifdef WIN32
 #define MY_POPEN(arg1, arg2) _popen(arg1, arg2)
 #else

apps/ossim-preproc/ossim-preproc.cpp

@@ -17,6 +17,8 @@
 #include <ossim/init/ossimInit.h>
 #include <ossim/util/ossimImageUtil.h>
 
+using namespace std;
+
 int main(int argc, char *argv[])
 {
    // Return 0 on success, something else on error.

apps/ossim-senint/ossim-senint.cpp

@@ -47,6 +47,8 @@
 #include <ossim/base/ossimApplicationUsage.h>
 #include <ossim/base/ossimFilename.h>
 
+using namespace std;
+
 
 static ossimTrace traceExec("senint:exec");
 static ossimTrace traceDebug("senint:debug");

debian/changelog

+ossim (2.9.1-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Drop patch applied upstream, refresh remaining patch.
+  * Drop unused override for spelling-error-in-binary.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 03 Sep 2019 19:31:32 +0200
+
 ossim (2.9.0-1) unstable; urgency=medium
 
   * Team upload.

debian/libossim1.lintian-overrides

@@ -3,7 +3,6 @@ no-symbols-control-file usr/lib/libossim.so.*
 
 # False positive, string not included in source.
 spelling-error-in-binary usr/lib/libossim.so.* PROCES PROCESS
-spelling-error-in-binary usr/lib/libossim.so.* nam name
 
 # Source uses __FILE__ macro
 file-references-package-build-path *

debian/patches/0001-Fixed-missing-return.patch

-Description: Fixed missing return
-Author: oscarkramer <oscar.kramer@radiantsolutions.com>
-Origin: https://github.com/ossimlabs/ossim/commit/3505f182e9cd7c836be29f93a23c3c9b1842fc24
-Bug-Debian: https://bugs.debian.org/932134
-
---- a/src/support_data/ossimGeoTiff.cpp
-+++ b/src/support_data/ossimGeoTiff.cpp
-@@ -2415,6 +2415,7 @@ bool ossimGeoTiff::initTiePointsFromImag
-    theTiePoint.push_back(theModelTransformation[3]);
-    theTiePoint.push_back(theModelTransformation[7]);
-    theTiePoint.push_back(0.0);
-+   return true;
- }
- 
- 

debian/patches/series

 spelling-errors.patch
-0001-Fixed-missing-return.patch