This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libterralib.
commit df6b48c1457f0aa43ca95100c1ad0aeabb8ac8b0
Author: Alastair McKinstry <mckins...@debian.org>
Date: Mon Aug 10 19:14:35 2009 +0100
Imported Debian patch 3.3.1-2
---
debian/changelog | 12 ++++++++++--
debian/control | 2 +-
debian/libterralib1-dev.dirs | 1 +
debian/libterralib1-dev.install | 1 +
debian/patches/kfreebsd-build.patch | 13 +++++++++++++
debian/patches/pkg-config.patch | 30 ++++++++++++++++++++++++++++++
terralibx/image_processing/makepdi | 4 ++--
terralibx/stat/makeStat | 2 +-
8 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6668fd3..5d14d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
+libterralib (3.3.1-2) 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 <mckins...@debian.org> Mon, 10 Aug 2009 19:14:35 +0100
+
libterralib (3.3.1-1) unstable; urgency=low
* New upstream release.
* Move to Standards-Version: 3.8.2, Debhelper DH_COMPAT 7.
- * Remove pre-built binaries from source.
+ * 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.
+ * Remove unneeded mtrand* sources.
-- Alastair McKinstry <mckins...@debian.org> Sat, 25 Jul 2009 11:24:49 +0100
diff --git a/debian/control b/debian/control
index 13412cd..edc0616 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Debian GIS Team <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <p...@debian.org>, Alastair McKinstry
<mckins...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, qt3-dev-tools, libqt3-mt-dev,
libgeotiff-dev, libshp-dev, zlib1g-dev, libjpeg62-dev
+Build-Depends: debhelper (>= 7), cdbs, qt3-dev-tools, libqt3-mt-dev,
libgeotiff-dev, libshp-dev, zlib1g-dev, libjpeg62-dev, libtiff4-dev
Homepage: http://www.terralib.org/
Standards-Version: 3.8.2
diff --git a/debian/libterralib1-dev.dirs b/debian/libterralib1-dev.dirs
index f649f9c..f32702f 100644
--- a/debian/libterralib1-dev.dirs
+++ b/debian/libterralib1-dev.dirs
@@ -5,3 +5,4 @@ usr/include/terralib/drivers/
usr/include/terralib/functions/
usr/include/terralib/kernel/
usr/include/terralib/stat/
+usr/lib/pkgconfig
diff --git a/debian/libterralib1-dev.install b/debian/libterralib1-dev.install
index 06ac92e..a96ad35 100644
--- a/debian/libterralib1-dev.install
+++ b/debian/libterralib1-dev.install
@@ -8,3 +8,4 @@ libstat.a usr/lib
terralibx/Release/libterralib.so usr/lib
terralibx/Release/libstat.so usr/lib
# terralibx/Release/libterralibpdi.so usr/lib
+libterralib.pc usr/lib/pkgconfig
diff --git a/debian/patches/kfreebsd-build.patch
b/debian/patches/kfreebsd-build.patch
new file mode 100644
index 0000000..6e678f8
--- /dev/null
+++ b/debian/patches/kfreebsd-build.patch
@@ -0,0 +1,13 @@
+# Patch from Cyril Brulebois to allow building on GNU / KFreeBSD.
+diff -Nur -x '*.orig' -x '*~' libterralib/src/terralib/kernel/TeDefines.h
libterralib.new/src/terralib/kernel/TeDefines.h
+--- libterralib/src/terralib/kernel/TeDefines.h 2009-06-22
18:45:32.000000000 +0100
++++ libterralib.new/src/terralib/kernel/TeDefines.h 2009-08-10
12:48:55.000000000 +0100
+@@ -49,7 +49,7 @@
+
+ #if defined( WIN32 ) || defined( __WIN32__ ) || defined ( _WIN32 ) ||
defined( WIN64 ) || defined( _WIN32_WCE )
+ #define TePLATFORM TePLATFORMCODE_MSWINDOWS
+-#elif defined( __LINUX__ ) || defined( linux ) || defined( __linux__ )
||defined( __FreeBSD__ ) //FAMI
++#elif defined( __LINUX__ ) || defined( linux ) || defined( __linux__ )
||defined( __FreeBSD__ ) || defined(__GLIBC__) //FAMI
+ #define TePLATFORM TePLATFORMCODE_LINUX
+ #elif defined( __APPLE_CC__ ) || defined( APPLE_CC )
+ #define TePLATFORM TePLATFORMCODE_APPLE
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
new file mode 100644
index 0000000..c25466f
--- /dev/null
+++ b/debian/patches/pkg-config.patch
@@ -0,0 +1,30 @@
+diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc
libterralib.new/libterralib.pc
+--- libterralib/libterralib.pc 1970-01-01 01:00:00.000000000 +0100
++++ libterralib.new/libterralib.pc 2009-08-10 12:44:12.000000000 +0100
+@@ -0,0 +1,11 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=/usr/lib
++includedir=${prefix}/include/terralib
++
++Name: libterralib
++Description: C++ library for Geographical Information Systems
++Version: 3.3.1
++Libs: -L${libdir} -lterralib
++Cflags: -I${includedir}/terralib
++Libs.private: -lz -ljpeg -ltiff -lpthread -lproj -lgeotiff
+diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc.in
libterralib.new/libterralib.pc.in
+--- libterralib/libterralib.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ libterralib.new/libterralib.pc.in 2009-08-10 12:43:14.000000000 +0100
+@@ -0,0 +1,11 @@
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=/usr/lib
++includedir=${prefix}/include/terralib
++
++Name: libterralib
++Description: C++ library for Geographical Information Systems
++Version: @VERSION@
++Libs: -L${libdir} -lterralib
++Cflags: -I${includedir}/terralib
++Libs.private: -lz -ljpeg -ltiff -lpthread -lproj -lgeotiff
diff --git a/terralibx/image_processing/makepdi
b/terralibx/image_processing/makepdi
index 90a9556..196e00e 100644
--- a/terralibx/image_processing/makepdi
+++ b/terralibx/image_processing/makepdi
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: libterralibpdi.so.1.0.0
-# Generated by qmake (1.07a) (Qt 3.3.8b) on: Sat Jul 25 12:21:01 2009
+# Generated by qmake (1.07a) (Qt 3.3.8b) on: Mon Aug 10 19:22:26 2009
# Project: terralibpdi.pro
# Template: lib
# Command: $(QMAKE) -o makepdi terralibpdi.pro
@@ -16,7 +16,7 @@ CFLAGS = -pipe -g -Wall -W -O2 -fPIC -DPDI_AS_DLL -DNDEBUG
CXXFLAGS = -pipe -g -Wall -W -O2 -fPIC -DPDI_AS_DLL -DNDEBUG
LEXFLAGS =
YACCFLAGS= -d
-INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I../../src/terralib/kernel
-I../../src/terralib/functions -I../../src/terralib/image_processing
-I../../src/terralib/image_processing/data_structs -I/usr/include/geotiff
+INCPATH = -I/usr/share/qt3/mkspecs/default -I. -I../../src/terralib/kernel
-I../../src/terralib/functions -I../../src/terralib/image_processing
-I../../src/terralib/image_processing/data_structs
-I../../../../../../../include/geotiff
LINK = g++
LFLAGS = -shared -Wl,-soname,libterralibpdi.so.1
LIBS = $(SUBLIBS) -L../Release -L/usr/lib -lz -ljpeg -lgeotiff -ltiff
-lpthread
diff --git a/terralibx/stat/makeStat b/terralibx/stat/makeStat
index 95e414f..3e6837f 100644
--- a/terralibx/stat/makeStat
+++ b/terralibx/stat/makeStat
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: libstat.so.1.0.0
-# Generated by qmake (1.07a) (Qt 3.3.8b) on: Sat Jul 25 12:21:00 2009
+# Generated by qmake (1.07a) (Qt 3.3.8b) on: Mon Aug 10 19:22:02 2009
# Project: stat.pro
# Template: lib
# Command: $(QMAKE) -o makeStat stat.pro
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libterralib.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
