[gdal] 01/07: Merge branches 'experimental' and 'master' of ssh://git.debian.org/git/pkg-grass/gdal

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to branch master
in repository gdal.

commit 7ff560aa2ac99a76c0e84757138593035cf61f93
Merge: b04e1f9 1d71e33
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Oct 21 13:48:14 2015 +0200

    Merge branches 'experimental' and 'master' of ssh://git.debian.org/git/pkg-grass/gdal
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog            | 30 ++++++++++++++++++++++++++++++
 debian/control              |  1 +
 debian/libgdal-perl.install |  8 +++-----
 debian/patches/perl-vendor  | 28 ++++++++++++++++++++++++++++
 debian/patches/series       |  2 ++
 debian/rules                | 26 ++++++++------------------
 6 files changed, 72 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index 2b08092,a976a20..7142936
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,33 +1,53 @@@
 +gdal (1.11.0+dfsg-1~exp1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Update copyright file.
 +  * Drop patch: man, applied upstream.
 +  * Drop patch: unkown-typo, applied upstream.
 +  * Drop patch: hurd-i386-pathmax, file removed upstream.
 +  * Refresh patches.
 +  * Update install paths for new upstream version.
 +  * Add libpcre3-dev build dependency.
 +  * Don't use -Werror=format-security, causes build failure on
 +    ogrsxfdatasource.cpp.
 +  * Add patch to fix 'recommended' typo.
 +  * Update typo patches.
 +  * Install JNI libraries in /usr/lib/jni instead of /usr/lib.
 +  * Fix man page install.
 +  * Also include gdal.pc in dev package.
 +
 + -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 04 May 2014 18:13:46 +0200
 +
+ gdal (1.10.1+dfsg-8) unstable; urgency=medium
+ 
+   * Support hdf5 1.8.13 new packaging layout.
+     Thanks to Gilles Filippini for the patch.
+     (closes: #756662)
+ 
+  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 01 Aug 2014 00:02:15 +0200
+ 
+ gdal (1.10.1+dfsg-7) unstable; urgency=medium
+ 
+   * Also use autotools_dev to update config.sub and config.guess.
+     Thanks to Breno Leitao for the patch.
+     (closes: #756412)
+ 
+  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 29 Jul 2014 22:17:47 +0200
+ 
+ gdal (1.10.1+dfsg-6) unstable; urgency=medium
+ 
+   [ gregor herrmann ]
+   * Fix "hardcodes /usr/lib/perl5":
+     - add patch perl-vendor which passes INSTALLDIRS=vendor to Makefile.PL
+       which nicely drops perl files into suitable directories
+     - remove all perl juggling around from debian/rules as a result of the
+       patch
+     - make debian/libgdal-perl.install executable and use $Config{vendorarch}
+       there to install the perl files from the expected location
+     (Closes: #752473)
+ 
+  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 08 Jul 2014 20:44:25 +0200
+ 
  gdal (1.10.1+dfsg-5) unstable; urgency=medium
  
    * Don't run dh for custom targets.
diff --cc debian/patches/series
index 538eb35,33dca3a..fc76f12
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -26,4 -28,5 +26,6 @@@ allows-typ
  supress-typo
  doc-brief
  hardening
 +recommanded-typo
+ hurd-i386-pathmax
+ perl-vendor

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git