[ossim] 01/02: Merge tag 'debian/1.8.20.3+ds-2' into osgeo/10.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jan 7 19:51:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch osgeo/10.0
in repository ossim.
commit 2f8e48a1c6cc243c15b0104a6bcb9af9056dc6e5
Merge: 54ab277 ce97e2a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jan 7 20:50:05 2016 +0100
Merge tag 'debian/1.8.20.3+ds-2' into osgeo/10.0
Conflicts:
debian/changelog
debian/rules
debian/README.source | 10 +
debian/changelog | 24 +
debian/control | 9 +-
debian/libossim-dev.install | 1 -
debian/manpages/ossim-adrg-dump.1 | 51 +
debian/manpages/ossim-applanix2ogeom.1 | 72 +
debian/manpages/ossim-autreg.1 | 102 ++
debian/manpages/ossim-band-merge.1 | 88 ++
debian/manpages/ossim-batch-test.1 | 103 ++
debian/manpages/ossim-btoa.1 | 27 +
debian/manpages/ossim-chgkwval.1 | 32 +
debian/manpages/ossim-chipper.1 | 429 +++++
debian/manpages/ossim-cmm.1 | 97 ++
debian/manpages/ossim-computeSrtmStats.1 | 55 +
debian/manpages/ossim-correl.1 | 18 +
debian/manpages/ossim-create-bitmask.1 | 103 ++
debian/manpages/ossim-create-cg.1 | 80 +
debian/manpages/ossim-create-histo.1 | 111 ++
debian/manpages/ossim-deg2dms.1 | 22 +
debian/manpages/ossim-dms2deg.1 | 22 +
debian/manpages/ossim-dump-ocg.1 | 18 +
debian/manpages/ossim-equation.1 | 175 +++
debian/manpages/ossim-extract-vertices.1 | 24 +
debian/manpages/ossim-hlz.1 | 175 +++
debian/manpages/ossim-icp.1 | 161 ++
debian/manpages/ossim-igen.1 | 57 +
debian/manpages/ossim-image-compare.1 | 21 +
debian/manpages/ossim-image-synth.1 | 21 +
debian/manpages/ossim-img2md.1 | 67 +
debian/manpages/ossim-img2rr.1 | 179 +++
debian/manpages/ossim-info.1 | 233 +++
debian/manpages/ossim-modopt.1 | 18 +
debian/manpages/ossim-mosaic.1 | 75 +
debian/manpages/ossim-ogeom2ogeom.1 | 84 +
debian/manpages/ossim-orthoigen.1 | 338 ++++
debian/manpages/ossim-pc2dem.1 | 161 ++
debian/manpages/ossim-pixelflip.1 | 135 ++
debian/manpages/ossim-preproc.1 | 246 +++
debian/manpages/ossim-prune.1 | 19 +
debian/manpages/ossim-rejout.1 | 18 +
debian/manpages/ossim-rpf.1 | 66 +
debian/manpages/ossim-senint.1 | 117 ++
debian/manpages/ossim-slope.1 | 86 +
debian/manpages/ossim-space-imaging.1 | 20 +
debian/manpages/ossim-src2src.1 | 18 +
debian/manpages/ossim-swapbytes.1 | 18 +
debian/manpages/ossim-tfw2ogeom.1 | 29 +
debian/manpages/ossim-viewshed.1 | 136 ++
debian/manpages/ossim-viirs-proc.1 | 57 +
debian/manpages/ossim-ws-cmp.1 | 22 +
debian/ossim-core.manpages | 46 +
debian/patches/avoid_overwrite_build_date.patch | 2 +-
debian/patches/cmake | 1643 ++------------------
debian/patches/unknown-typo.patch | 11 +
debian/rules | 16 +-
ossim/CMakeLists.txt | 6 +-
.../src/ossim/imaging/ossimMonoGridRemapEngine.cpp | 4 +-
.../projection/ossimNitfProjectionFactory.cpp | 17 +-
ossim/src/ossim/projection/ossimRpcModel.cpp | 24 +-
59 files changed, 4434 insertions(+), 1585 deletions(-)
diff --cc debian/changelog
index 1072690,9f2751b..dd06f49
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,27 +1,45 @@@
+ ossim (1.8.20.3+ds-2) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Rashad Kanavath ]
+ * Use date format YYYYMMDD for OSSIM_BUILD_DATE.
+ * Don't build frameworks for OSX.
+ * Remove unused dependencies for ossim-core.
+ * Update CMakeModules for 1.8.20, dropping support for the static library.
+
+ [ Bas Couwenberg ]
+ * Document the need to update the cmake patch for every new upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 07 Jan 2016 20:35:18 +0100
+
+ ossim (1.8.20.3+ds-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Refresh patches.
+ * Update unknown-typo.patch to fix another occurrence.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 21 Dec 2015 22:42:41 +0100
+
+ossim (1.8.20.2+ds-1~trusty4) trusty; urgency=medium
+
+ * Dropped DGEOS_LIBRARY.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 18 Dec 2015 22:48:00 +0200
+
+ossim (1.8.20.2+ds-1~trusty3) trusty; urgency=medium
+
+ * Reverting multiarch paths.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 18 Dec 2015 22:06:00 +0200
+
+ossim (1.8.20.2+ds-1~trusty2) trusty; urgency=medium
+
+ * Build for Trusty.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 18 Dec 2015 21:47:00 +0200
+
ossim (1.8.20.2+ds-1) unstable; urgency=medium
* Team upload.
diff --cc debian/control
index d7d927a,d67e327..d6d993b
--- a/debian/control
+++ b/debian/control
@@@ -3,22 -3,16 +3,16 @@@ Maintainer: Debian GIS Project <pkg-gra
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Section: science
Priority: extra
- Build-Depends: autotools-dev,
- cmake (>= 2.8),
+ Build-Depends: cmake (>= 2.8),
debhelper (>= 9),
libcurl4-gnutls-dev | libcurl4-dev,
- libexpat1-dev,
libfreetype6-dev,
- libgeos++-dev (>= 3.5.0),
+ libgeos++-dev,
libgeotiff-dev,
- libgif-dev,
libjpeg-dev,
- libopenscenegraph-dev,
libopenthreads-dev,
libpng-dev,
- libtar-dev,
libtiff-dev,
- libzzip-dev,
zlib1g-dev
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/ossim.git
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git
More information about the Pkg-grass-devel
mailing list