[DebianGIS-dev] r2289 - in packages/libterralib/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Tue Jun 16 18:29:58 UTC 2009
Author: frankie
Date: 2009-06-16 18:29:57 +0000 (Tue, 16 Jun 2009)
New Revision: 2289
Added:
packages/libterralib/debian/Makefile
packages/libterralib/debian/libterralib1.install
packages/libterralib/debian/watch
Removed:
packages/libterralib/debian/libterralib1c2a.install
packages/libterralib/debian/patches/358243_gcc4.1_FTBFS.patch
packages/libterralib/debian/patches/amd64.patch
Modified:
packages/libterralib/debian/changelog
packages/libterralib/debian/compat
packages/libterralib/debian/control
packages/libterralib/debian/libterralib1-dev.install
packages/libterralib/debian/rules
Log:
Updated to current upstream version.
Added: packages/libterralib/debian/Makefile
===================================================================
--- packages/libterralib/debian/Makefile (rev 0)
+++ packages/libterralib/debian/Makefile 2009-06-16 18:29:57 UTC (rev 2289)
@@ -0,0 +1,31 @@
+all: terralib
+
+tiff:
+ cd ../tiff; make
+
+tiff_debug:
+ cd ../tiff; make debug
+
+debug: tiff_debug te_debug copy_dlls
+
+terralib: te_release
+
+te_release:
+ qmake -o makeTerralib terralib.pro; make -f makeTerralib
+
+te_debug:
+ qmake -o makeTerralib.debug terralib.pro TE_PROJECT_TYPE=DEBUG; make -f makeTerralib.debug
+
+clean:
+ if \
+ test -f makeTerralib; \
+ then \
+ make -f makeTerralib distclean; rm -f makeTerralib; \
+ fi
+
+clean_debug:
+ if \
+ test -f makeTerralib.debug; \
+ then \
+ make -f makeTerralib.debug distclean; rm -f makeTerralib.debug; \
+ fi
Property changes on: packages/libterralib/debian/Makefile
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/libterralib/debian/changelog
===================================================================
--- packages/libterralib/debian/changelog 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/changelog 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1,3 +1,14 @@
+libterralib (3.1.1-1) unstable; urgency=low
+
+ The 'Sometimes they returns!' release.
+
+ * Updated to current upstream version.
+ * Now using DebianGis team contact address as maintainer.
+ * Now install libterralibtiff geotiff support, but it needs to be dropped
+ in favour of the debian provided one.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 16 Jun 2009 19:06:42 +0200
+
libterralib (3.0.3b2-4) UNRELEASED; urgency=low
[ Paul Wise ]
Modified: packages/libterralib/debian/compat
===================================================================
--- packages/libterralib/debian/compat 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/compat 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1 +1 @@
-4
+7
Modified: packages/libterralib/debian/control
===================================================================
--- packages/libterralib/debian/control 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/control 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1,14 +1,15 @@
Source: libterralib
Priority: optional
Maintainer: Debian GIS Team <pkg-grass-devel at lists.alioth.debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), cdbs, qt3-dev-tools, libqt3-mt-dev
-Standards-Version: 3.6.2
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7), cdbs, qt3-dev-tools, libqt3-mt-dev, libgeotiff-dev
+Standards-Version: 3.8.1
Section: libs
+Homepage: http://www.terralib.org/
Package: libterralib1-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libterralib1c2a (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libterralib1 (= ${binary:Version}), libgeotiff-dev
Suggests: libterralib1-doc (= ${source:Version})
Provides: libterralib-dev
Conflicts: libterralib-dev
@@ -24,16 +25,14 @@
functions, written in ANSI-C++.
.
This package contains development files for terralib.
- .
- Homepage: http://www.terralib.org
-Package: libterralib1c2a
+Package: libterralib1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libterralib1-doc (= ${source:Version})
-Replaces: libterralib1
-Conflicts: libterralib1
+Suggests: libterralib-doc (= ${source:Version})
+Replaces: libterralib1c2a
+Conflicts: libterralib1c2a
Description: A 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
@@ -44,14 +43,12 @@
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++.
- .
- Homepage: http://www.terralib.org
-Package: libterralib1-doc
+Package: libterralib-doc
Section: doc
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libterralib1c2a (= ${binary:Version})
+Recommends: libterralib1 (= ${binary:Version})
Description: A 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
@@ -64,5 +61,3 @@
functions, written in ANSI-C++.
.
This package contains examples for the terralib library.
- .
- Homepage: http://www.terralib.org
Modified: packages/libterralib/debian/libterralib1-dev.install
===================================================================
--- packages/libterralib/debian/libterralib1-dev.install 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/libterralib1-dev.install 2009-06-16 18:29:57 UTC (rev 2289)
@@ -5,4 +5,4 @@
src/terralib/kernel/*.h usr/include/terralib/kernel
src/terralib/stat/*.h usr/include/terralib/stat
libterralib.a usr/lib
-terralibx/terralib/libterralib.so usr/lib
+terralibx/Release/libterralib.so usr/lib
Copied: packages/libterralib/debian/libterralib1.install (from rev 2288, packages/libterralib/debian/libterralib1c2a.install)
===================================================================
--- packages/libterralib/debian/libterralib1.install (rev 0)
+++ packages/libterralib/debian/libterralib1.install 2009-06-16 18:29:57 UTC (rev 2289)
@@ -0,0 +1 @@
+terralibx/Release/libterralib.so.* usr/lib
Deleted: packages/libterralib/debian/libterralib1c2a.install
===================================================================
--- packages/libterralib/debian/libterralib1c2a.install 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/libterralib1c2a.install 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1 +0,0 @@
-terralibx/terralib/libterralib.so.* usr/lib
Deleted: packages/libterralib/debian/patches/358243_gcc4.1_FTBFS.patch
===================================================================
--- packages/libterralib/debian/patches/358243_gcc4.1_FTBFS.patch 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/patches/358243_gcc4.1_FTBFS.patch 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1,37 +0,0 @@
-diff -Nur libterralib-3.0.3b2/src/terralib/kernel/TeLegendEntry.h libterralib-3.0.3b2.new/src/terralib/kernel/TeLegendEntry.h
---- libterralib-3.0.3b2/src/terralib/kernel/TeLegendEntry.h 2004-11-20 02:27:45.000000000 +0800
-+++ libterralib-3.0.3b2.new/src/terralib/kernel/TeLegendEntry.h 2006-03-22 15:55:51.000000000 +0800
-@@ -54,7 +54,7 @@
- public:
-
- //! Constructor
-- TeLegendEntry::TeLegendEntry () :
-+ TeLegendEntry () :
- label_(""),
- id_(-1),
- theme_(0),
-@@ -62,7 +62,7 @@
- {}
-
- //! Constructor
-- TeLegendEntry::TeLegendEntry (const TeSlice& slice) :
-+ TeLegendEntry (const TeSlice& slice) :
- slice_(slice),
- id_(-1),
- theme_(0),
-diff -Nur libterralib-3.0.3b2/src/terralib/kernel/TeSlice.h libterralib-3.0.3b2.new/src/terralib/kernel/TeSlice.h
---- libterralib-3.0.3b2/src/terralib/kernel/TeSlice.h 2005-03-29 03:56:51.000000000 +0800
-+++ libterralib-3.0.3b2.new/src/terralib/kernel/TeSlice.h 2006-03-22 15:55:51.000000000 +0800
-@@ -48,10 +48,10 @@
- string to_; //! interval upper value
-
- //! Constructor
-- TeSlice::TeSlice () : count_(0),from_(""),to_("") {}
-+ TeSlice () : count_(0),from_(""),to_("") {}
-
- //! Constructor
-- TeSlice::TeSlice(const string& from, const string& to, int count=0) :
-+ TeSlice(const string& from, const string& to, int count=0) :
- count_(count),
- from_(from),
- to_(to) {}
Deleted: packages/libterralib/debian/patches/amd64.patch
===================================================================
--- packages/libterralib/debian/patches/amd64.patch 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/patches/amd64.patch 2009-06-16 18:29:57 UTC (rev 2289)
@@ -1,50 +0,0 @@
-diff -ruN libterralib-3.0.3b2.orig/src/terralib/kernel/TeDecoderMemoryMap.cpp libterralib-3.0.3b2/src/terralib/kernel/TeDecoderMemoryMap.cpp
---- libterralib-3.0.3b2.orig/src/terralib/kernel/TeDecoderMemoryMap.cpp 2005-02-21 19:23:35.000000000 +0000
-+++ libterralib-3.0.3b2/src/terralib/kernel/TeDecoderMemoryMap.cpp 2005-09-11 00:16:24.667202213 +0000
-@@ -591,7 +591,7 @@
- m_dwSize = aux.st_size;
-
- m_lpszFile = mmap(0, m_dwSize, PROT_READ|PROT_WRITE , MAP_PRIVATE, m_hFile, 0);
-- if ( ((int) m_lpszFile) == -1 )
-+ if ( ((long) m_lpszFile) == -1 )
- return;
- }
-
-@@ -631,7 +631,7 @@
- m_dwSize = aux.st_size;
-
- m_lpszFile = mmap(0, m_dwSize, PROT_READ|PROT_WRITE , MAP_PRIVATE, m_hFile, 0);
-- if ( ((int) m_lpszFile) == -1 )
-+ if ( ((long) m_lpszFile) == -1 )
- return false;
-
- // Writes the default values
-diff -ruN libterralib-3.0.3b2.orig/src/terralib/kernel/lexTemporal.cpp libterralib-3.0.3b2/src/terralib/kernel/lexTemporal.cpp
---- libterralib-3.0.3b2.orig/src/terralib/kernel/lexTemporal.cpp 2004-11-12 18:32:46.000000000 +0000
-+++ libterralib-3.0.3b2/src/terralib/kernel/lexTemporal.cpp 2005-09-11 00:17:48.793954455 +0000
-@@ -650,11 +650,11 @@
- int my_yyinput(char* buf, int max_size)
- {
- int n = max_size;
-- int s = myinputlim - (int)myinputptr;
-+ long s = myinputlim - (long)myinputptr;
- if(max_size>s)
- n = s;
-
-- //int n = min(max_size, myinputlim - (int)myinputptr);
-+ //int n = min(max_size, myinputlim - (long)myinputptr);
- if(n>0)
- {
- initLexOut();
-diff -ruN libterralib-3.0.3b2.orig/src/terralib/kernel/yyTemporal.cpp libterralib-3.0.3b2/src/terralib/kernel/yyTemporal.cpp
---- libterralib-3.0.3b2.orig/src/terralib/kernel/yyTemporal.cpp 2004-05-12 12:45:13.000000000 +0000
-+++ libterralib-3.0.3b2/src/terralib/kernel/yyTemporal.cpp 2005-09-11 00:18:29.602557999 +0000
-@@ -74,7 +74,7 @@
- myinputptr_aux = strIn;
- myinputptr = myinputptr_aux.c_str();
-
-- myinputlim = (int)myinputptr + strIn.size ();
-+ myinputlim = (long)myinputptr + strIn.size ();
- database_ = db;
- return 1;
- }
Modified: packages/libterralib/debian/rules
===================================================================
--- packages/libterralib/debian/rules 2009-06-15 17:57:55 UTC (rev 2288)
+++ packages/libterralib/debian/rules 2009-06-16 18:29:57 UTC (rev 2289)
@@ -13,10 +13,10 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
common-build-arch::
- $(MAKE) -C terralibx/terralib
- ar rcs libterralib.a terralibx/terralib/.obj/*.o
+ $(MAKE) -C terralibx/terralib -f debian/Makefile
+ ar rcs libterralib.a ./terralibx/Release/.obj/terralib/*.o
clean::
- -$(MAKE) -C terralibx/terralib clean
- -$(MAKE) -C terralibx/tiff clean
+ $(MAKE) -C terralibx/terralib clean -f debian/Makefile
+ $(MAKE) -C terralibx/tiff clean -f debian/Makefile
-rm -f libterralib.a
Added: packages/libterralib/debian/watch
===================================================================
--- packages/libterralib/debian/watch (rev 0)
+++ packages/libterralib/debian/watch 2009-06-16 18:29:57 UTC (rev 2289)
@@ -0,0 +1,2 @@
+version=3
+http://www.dpi.inpe.br/terralib/dow TerraLib_linux_v_([0-9_]+)\.tar\.gz
More information about the Pkg-grass-devel
mailing list