This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libterralib.
commit 259f79ede05f9a96b49fea12a628fa6cbf74fbf2
Author: Marco Tulio Gontijo e Silva <mar...@minaslivre.org>
Date: Sun Sep 11 00:39:24 2005 +0000
Imported Debian patch 3.0.3b2-2
---
debian/changelog | 12 +++++++++--
debian/patches/amd64.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 1 +
3 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4d71ac..c66674a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+libterralib (3.0.3b2-2) unstable; urgency=low
+
+ * Added patch for amd64 compability. Thanks to Andreas Jochens
+ <a...@andraco.de>. Closes: #326693
+ * Upload sponsored by Petter Reinholdtsen.
+
+ -- Marco Tulio Gontijo e Silva <mar...@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.
+ * Upstream is not providing tarballs, so the orig file was generated for
+ debian from CVS.
* Sponsored by Petter Reinholdtsen.
-- Marco Tulio Gontijo e Silva <mar...@minaslivre.org> Mon, 18 Jul 2005
21:05:39 +0000
diff --git a/debian/patches/amd64.patch b/debian/patches/amd64.patch
new file mode 100644
index 0000000..9845c82
--- /dev/null
+++ b/debian/patches/amd64.patch
@@ -0,0 +1,50 @@
+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;
+ }
diff --git a/debian/rules b/debian/rules
index a8c033f..88c8751 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@
#export DH_VERBOSE=1
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
common-build-arch::
$(MAKE) -C terralibx/terralib
--
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
