[ossim] 01/02: Imported Debian patch 1.8.20.2+ds-1~trusty4
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Dec 20 21:08:06 UTC 2015
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 f37cc00aba8997547fdf6aac2b16676035a6b47f
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
Date: Fri Dec 18 22:48:00 2015 +0200
Imported Debian patch 1.8.20.2+ds-1~trusty4
---
debian/changelog | 18 ++++++++++++++++++
debian/control | 4 ++--
debian/gbp.conf | 2 +-
debian/patches/accommodate-typo.patch | 1 -
debian/patches/avoid_overwrite_build_date.patch | 1 -
debian/patches/developed-typo.patch | 1 -
debian/patches/extension-typo.patch | 1 -
debian/patches/message-typo.patch | 1 -
debian/patches/output-typo.patch | 1 -
debian/patches/unknown-typo.patch | 1 -
debian/rules | 9 +++------
11 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c42e978..1072690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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 --git a/debian/control b/debian/control
index f1e2a7b..2a8ce5d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
libcurl4-gnutls-dev | libcurl4-dev,
libexpat1-dev,
libfreetype6-dev,
- libgeos++-dev (>= 3.5.0),
+ libgeos++-dev,
libgeotiff-dev,
libgif-dev,
libjpeg-dev,
@@ -22,7 +22,7 @@ Build-Depends: autotools-dev,
zlib1g-dev
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/ossim.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/ossim.git -b osgeo/10.0
+Vcs-Git: git://anonscm.debian.org/pkg-grass/ossim.git
Homepage: http://www.ossim.org/
Package: libossim1
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 2125117..21d0417 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = osgeo/10.0
+debian-branch = master
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
diff --git a/debian/patches/accommodate-typo.patch b/debian/patches/accommodate-typo.patch
index c3a0ffb..eab5143 100644
--- a/debian/patches/accommodate-typo.patch
+++ b/debian/patches/accommodate-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'accomodate' typo, replace with 'accommodate'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/include/ossim/base/ossimGrect.h
+++ b/ossim/include/ossim/base/ossimGrect.h
diff --git a/debian/patches/avoid_overwrite_build_date.patch b/debian/patches/avoid_overwrite_build_date.patch
index 323d597..b55dc54 100644
--- a/debian/patches/avoid_overwrite_build_date.patch
+++ b/debian/patches/avoid_overwrite_build_date.patch
@@ -3,7 +3,6 @@ Description: Avoid overwrite build date.
it was already defined in command line.
Author: Juan Picca <jumapico at gmail.com>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/CMakeLists.txt
+++ b/ossim/CMakeLists.txt
diff --git a/debian/patches/developed-typo.patch b/debian/patches/developed-typo.patch
index fe327ae..1ded71c 100644
--- a/debian/patches/developed-typo.patch
+++ b/debian/patches/developed-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'developped' typo, replace with 'developed'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/src/ossim/base/ossimTieGpt.cpp
+++ b/ossim/src/ossim/base/ossimTieGpt.cpp
diff --git a/debian/patches/extension-typo.patch b/debian/patches/extension-typo.patch
index e68ca1f..fe3321f 100644
--- a/debian/patches/extension-typo.patch
+++ b/debian/patches/extension-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'extention' typo, replace with 'extension'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/include/ossim/imaging/ossimImageFileWriter.h
+++ b/ossim/include/ossim/imaging/ossimImageFileWriter.h
diff --git a/debian/patches/message-typo.patch b/debian/patches/message-typo.patch
index 079e3e3..0e07b7e 100644
--- a/debian/patches/message-typo.patch
+++ b/debian/patches/message-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'messsage' typo, replace with 'message'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/src/ossim/support_data/ossimNmeaMessage.cpp
+++ b/ossim/src/ossim/support_data/ossimNmeaMessage.cpp
diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch
index 25610ab..e3c631f 100644
--- a/debian/patches/output-typo.patch
+++ b/debian/patches/output-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'ouput' typo, replace with 'output'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/include/ossim/base/ossimImageTypeLut.h
+++ b/ossim/include/ossim/base/ossimImageTypeLut.h
diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch
index 64efb99..788e12e 100644
--- a/debian/patches/unknown-typo.patch
+++ b/debian/patches/unknown-typo.patch
@@ -1,7 +1,6 @@
Description: Fix 'unkown' typo, replace with 'unknown'.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: https://github.com/ossimlabs/ossim/pull/11
-Applied-Upstream: https://github.com/ossimlabs/ossim/commit/fe2b43831e539da7d247d1b429e66c735d7ddba2
--- a/ossim/include/ossim/support_data/ossimEnviHeader.h
+++ b/ossim/include/ossim/support_data/ossimEnviHeader.h
diff --git a/debian/rules b/debian/rules
index 47e4699..29630b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -n 's/^Date: //p' | LC_ALL=C date -
OSSIM_VERSION=$(shell dpkg-parsechangelog|grep Version:|cut -d' ' -f2|cut -d- -f1)
OSSIM_VERSION_TAG=$(subst .,_,$(OSSIM_VERSION))
-DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
OPTFLAG =
@@ -31,14 +29,13 @@ CMAKE_OPTS = \
-DBUILD_OSSIM_MPI_SUPPORT=OFF \
-DBUILD_OSSIM_TEST_APPS=ON \
-DBUILD_SHARED_LIBS=ON \
- -DGEOS_C_LIB=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos_c.so \
+ -DGEOS_C_LIB=/usr/lib/libgeos_c.so \
-DGEOS_INCLUDE_DIR=/usr/include/geos \
- -DGEOS_LIB=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos.so \
- -DGEOS_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeos_c.so \
+ -DGEOS_LIB=/usr/lib/libgeos.so \
-DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff \
-DCMAKE_MODULE_PATH=$(CURDIR)/CMakeModules \
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \
- -DGEOTIFF_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgeotiff.so
+ -DGEOTIFF_LIBRARY=/usr/lib/libgeotiff.so
override_dh_auto_clean:
rm -rf debian/build
--
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