[ossim] 12/23: Refresh patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim.

commit 90525409c1b327eccef9435000e00893a099e3d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 16 14:41:29 2015 +0100

    Refresh patches.
---
 debian/changelog                                |  1 +
 debian/patches/avoid_overwrite_build_date.patch |  2 +-
 debian/patches/cmake                            | 14 +++++++-------
 debian/patches/output-typo.patch                |  4 ++--
 debian/patches/unknown-typo.patch               |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 941d373..82b299e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ossim (1.8.20.2+ds-1) UNRELEASED; urgency=medium
   * Update copyright file using copyright-format 1.0.
   * Update watch file to set repacksuffix and use HTTP.
   * Use ossim subdirectory as source directory.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 16 Dec 2015 14:21:12 +0100
 
diff --git a/debian/patches/avoid_overwrite_build_date.patch b/debian/patches/avoid_overwrite_build_date.patch
index 964421f..b315901 100644
--- a/debian/patches/avoid_overwrite_build_date.patch
+++ b/debian/patches/avoid_overwrite_build_date.patch
@@ -6,7 +6,7 @@ Last-Update: 2015-06-04
 
 --- a/ossim/CMakeLists.txt
 +++ b/ossim/CMakeLists.txt
-@@ -148,7 +148,9 @@ endif ( ZLIB_FOUND )
+@@ -162,7 +162,9 @@ endif ( ZLIB_FOUND )
  #---
  # Call the OSSIM macros in OssimUtilities.cmake
  #---
diff --git a/debian/patches/cmake b/debian/patches/cmake
index b3354c7..edba16f 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -3262,23 +3262,23 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
  OSSIM_LINK_LIBRARY(${LIB_NAME} 
                     COMPONENT_NAME ossim 
 -                   TYPE ${OSSIM_USER_DEFINED_DYNAMIC_OR_STATIC}
-+				   TYPE "SHARED"
++                   TYPE "SHARED"
                     LIBRARIES ${ossimDependentLibs}
                     HEADERS "${OSSIM_HEADER_FILES}" 
                     PUBLIC_HEADERS "${ossim_HDRS}"
                     SOURCE_FILES "${ossim_SRCS}"
-                    INSTALL_LIB VERSION_SYMLINKS INSTALL_HEADERS)
+                    INSTALL_LIB VERSION_SYMLINKS)
  
 +OSSIM_LINK_LIBRARY(${LIB_NAME_STATIC} 
 +                   COMPONENT_NAME ossim 
-+				   TYPE "STATIC"
++                   TYPE "STATIC"
 +                   LIBRARIES ${ossimDependentLibs}
 +                   HEADERS "${OSSIM_HEADER_FILES}" 
 +                   PUBLIC_HEADERS "${ossim_HDRS}"
 +                   SOURCE_FILES "${ossim_SRCS}"
-+                   INSTALL_LIB VERSION_SYMLINKS INSTALL_HEADERS)
++                   INSTALL_LIB VERSION_SYMLINKS)
 +SET_TARGET_PROPERTIES(${LIB_NAME_STATIC}  PROPERTIES OUTPUT_NAME ossim)
 +
- ########################################################## If DO special case for ossim core needs to have the files mapped properly ################################ 
- IF(NOT OSSIM_BUILD_FRAMEWORKS OR NOT APPLE)
-    install(FILES ${ossim_HDRS} DESTINATION include/ossim COMPONENT ossim) 
+ # The install headers was duplicating ossimVersion.h and ossimConfig.h in "install_prefix/include".
+ # INSTALL_HEADERS)
+ 
diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch
index 19d9cb7..42734f4 100644
--- a/debian/patches/output-typo.patch
+++ b/debian/patches/output-typo.patch
@@ -67,7 +67,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
   
 --- a/ossim/src/ossim/projection/ossimSensorModel.cpp
 +++ b/ossim/src/ossim/projection/ossimSensorModel.cpp
-@@ -1301,7 +1301,7 @@ ossimSensorModel::optimizeFit(const ossi
+@@ -1404,7 +1404,7 @@ ossimSensorModel::optimizeFit(const ossi
     //note : please limit the number of tie points
     //
     //INPUTS: requires Jacobian matrix (partial derivatives with regards to parameters)
@@ -89,7 +89,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
     }
 --- a/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp
 +++ b/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp
-@@ -395,7 +395,7 @@ void ossimNitfImageHeaderV2_1::writeStre
+@@ -445,7 +445,7 @@ void ossimNitfImageHeaderV2_1::writeStre
        out.write(theUserDefinedOverflow, 3);
     }
  
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
index ad7c648..c304def 100644
--- a/debian/patches/unknown-typo.patch
+++ b/debian/patches/unknown-typo.patch
@@ -25,7 +25,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
        
 --- a/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp
 +++ b/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp
-@@ -893,7 +893,7 @@ void ossimOverviewSequencer::resampleTil
+@@ -891,7 +891,7 @@ void ossimOverviewSequencer::resampleTil
        }
        default:
           ossimNotify(ossimNotifyLevel_WARN)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git