[libterralib] 23/24: Imported Debian patch 4.3.0+dfsg.1-1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Aug 1 23:04:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libterralib.
commit a80e5a1f23c70939390d8d8e26c5dbc47a44a28d
Merge: 469081f 331ab38
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Sep 14 09:23:31 2014 +0100
Imported Debian patch 4.3.0+dfsg.1-1
debian/changelog | 11 +++++++++++
debian/control | 4 +++-
debian/patches/clang-fix.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 3 ++-
debian/source/options | 1 +
dependencies/linux/DSDK/lib/libgdal.a | Bin 5369194 -> 0 bytes
dependencies/linux/DSDK/lib/libltidsdk.a | Bin 3896770 -> 0 bytes
dependencies/linux/Firebird/lib/libfbembed.so | Bin 2587392 -> 0 bytes
dependencies/linux/Firebird/lib/libicudata.so.30 | Bin 1103596 -> 0 bytes
dependencies/linux/Firebird/lib/libicui18n.so.30 | Bin 317296 -> 0 bytes
dependencies/linux/Firebird/lib/libicuuc.so.30 | Bin 812376 -> 0 bytes
dependencies/linux/MySQL/lib/libmysqlclient.a | Bin 1506542 -> 0 bytes
dependencies/linux/Oracle/lib/libclntsh.so.10.1 | Bin 12579912 -> 0 bytes
dependencies/linux/Oracle/lib/libnnz10.so | Bin 2121817 -> 0 bytes
dependencies/linux/Oracle/lib/libociei.so | Bin 70659429 -> 0 bytes
dependencies/linux/PostgreSQL/lib/libpq.a | Bin 137152 -> 0 bytes
dependencies/linux/opengl/lib/libGL.so | Bin 428204 -> 0 bytes
dependencies/linux/opengl/lib/libGLU.so | Bin 574024 -> 0 bytes
dependencies/linux/opengl/lib/libdrm.so | Bin 27952 -> 0 bytes
20 files changed, 37 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index 6118a79,0000000..94c716b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,132 -1,0 +1,143 @@@
++libterralib (4.3.0+dfsg.1-1) unstable; urgency=medium
++
++ * Build dfsg release without unnecessary .so files that don't
++ have sources.
++ * Fix from Nicolas Sévelin-Radiguet for clang FTBFS. Closes: #746608.
++ * Now use xz compression.
++ * Drop unused dependencies on python-dev-all;
++ * Build using qt5.
++
++ -- Alastair McKinstry <mckinstry at debian.org> Sun, 14 Sep 2014 09:23:31 +0100
++
+libterralib (4.3.0-1) unstable; urgency=low
+
+ * Standards-Version: 3.9.5. No changes required.
+ * Move debhelper depends to (>= 9).
+ * Add hardening.
+ * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 24 Feb 2014 18:59:50 +0000
+
+libterralib (4.0.0-4) unstable; urgency=low
+
+ * B-D on libtiff5-dev, not libtiff-dev. Closes: #665034.
+ * Standards-Version: 3.9.3; no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 12 Apr 2012 21:04:36 +0100
+
+libterralib (4.0.0-3) unstable; urgency=low
+
+ * Ensure libterralib is linked against libtiff. Include libtiff-dev B-D.
+ * Multi-Arch support.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 01 Sep 2011 14:22:45 +0100
+
+libterralib (4.0.0-2) unstable; urgency=low
+
+ * Need to depend on qt4-qmake, not just qt4-dev-tools. Closes: #632759
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 07 Jul 2011 09:31:47 +0100
+
+libterralib (4.0.0-1) unstable; urgency=low
+
+ * New upstream release. Closes: #622858.
+ * Change libname to match package soname libterralib1c2a -> libterralib3
+ * Standards-Version: 3.9.2. No changes required.
+ * Use dh_python2, depend on python-all-dev
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 04 Jul 2011 05:34:15 +0100
+
+libterralib (3.3.1-8) unstable; urgency=low
+
+ * Do chmod of examples in build stage, for safety.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 25 Jan 2010 13:52:16 +0000
+
+libterralib (3.3.1-7) experimental; urgency=low
+
+ * Build in experimental with DH_VERBOSE=1 to show problems I can't
+ reproduce.
+ * Tidy up shlib:Depends. Generate shlibs.libterralib1c2a
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 24 Jan 2010 15:21:41 +0000
+
+libterralib (3.3.1-6) unstable; urgency=low
+
+ * Reverse libjpeg8-dev | libpeg8-dev B-D so it will build before
+ other dependencies make the libjpeg8 transition.
+ * Move from CDBS to debhelper 7 + source format 3.0 build.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 22 Jan 2010 03:48:29 +0000
+
+libterralib (3.3.1-5) unstable; urgency=low
+
+ * FTBFS with libjpeg8 (namespace collision in new lib). Closes: #565322.
+ * Build-Dep on libjpeg8-dev | libjpeg-dev, not libjpeg62-dev.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 21 Jan 2010 16:31:54 +0000
+
+libterralib (3.3.1-4) unstable; urgency=low
+
+ * Build fixes for g++ 4.4. Closes: #541092.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 14 Oct 2009 21:42:50 +0100
+
+libterralib (3.3.1-3) unstable; urgency=low
+
+ * Add build-dependency on libtiff4-dev. Closes: #540661.
+ * Add pkgconfig file. Closes: #540779.
+ * Patch from Cyril Brulebois to fix FTBFS on GNU/kfreesd. Closes: #539123.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 10 Aug 2009 12:50:03 +0100
+
+libterralib (3.3.1-2) unstable; urgency=low
+
+ * Remove pre-build binaries from source.
+ * Remove tiff, libjpeg, zlib, qwt sources in favour of external libs.
+ * Remove unused and copyright-troublesome Oracle, DSDK , MySQL,
+ PostgreSQL sources.
+ * Include listat.so* and libstat.
+ * Remove unneeded mtrand* sources.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 25 Jul 2009 11:24:49 +0100
+
+libterralib (3.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Move to Standards-Version: 3.8.2, Debhelper DH_COMPAT 7.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 17 Jun 2009 11:29:16 +0100
+
+libterralib (3.0.3b2-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix GCC 4.1 FTBFS, patch from Martin Michlmayr. Closes: #358243
+
+ -- Paul Wise <pabs3 at bonedaddy.net> Wed, 22 Mar 2006 15:57:53 +0800
+
+libterralib (3.0.3b2-3) unstable; urgency=low
+
+ * New maintainer. (Closes: #342800)
+ * Fix new C++ transition (libstdc++ allocator). (Closes: #339221)
+ * Rename libterralib1 to libterralib1c2a, and adjust
+ Conflicts/Replaces. Patch from Daniel T Chen and ubuntu.
+
+ -- Petter Reinholdtsen <pere at debian.org> Fri, 23 Dec 2005 12:23:05 +0100
+
+libterralib (3.0.3b2-2) unstable; urgency=low
+
+ * Added patch for amd64 compability. Thanks to Andreas Jochens
+ <aj at andraco.de>. Closes: #326693
+ * Upload sponsored by Petter Reinholdtsen.
+
+ -- Marco Tulio Gontijo e Silva <marcot at minaslivre.org> Sun, 11 Sep 2005 00:39:24 +0000
+
+libterralib (3.0.3b2-1) unstable; urgency=low
+
+ * Initial release. Closes: #318961
+ * Upstream is not providing tarballs, so the orig file was generated for
+ debian from CVS.
+ * Sponsored by Petter Reinholdtsen.
+
+ -- Marco Tulio Gontijo e Silva <marcot at minaslivre.org> Mon, 18 Jul 2005 21:05:39 +0000
+
diff --cc debian/control
index 585ba65,0000000..0bc44c6
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,68 -1,0 +1,70 @@@
+Source: libterralib
+Section: libs
+Priority: optional
+Maintainer: Debian GIS Team <pkg-grass-devel at lists.alioth.debian.org>
+Uploaders: Petter Reinholdtsen <pere at debian.org>, Alastair McKinstry <mckinstry at debian.org>
- Build-Depends: debhelper (>= 9), qt4-dev-tools, libgeotiff-dev, zlib1g-dev, libjpeg-dev | libjpeg8-dev, python-all-dev, qt4-qmake, libtiff5-dev
++Build-Depends: debhelper (>= 9),
++ libgeotiff-dev, zlib1g-dev, libjpeg-dev | libjpeg8-dev, libtiff5-dev,
++ qt5-qmake, qtbase5-dev
+Homepage: http://www.terralib.org/
+Vcs-Svn: https://svn.dpi.inpe.br/terralib/tags/v-4-0-0/src
+Standards-Version: 3.9.5
+
+Package: libterralib-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libterralib (= ${binary:Version})
+Suggests: libterralib-doc (= ${binary:Version})
+Conflicts: libterralib1-dev, libterralib3-dev
+Replaces: libterralib3-dev
+Description: C++ library for Geographical Information Systems -- development package
+ TerraLib enables quick development of custom-built geographical applications
+ using spatial databases. As a research tool, TerraLib is aimed at providing a
+ rich and powerful environment for the development of GIS research,
+ enabling the development of GIS prototypes that include new concepts such as
+ spatio-temporal data models, geographical ontologies and advanced spatial
+ analysis techniques. TerraLib defines a geographical data model and provides
+ support for this model over a range of different DBMS (MySQL, PostgreSQL,
+ ORACLE and ACCESS), and is implemented as a library of C++ classes and
+ functions, written in ANSI-C++.
+ .
+ This package contains development files for terralib.
+
+Package: libterralib
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Suggests: libterralib-doc (= ${binary:Version})
+Conflicts: libterralib1c2a, libterralib3
+Replaces: libterralib1c2a, libterralib3
+Description: C++ library for Geographical Information Systems
+ TerraLib enables quick development of custom-built geographical applications
+ using spatial databases. As a research tool, TerraLib is aimed at providing a
+ rich and powerful environment for the development of GIS research,
+ enabling the development of GIS prototypes that include new concepts such as
+ spatio-temporal data models, geographical ontologies and advanced spatial
+ analysis techniques. TerraLib defines a geographical data model and provides
+ support for this model over a range of different DBMS (MySQL, PostgreSQL,
+ ORACLE and ACCESS), and is implemented as a library of C++ classes and
+ functions, written in ANSI-C++.
+
+Package: libterralib-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: libterralib3-doc
+Recommends: libterralib (= ${binary:Version})
+Description: C++ library for Geographical Information Systems -- documentation package
+ TerraLib enables quick development of custom-built geographical applications
+ using spatial databases. As a research tool, TerraLib is aimed at providing a
+ rich and powerful environment for the development of GIS research,
+ enabling the development of GIS prototypes that include new concepts such as
+ spatio-temporal data models, geographical ontologies and advanced spatial
+ analysis techniques. TerraLib defines a geographical data model and provides
+ support for this model over a range of different DBMS (MySQL, PostgreSQL,
+ ORACLE and ACCESS), and is implemented as a library of C++ classes and
+ functions, written in ANSI-C++.
+ .
+ This package contains examples for the terralib library.
diff --cc debian/patches/clang-fix.patch
index 0000000,0000000..caea0b4
new file mode 100644
--- /dev/null
+++ b/debian/patches/clang-fix.patch
@@@ -1,0 -1,0 +1,19 @@@
++Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746608
++Description: Fix for clang FTBFS.
++Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
++Last-Updated: 2014-09-14
++Forwarded: no
++
++Index: libterralib-4.3.0/src/terralib/kernel/Gra_algo.h
++===================================================================
++--- libterralib-4.3.0.orig/src/terralib/kernel/Gra_algo.h
+++++ libterralib-4.3.0/src/terralib/kernel/Gra_algo.h
++@@ -187,7 +187,7 @@ bool topoSort(
++ std::cerr << "Error: graph contains a cycle!\n";
++ return VerticesWithoutSuccessor == 0;
++ */
++- return;
+++ return 1;
++ }
++
++ } // namespace br_stl
diff --cc debian/patches/series
index ff2d1e7,0000000..dea468e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
+geotiff.patch
+kfreebsd-build.patch
+pkg-config.patch
++clang-fix.patch
diff --cc debian/rules
index 64267df,0000000..7a58bce
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,52 -1,0 +1,53 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# The magic debhelper rule
+%:
- dh $@ --with-python2
++ dh $@
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
++export QT_SELECT=5
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# To enable all, uncomment following line
+DEB_BUILD_MAINT_OPTIONS:= hardening=+all
+DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
+export DEB_BUILD_MAINT_OPTIONS
+export DEB_CFLAGS_MAINT_APPEND
+
+override_dh_auto_build:
+ find examples -type f -exec chmod 644 {} \;
+ cd build/qt4/terralib && qmake QMAKE_CXXFLAGS=-fpermissive terralib.pro && $(MAKE)
+ cd build/qt4/te_functions && qmake QMAKE_CXXFLAGS=-fpermissive te_functions.pro && $(MAKE)
+ cd build/qt4/te_utils && qmake QMAKE_CXXFLAGS=-fpermissive te_utils.pro && $(MAKE)
+ ar rcs libterralib.a Release/linux-g++/obj/terralib/*.o
+ ar rcs libte_functions.a Release/linux-g++/obj/te_functions/*.o
+ ar rcs libte_utils.a Release/linux-g++/obj/te_utils/*.o
+
+override_dh_auto_install:
+ dh_install
+ # Install into Multarch directories
+ dh_install -p libterralib Release/linux-g++/libterralib.so.* usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib Release/linux-g++/libte_utils.so.* usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib Release/linux-g++/libte_functions.so.* usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev libterralib.a usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev libte_utils.a usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev libte_functions.a usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev Release/linux-g++/libterralib.so usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev Release/linux-g++/libte_utils.so usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p libterralib-dev Release/linux-g++/libte_functions.so usr/lib/$(DEB_HOST_MULTIARCH)
+ # nasty hack.
+ mkdir -p debian/libterralib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+ sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' < libterralib.pc > debian/libterralib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libterralib.pc
+
+override_dh_clean:
+ dh_clean
+ rm -f lib*.a
+ rm -rf Release
+ find . -name '.cvsignore' -exec rm {} \;
+ $(MAKE) -C build/qt4/terralib distclean || echo "terralib already clean"
+ $(MAKE) -C build/qt4/te_utils distclean || echo "te_utils already clean"
+ $(MAKE) -C build/qt4/te_functions distclean || echo "te_functions already clean"
+
diff --cc debian/source/options
index 0000000,0000000..b7bc1f2
new file mode 100644
--- /dev/null
+++ b/debian/source/options
@@@ -1,0 -1,0 +1,1 @@@
++compression = "xz"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git
More information about the Pkg-grass-devel
mailing list