The following commit has been merged in the master branch:
commit 84eb55bb5770c03144692d03762681f5a01c9382
Merge: fa1239fec7770636deabc08a7b7b170fe4013e96 
72ed289fc96f87ebdc3af15373cb4d3dc2d855bf
Author: Francesco P. Lovergine <france...@lovergine.com>
Date:   Sat Feb 25 15:56:25 2012 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/gdal
    
    Conflicts:
        debian/changelog

diff --combined debian/changelog
index 7865d1a,43eb5b2..2b8ef2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,17 +1,23 @@@
  gdal (1.8.1-2~exp2) experimental; urgency=low
  
++<<<<<<< HEAD
 +  * Now including per arch symbol files truly. 
 +
 + -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 28 Sep 2011 20:07:22 
+0200
++=======
+   * Changed organization of symbol files in one common file and
+     multiple .symbols.arch file.
+   * Now normalized to conventional GDAL library name and dropping the Debian 
+     specific versioned naming scheme for the library. 
+     Dropped patch: libname, python.
+   * Added sparc and mipsel symbol files.
+   * Updated NEWS file with basic information about changes in the package.
+   * Removed now obsolete libtool build-dep.
+     (closes: #639887)
+   * Now avoid installing superfluous stuff in libgdal-perl. Thanks lintian.
+ 
+  -- Francesco Paolo Lovergine <fran...@debian.org>  Tue, 11 Oct 2011 14:41:31 
+0200
++>>>>>>> 72ed289fc96f87ebdc3af15373cb4d3dc2d855bf
  
  gdal (1.8.1-2~exp1) experimental; urgency=low
  
diff --combined debian/libgdal1.symbols.common
index 036b15b,adcaee0..8d180a7
--- a/debian/libgdal1.symbols.common
+++ b/debian/libgdal1.symbols.common
@@@ -1,4 -1,3 +1,3 @@@
- libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER# 
   AIGAccessTile@GDAL_1.8 1.8.0
   AIGClose@GDAL_1.8 1.8.0
   AIGLLOpen@GDAL_1.8 1.8.0
@@@ -2680,11 -2679,11 +2679,11 @@@
   viz_llz2xy@GDAL_1.8 1.8.0
   viz_xy2llz@GDAL_1.8 1.8.0
   wlon@GDAL_1.8 1.8.0
 - (arch=i386)#include "libgdal.symbols-i386"
 - (arch=kfreebsd-i386)#include "libgdal.symbols-i386"
 - (arch=amd64)#include "libgdal.symbols-amd64"
 - (arch=kfreebsd-amd64)#include "libgdal.symbols-amd64"
 - (arch=ia64)#include "libgdal.symbols-ia64"
 - (arch=s390)#include "libgdal.symbols-s390"
 - (arch=mips)#include "libgdal.symbols-mips"
 - (arch=armel)#include "libgdal.symbols-armel"
 +(arch=i386)#include "libgdal.symbols-i386"
 +(arch=kfreebsd-i386)#include "libgdal.symbols-i386"
 +(arch=amd64)#include "libgdal.symbols-amd64"
 +(arch=kfreebsd-amd64)#include "libgdal.symbols-amd64"
 +(arch=ia64)#include "libgdal.symbols-ia64"
 +(arch=s390)#include "libgdal.symbols-s390"
 +(arch=mips)#include "libgdal.symbols-mips"
 +(arch=armel)#include "libgdal.symbols-armel"

-- 
GDAL/OGR library and tools

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

Reply via email to