[SCM] gdal branch, 1.7, updated. upstream/1.7.3-16-geeb124c

[Francesco Paolo Lovergine]

The following commit has been merged in the 1.7 branch:
commit eeb124c246e9a07501003eb08726454073e01a5a
Merge: a74cf0117849d781eff5d3845ea1587e0ad29cd4 5b647a8747224b33a6a4026c3b11f87ef4cd659d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jul 13 18:20:17 2011 +0200

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

diff --combined debian/changelog
index 156a951,e1f097e..1e7acfc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,3 +1,19 @@@
 +gdal (1.7.3-5) unstable; urgency=low
 +
 +  * Migrating to libjpeg-dev build-dep and dep. 
 +    (closes: #629964)
 +
 + -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 13 Jul 2011 18:16:42 +0200
 +
 +gdal (1.7.3-4) unstable; urgency=low
 +
 +  * [PATCH] Added epsilon patch to fix syntax problem in referencing
 +    eps_block_header named union members. This is a >= 0.9.1 problem 
 +    with epsilon header file.
 +  * Now build-depends on epsilon libraryi by version.
 +
 + -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 May 2011 12:24:15 +0200
 +
  gdal (1.7.3-3) unstable; urgency=low
  
    * Added libepsilon support. Note that libepsilon is LGPL-3 (too).
@@@ -21,7 -5,8 +21,8 @@@
      the GDAL LICENSE file.
    * Removed obsolete libtool workaround in debian/rules. 
      (closes: #621930)
-   * Now post-removing rpath also in main lib to avoig tweaking with libtool.
+   * Now post-removing rpath in main library as well to avoid libtool tricks at
+     building time.
  
   -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 26 Apr 2011 16:52:20 +0200
  

-- 
GDAL/OGR library and tools