[SCM] osgearth branch, master, updated. 2b2e2458cbabb2851fcae33cfe908633915bd56c

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit 2b2e2458cbabb2851fcae33cfe908633915bd56c
Author: Pirmin Kalberer 
Date:   Mon May 9 21:32:30 2011 +0200

GDAL 1.8 support

diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake
index a6c9648..fdb9b25 100644
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -57,7 +57,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
 )
 
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
   PATHS
   c:/Program Files/FWTools2.1.0/lib
   $ENV{GDAL_DIR}
@@ -65,14 +65,14 @@ FIND_LIBRARY(GDAL_LIBRARY
   PATH_SUFFIXES lib64 lib
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
c:/Program Files/FWTools2.1.0/lib
 NO_DEFAULT_PATH
 PATH_SUFFIXES lib64 lib
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
   PATHS
 ~/Library/Frameworks
 /Library/Frameworks
diff --git a/debian/changelog b/debian/changelog
index 1a19869..eff9d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (2.0-3) unstable; urgency=low
+
+  * GDAL 1.8 support
+
+ -- Pirmin Kalberer   Mon, 09 May 2011 21:32:01 +0200
+
 osgearth (2.0-2) unstable; urgency=low
 
   * Missing libraries added (*.so.2.0.0)
diff --git a/debian/patches/gdal1.8 b/debian/patches/gdal1.8
new file mode 100644
index 000..0085e31
--- /dev/null
+++ b/debian/patches/gdal1.8
@@ -0,0 +1,29 @@
+--- a/CMakeModules/FindGDAL.cmake
 b/CMakeModules/FindGDAL.cmake
+@@ -57,7 +57,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ )
+ 
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
+   PATHS
+   c:/Program Files/FWTools2.1.0/lib
+   $ENV{GDAL_DIR}
+@@ -65,14 +65,14 @@ FIND_LIBRARY(GDAL_LIBRARY
+   PATH_SUFFIXES lib64 lib
+ )
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
+   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+c:/Program Files/FWTools2.1.0/lib
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES lib64 lib
+ )
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 
gdal1.3.2 GDAL 
+   PATHS
+ ~/Library/Frameworks
+ /Library/Frameworks
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6faa29c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gdal1.8

-- 
osgEarth terrain rendering toolkit

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

[SCM] osgearth branch, master, updated. 2b2e2458cbabb2851fcae33cfe908633915bd56c

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit c580451c0449c08125d2ac400f5429b3c6baceb9
Author: Pirmin Kalberer 
Date:   Tue Mar 1 23:58:47 2011 +0100

Missing libraries added (*.so.2.0.0)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..f6c0554
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+
+README.Debian-source
+
+The source package uses quilt for the modifications of the upstream source. 
+If you want to change something it is best to use the quilt approach as
+documented in 
+/usr/share/doc/quilt/README.source
+
diff --git a/debian/changelog b/debian/changelog
index 77ece98..1a19869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osgearth (2.0-2) unstable; urgency=low
+
+  * Missing libraries added (*.so.2.0.0)
+  * lintian patch-system-but-no-source-readme fixed
+
+ -- Pirmin Kalberer   Tue, 01 Mar 2011 00:27:42 +0100
+
 osgearth (2.0-1) unstable; urgency=low
 
   * Upstream release 2.0
diff --git a/debian/libosgearth1.install b/debian/libosgearth1.install
index 6f39194..aa2aff6 100644
--- a/debian/libosgearth1.install
+++ b/debian/libosgearth1.install
@@ -1,2 +1,3 @@
 usr/lib/libosg*.so.1*
+usr/lib/libosg*.so.2*
 usr/lib/osgPlugins-*

-- 
osgEarth terrain rendering toolkit

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel