[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit d8f96cbc11a78c6c14db4f5f75145819e6a04c1d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Thu Oct 3 23:19:36 2013 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 5e93140..754dace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.10.0-0~exp4) UNRELEASED; urgency=low
+
+  * Add myself to Uploaders.
+
+ -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
+
 gdal (1.10.0-0~exp3) experimental; urgency=low
 
   * Added netcdf-bin build-dep to get nc-config, as required by current config.
diff --git a/debian/control b/debian/control
index 48948c2..3fa2048 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org
+ , Bas Couwenberg sebas...@xs4all.nl
 Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
  libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
  libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c-dev, 
unixodbc-dev (= 2.2.11),

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 2b2ca5b7f00a942469d4f2e3e38970b896145e85
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Thu Oct 3 23:21:27 2013 +0200

Update watch file.

diff --git a/debian/changelog b/debian/changelog
index 754dace..40216b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gdal (1.10.0-0~exp4) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
+  * Update watch file.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/watch b/debian/watch
index 4dcdf79..5eb2750 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://download.osgeo.org/gdal gdal-([0-9]\.[[0-9]\.[0-9]+)\.tar\.gz 
+opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/
 \
+http://trac.osgeo.org/gdal/wiki/DownloadSource \
+(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 56bbbabb1b10ab6fe935b48d29224b9ab6943deb
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 00:51:41 2013 +0200

Remove data files with unclear rights.

diff --git a/debian/changelog b/debian/changelog
index 40216b2..aab7062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-gdal (1.10.0-0~exp4) UNRELEASED; urgency=low
+gdal (1.10.0+dfsg-0~exp4) UNRELEASED; urgency=low
 
   * Add myself to Uploaders.
   * Update watch file.
+  * Remove data files with unclear rights.
+(closes: #721343)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5e181d3..0ca3c51 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,24 @@ Format: 
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GDAL/OGR
 Upstream-Contact: The GDAL/OGR project team, Frank Warmerdam 
warmer...@pobox.com
 Source: http://www.gdal.org/
+Comment: Several data files with unclear rights are removed to create
+ the +dfsg version.
+ .
+ gdal/data/cubewerx_extra.wkt
+ Derived from definitions distributed by Cubewerx.
+ See http://trac.osgeo.org/gdal/ticket/2165
+ . 
+ gdal/data/ecw_cs.wkt
+ Derived via much processing from ERMapper GDT definitions.
+ See http://trac.osgeo.org/gdal/ticket/2162
+ .
+ gdal/data/esri_extra.wkt
+ Derived with some processing from projections definitions in ArcGIS.
+ See http://trac.osgeo.org/gdal/ticket/2163
+ .
+Files-Excluded: data/cubewerx_extra.wkt
+ data/ecw_cs.wkt
+ data/esri_extra.wkt
 
 File: *
 Copyright: 2000, Frank Warmerdam warmer...@pobox.com
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 000..010a838
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,56 @@
+#!/bin/sh -x
+# Repack tarball because of data files with unknown license
+
+set -e
+
+# Remark: A new uscan that enables easier handling of removing files can be
+# obtained via
+#   git clone git://ti...@git.debian.org/git/users/tille/devscripts.git
+# and then copy scripts/uscan.pl as uscan at the beginning of your PATH
+if uscan --help | grep -q -- --repack-compression ; then
+echo Use new enhanced uscan
+uscan --verbose --force-download
+exit
+fi
+
+# Falling back to manually removing files
+
+PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 
's/\+.*//'`
+
+uscan --verbose --force-download --no-symlink
+
+mkdir -p ../tarballs
+cd ../tarballs
+
+tar -xaf ../${PACKAGE}-${VERSION}.tar.*
+
+# Directory in upstream tarball can contain the project name twice
+if [ -d ${PACKAGE}-${PACKAGE}-${VERSION} ]; then
+   mv ${PACKAGE}-${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}
+fi
+
+# Remove files with unclear rights
+#
+#  gdal/data/cubewerx_extra.wkt
+#   Derived from definitions distributed by Cubewerx.
+#   See http://trac.osgeo.org/gdal/ticket/2165
+# 
+#  gdal/data/ecw_cs.dat
+#   Derived via much processing from ERMapper GDT definitions.
+#   See http://trac.osgeo.org/gdal/ticket/2162
+#
+#  gdal/data/esri_extra.wkt
+#   Derived with some processing from projections definitions in ArcGIS.
+#   See http://trac.osgeo.org/gdal/ticket/2163
+
+rm ${PACKAGE}-${VERSION}/data/cubewerx_extra.wkt
+rm ${PACKAGE}-${VERSION}/data/ecw_cs.wkt
+rm ${PACKAGE}-${VERSION}/data/esri_extra.wkt
+
+mv ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}+dfsg.orig
+
+GZIP=--best --no-name tar --owner=root --group=root --mode=a+rX -caf 
../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz ${PACKAGE}-${VERSION}+dfsg.orig
+
+rm -rf ${PACKAGE}-${VERSION}+dfsg.orig
+
diff --git a/debian/rules b/debian/rules
index 2d598be..5113d00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -237,4 +237,7 @@ binary-indep: build install
 
 binary: binary-arch binary-indep
 
+get-orig-source:
+   . debian/get-orig-source
+
 .PHONY: build clean binary-arch binary-indep binary-common binary install 
gdal-grass-dist versions build-arch build-indep
diff --git a/debian/watch b/debian/watch
index 5eb2750..3d26545 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
 version=3
 
opts=dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/
 \
 http://trac.osgeo.org/gdal/wiki/DownloadSource \
-(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+(?:|.*/)gdal(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) \
+debian debian/get-orig-source

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 9bdcb24fc8c7076f62d17f74d75629e4e4b76aac
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 22:40:43 2013 +0200

Refer to quilt instead of dpatch, and fix typos in README.source.

diff --git a/debian/README.source b/debian/README.source
index 7bc83e3..7a1522a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -6,7 +6,7 @@ source. Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
 To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/dpatch/README.source.
+and modify them, please read /usr/share/doc/quilt/README.source.
 
 Most of applied patches are due to Debian Policy requirements and
 the need of avoiding hidden breakages at every new release, due
@@ -47,9 +47,9 @@ So:
 
  - Use and maintain a versioning script (debian/gdal.symver). The version
currently used there is `GDAL_1.8', and it should be maintained from one
-   version to another, until an hack will be required for some specific
+   version to another, until a hack will be required for some specific
future release.
- - Use and maintain ai single arch-indep C-only symbol file as 
libgdal*.symbols.common
+ - Use and maintain a single arch-indep C-only symbol file as 
libgdal*.symbols.common
and an arch-dep C++ demangled symbol file for each arch. They are expected 
to 
change at every new upstream release, but can be used to do general checks
on possible API/ABI violations. Files can be updated by running
diff --git a/debian/changelog b/debian/changelog
index fc77a64..e7f09bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Refresh patches.
   * Use canonical URLs for Vcs-* fields.
   * Update copyright.
+  * Refer to quilt instead of dpatch, and fix typos in README.source.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 9302938f4d23603e3ddffeb648ba890bd1d84182
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 11 15:35:57 2013 +0200

Fix typo in copyright.

diff --git a/debian/copyright b/debian/copyright
index 9a9db37..2ee830c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -499,7 +499,7 @@ Comment: The licence agreement for this file is the same as 
the rest of the LibT
  OF THIS SOFTWARE.
  .
  Joris Van Damme and/or AWare Systems may be available for custom
- developement. If you like what you see, and need anything similar or related,
+ development. If you like what you see, and need anything similar or related,
  contact i...@awaresystems.be.
 License: HPND-sl-sgi
 

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 4a0b1a5d3829643f609267dcf4aff8b78b79f570
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 01:43:20 2013 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index aab7062..0390b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-gdal (1.10.0+dfsg-0~exp4) UNRELEASED; urgency=low
+gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Add myself to Uploaders.
   * Update watch file.
   * Remove data files with unclear rights.

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 60d2ea81c6be615a7316b17c27e7ade7e04fa3cf
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 01:43:37 2013 +0200

Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 0390b3c..53a0c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Update watch file.
   * Remove data files with unclear rights.
 (closes: #721343)
+  * Refresh patches.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index 58ee099..5ab3757 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,8 +1,6 @@
-Index: gdal/frmts/ecw/GNUmakefile
-===
 gdal.orig/frmts/ecw/GNUmakefile2013-06-20 10:05:05.0 +0200
-+++ gdal/frmts/ecw/GNUmakefile 2013-06-20 10:05:05.0 +0200
-@@ -21,3 +21,12 @@
+--- a/frmts/ecw/GNUmakefile
 b/frmts/ecw/GNUmakefile
+@@ -21,3 +21,12 @@ plugin: $(PLUGIN_SO)
  $(PLUGIN_SO): $(OBJ)
$(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \
-o $(PLUGIN_SO)
@@ -15,10 +13,8 @@ Index: gdal/frmts/ecw/GNUmakefile
 +  tar czvf libgdal-ecw-$(GDAL_VER).tar.gz ./libgdal-ecw-$(GDAL_VER)
 +  rm -rf libgdal-ecw-$(GDAL_VER)
 + 
-Index: gdal/frmts/ecw/pkg/Makefile.in
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/Makefile.in 2013-06-20 10:05:05.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/Makefile.in
 @@ -0,0 +1,36 @@
 +CC=   @CC@
 +CXX   =   @CXX@
@@ -56,10 +52,8 @@ Index: gdal/frmts/ecw/pkg/Makefile.in
 +%.o:  %.cpp
 +  $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $
 +
-Index: gdal/frmts/ecw/pkg/README
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/README  2013-06-20 10:05:05.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/README
 @@ -0,0 +1,30 @@
 +  Standalone ECW 3.3 Drivers for GDAL
 +  ===
@@ -91,10 +85,8 @@ Index: gdal/frmts/ecw/pkg/README
 +  http://www.ermapper.com/
 +  http://ermapper.com/Downloads.aspx?v=315
 +
-Index: gdal/frmts/ecw/pkg/aclocal.m4
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/aclocal.m4  2013-06-20 10:05:05.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/aclocal.m4
 @@ -0,0 +1,202 @@
 +AC_DEFUN(AC_COMPILER_LOCALHACK,
 +[
@@ -298,10 +290,8 @@ Index: gdal/frmts/ecw/pkg/aclocal.m4
 +  AC_SUBST(LD_SHARED,$LD_SHARED)
 +  AC_SUBST(SO_EXT,$SO_EXT)
 +])
-Index: gdal/frmts/ecw/pkg/configure
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/configure   2013-06-20 10:05:05.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/configure
 @@ -0,0 +1,4498 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -4801,10 +4791,8 @@ Index: gdal/frmts/ecw/pkg/configure
 +
 +
 +
-Index: gdal/frmts/ecw/pkg/configure.in
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ gdal/frmts/ecw/pkg/configure.in2013-06-20 10:05:05.0 +0200
+--- /dev/null
 b/frmts/ecw/pkg/configure.in
 @@ -0,0 +1,186 @@
 +dnl 
***
 +dnl $Id: configure.in 9971 2006-08-23 20:06:02Z fwarmerdam $
diff --git a/debian/patches/gdal-grass b/debian/patches/gdal-grass
index c4ff61a..5730379 100644
--- a/debian/patches/gdal-grass
+++ b/debian/patches/gdal-grass
@@ -1,8 +1,6 @@
-Index: gdal/frmts/grass/GNUmakefile
-===
 gdal.orig/frmts/grass/GNUmakefile  2011-02-18 15:52:35.0 +0100
-+++ gdal/frmts/grass/GNUmakefile   2011-02-18 16:49:02.0 +0100
-@@ -21,11 +21,13 @@
+--- a/frmts/grass/GNUmakefile
 b/frmts/grass/GNUmakefile
+@@ -21,11 +21,13 @@ clean:
  install-obj:  $(O_OBJ:.o=.$(OBJ_EXT))
  
  dist:
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 79d0198..ba29df1 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,8 +1,6 @@
-Index: gdal/gcore/gdaldrivermanager.cpp
-===
 gdal.orig/gcore/gdaldrivermanager.cpp  2013-06-20 10:04:36.0 
+0200
-+++ gdal/gcore/gdaldrivermanager.cpp   2013-06-20 10:04:36.0 +0200
-@@ -667,7 +667,7 @@
+--- a/gcore/gdaldrivermanager.cpp
 b/gcore/gdaldrivermanager.cpp
+@@ -667,7 +667,7 @@ void GDALDriverManager::AutoLoadDrivers(
  #ifdef MACOSX_FRAMEWORK
  

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 1bd4e7e80d3c55be3a75856466610353423cd00b
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 11 17:36:36 2013 +0200

Add lintian overrides for man pages issues.

Add lintian overrides for man pages issues.
Man pages are automatically generated with sphinx.

diff --git a/debian/changelog b/debian/changelog
index d3024d0..6eac1db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Update copyright.
   * Refer to quilt instead of dpatch, and fix typos in README.source.
   * Add patches to fix various typos.
+  * Add lintian overrides for hyphen-used-as-minus-sign and
+manpage-has-errors-from-man, man pages are automatically generated
+with sphinx.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/gdal-bin.lintian-overrides 
b/debian/gdal-bin.lintian-overrides
new file mode 100644
index 000..60320d0
--- /dev/null
+++ b/debian/gdal-bin.lintian-overrides
@@ -0,0 +1,3 @@
+# Man pages are automatically generated with sphinx.
+gdal-bin: hyphen-used-as-minus-sign
+gdal-bin: manpage-has-errors-from-man
diff --git a/debian/libgdal-dev.lintian-overrides 
b/debian/libgdal-dev.lintian-overrides
new file mode 100644
index 000..c4e7ed7
--- /dev/null
+++ b/debian/libgdal-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Man pages are automatically generated with sphinx.
+libgdal-dev: hyphen-used-as-minus-sign
diff --git a/debian/python-gdal.lintian-overrides 
b/debian/python-gdal.lintian-overrides
new file mode 100644
index 000..f501897
--- /dev/null
+++ b/debian/python-gdal.lintian-overrides
@@ -0,0 +1,2 @@
+# Man pages are automatically generated with sphinx.
+python-gdal: hyphen-used-as-minus-sign 

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit dcc98a9c62e9db30ffdb173287ca8ae9f68c91be
Merge: 56bbbabb1b10ab6fe935b48d29224b9ab6943deb 
864bb9ee6237551dc25377be642bf59cb6c48644
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 01:38:03 2013 +0200

Merge tag 'upstream/1.10.1+dfsg'

Upstream version 1.10.1+dfsg

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/libgdal1h.docs
debian/libgdal1h.install
debian/libgdal1h.symbols.amd64
debian/libgdal1h.symbols.armel
debian/libgdal1h.symbols.armhf
debian/libgdal1h.symbols.common
debian/libgdal1h.symbols.i386
debian/libgdal1h.symbols.ia64
debian/libgdal1h.symbols.mips
debian/libgdal1h.symbols.mipsel
debian/libgdal1h.symbols.powerpc
debian/libgdal1h.symbols.s390
debian/libgdal1h.symbols.s390x
debian/libgdal1h.symbols.sparc
debian/patches/doc
debian/patches/ecw-plugin
debian/patches/gdalpaths
debian/patches/hdf4
debian/patches/man
debian/patches/mrsid-plugin
debian/patches/series
debian/patches/spatialite
debian/rules
debian/watch


-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 909abe152d7afd3f7c00be40a3dc55a4312dfc0c
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 4 01:46:11 2013 +0200

Use canonical URLs for Vcs-* fields.

diff --git a/debian/changelog b/debian/changelog
index 53a0c07..1dddae6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Remove data files with unclear rights.
 (closes: #721343)
   * Refresh patches.
+  * Use canonical URLs for Vcs-* fields.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/control b/debian/control
index 3fa2048..7adc3da 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Standards-Version: 3.9.4
 XS-Python-Version: all
 X-Python3-Version: = 3.2
 Homepage: http://www.gdal.org/
-Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
-Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal.git
 
 Package: libgdal1h
 Section: libs

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 6c31642d3c6b2a1806bb3fdf29756a04a37bc52b
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 10:52:18 2013 +0200

Bump dephelper compatibility to 9.

diff --git a/debian/changelog b/debian/changelog
index fc757b1..19e8f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 manpage-has-errors-from-man, man pages are automatically generated
 with sphinx.
   * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
+  * Bump dephelper compatibility to 9.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 756d8f5..9813c4a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Francesco Paolo Lovergine fran...@debian.org
  , Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: debhelper (= 8), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
+Build-Depends: debhelper (= 9), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
  libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
  libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c-dev, 
unixodbc-dev (= 2.2.11),
  python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, 
python-all-dev (= 2.6.6-3~),

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 2e54bc2b6f2ff3a8ced712fd1cb50d3c27ca891f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 12:11:04 2013 +0200

Add misc:Depends for libgdal1-dev.

diff --git a/debian/control b/debian/control
index dc2414e..293a31b 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,8 @@ Description: Geospatial Data Abstraction Library
 Package: libgdal1-dev
 Architecture: all
 Section: libdevel
-Depends: libgdal-dev
+Depends: libgdal-dev,
+ ${misc:Depends}
 Description: Geospatial Data Abstraction Library - Development files
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 3151d7e3b4d53fd27484f6dcbd65617526be182e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Oct 11 17:52:31 2013 +0200

Use versioned Breaks/Replaces instead of Conflicts/Replaces.

diff --git a/debian/changelog b/debian/changelog
index 6eac1db..fc757b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Add lintian overrides for hyphen-used-as-minus-sign and
 manpage-has-errors-from-man, man pages are automatically generated
 with sphinx.
+  * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/control b/debian/control
index 7adc3da..756d8f5 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,10 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: proj-bin
-Replaces: libgdal1
-Conflicts: libgdal1 (= 1.10.0-0~)
-Breaks: libgdal1-1.6.0
+Breaks: libgdal1 (= 1.10.0-0~),
+libgdal1-1.6.0 (= 1.10.0-0~)
+Replaces: libgdal1 (= 1.10.0-0~),
+  libgdal1-1.6.0 (= 1.10.0-0~)
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -83,7 +84,7 @@ Depends: libgdal1h (=${binary:Version}), libc6-dev, 
libnetcdf-dev,
  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, 
libcurl4-gnutls-dev|libcurl4-dev,
  libspatialite-dev, libdap-dev, ${misc:Depends}
 Suggests: libgdal-doc
-Conflicts: libgdal1-dev ( 1.9.0-1~)
+Breaks: libgdal1-dev ( 1.9.0-1~)
 Replaces: libgdal1-dev ( 1.9.0-1~)
 Description: Geospatial Data Abstraction Library - Development files
  GDAL is a translator library for raster geospatial data formats.

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 993c3a0f63ba80b745884e47775ea03080c43261
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 12:07:08 2013 +0200

Restructure control file, drop deprecated X{S,B}-Python-Version and 
duplicate section.

diff --git a/debian/control b/debian/control
index 9813c4a..dc2414e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,65 @@
 Source: gdal
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: Francesco Paolo Lovergine fran...@debian.org,
+   Bas Couwenberg sebas...@xs4all.nl
 Section: science
 Priority: extra
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: Francesco Paolo Lovergine fran...@debian.org
- , Bas Couwenberg sebas...@xs4all.nl
-Build-Depends: debhelper (= 9), zlib1g-dev, libnetcdf-dev (= 1:4.0.0),
- libjasper-dev, libpng-dev, libjpeg-dev, libgif-dev,
- libhdf4-alt-dev, libhdf5-serial-dev (= 1.6.6), libpq-dev, libxerces-c-dev, 
unixodbc-dev (= 2.2.11),
- python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, 
python-all-dev (= 2.6.6-3~),
- libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
- ruby1.8, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
- libdap-dev, libxml2-dev, libspatialite-dev (= 2.4.0~rc2-4), libepsilon-dev 
(= 0.9.1-1~),
- libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, 
libfreexl-dev (= 1.0.0),
- libkml-dev (= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy,
- netcdf-bin, default-jdk, ant
+Build-Depends: debhelper (= 9),
+   zlib1g-dev,
+   libnetcdf-dev (= 1:4.0.0),
+   netcdf-bin,
+   libjasper-dev,
+   libpng-dev,
+   libjpeg-dev,
+   libgif-dev,
+   libhdf4-alt-dev,
+   libhdf5-serial-dev (= 1.6.6),
+   libpq-dev,
+   libxerces-c-dev,
+   unixodbc-dev (= 2.2.11),
+   doxygen,
+   d-shlibs,
+   libgeos-dev,
+   libmysqlclient-dev,
+   python-all-dev (= 2.6.6-3~),
+   python-numpy,
+   python3-all-dev,
+   python3-numpy,
+   libcurl4-gnutls-dev,
+   libsqlite3-dev,
+   libogdi3.2-dev,
+   ruby1.8,
+   ruby1.8-dev,
+   chrpath,
+   swig,
+   patch,
+   libexpat1-dev,
+   libproj-dev,
+   libdap-dev,
+   libxml2-dev,
+   libspatialite-dev (= 2.4.0~rc2-4),
+   libepsilon-dev (= 0.9.1-1~),
+   libpoppler-private-dev,
+   liblzma-dev,
+   libopenjpeg-dev,
+   libarmadillo-dev,
+   libfreexl-dev (= 1.0.0),
+   libkml-dev (= 1.3.0~),
+   liburiparser-dev,
+   default-jdk,
+   ant
 Build-Conflicts: python-setuptools
 Standards-Version: 3.9.4
-XS-Python-Version: all
-X-Python3-Version: = 3.2
-Homepage: http://www.gdal.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/gdal.git
+Homepage: http://www.gdal.org/
+X-Python3-Version: = 3.2
 
 Package: libgdal1h
-Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
 Recommends: proj-bin
 Breaks: libgdal1 (= 1.10.0-0~),
 libgdal1-1.6.0 (= 1.10.0-0~)
@@ -51,9 +85,9 @@ Description: Geospatial Data Abstraction Library
  This package contains the shared library.
 
 Package: libgdal1-dev
-Section: libdevel
 Architecture: all
-Depends: libgdal-dev 
+Section: libdevel
+Depends: libgdal-dev
 Description: Geospatial Data Abstraction Library - Development files
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -76,13 +110,28 @@ Description: Geospatial Data Abstraction Library - 
Development files
  any build environment.
 
 Package: libgdal-dev
-Section: libdevel
 Architecture: any
-Depends: libgdal1h (=${binary:Version}), libc6-dev, libnetcdf-dev, 
- libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev, 
libhdf4-alt-dev, 
- libpq-dev, libxerces-c-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
- libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, 
libcurl4-gnutls-dev|libcurl4-dev,
- libspatialite-dev, libdap-dev, ${misc:Depends}
+Section: libdevel
+Depends: libgdal1h (= ${binary:Version}),
+ libc6-dev,
+ libnetcdf-dev,
+ libjasper-dev,
+ libpng-dev,
+ libjpeg-dev,
+ libgif-dev,
+ libhdf4-alt-dev,
+ libhdf5-serial-dev,
+ libpq-dev,
+ libxerces-c-dev,
+ unixodbc-dev,
+ libsqlite3-dev,
+ libgeos-dev,
+ libmysqlclient-dev,
+ libltdl3-dev,
+  

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit a8cf59cb870c96bfcbd9e0fedd9e4283f85d3e5e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 12:40:59 2013 +0200

Update libltdl-dev dependency.

diff --git a/debian/control b/debian/control
index 293a31b..1e827a3 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,7 @@ Depends: libgdal1h (= ${binary:Version}),
  libsqlite3-dev,
  libgeos-dev,
  libmysqlclient-dev,
- libltdl3-dev,
+ libltdl-dev,
  libcurl4-gnutls-dev,
  libspatialite-dev,
  libdap-dev,

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 5b08d967bb340104fac2e7a7e3edefefe5671aec
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 12:49:50 2013 +0200

Install java files with mode 644.

diff --git a/debian/changelog b/debian/changelog
index 19e8f25..8a67c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 with sphinx.
   * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
   * Bump dephelper compatibility to 9.
+  * Install java files with mode 644.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 5113d00..9b74fb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -175,8 +175,8 @@ install: build
 
# java stuff
mkdir -p $(CURDIR)/debian/tmp/usr/share/java 
$(CURDIR)/debian/tmp/usr/lib/jni
-   install -o root -g root $(CURDIR)/swig/java/gdal.jar 
$(CURDIR)/debian/tmp/usr/share/java/.
-   install -o root -g root $(CURDIR)/swig/java/*jni.so* 
$(CURDIR)/debian/tmp/usr/lib/jni
+   install -o root -g root -m 644 $(CURDIR)/swig/java/gdal.jar 
$(CURDIR)/debian/tmp/usr/share/java/.
+   install -o root -g root -m 644 $(CURDIR)/swig/java/*jni.so* 
$(CURDIR)/debian/tmp/usr/lib/jni
 
# removing license file
rm -f 
$(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit c153b73abcb5ad10a89dfc7d148655642ac3c97f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 13:30:29 2013 +0200

Don't remove man and html directories on clean, part of upstream tarball.

diff --git a/debian/rules b/debian/rules
index db754ae..72b7ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,9 +143,8 @@ clean:
rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o 
$(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs
rm -rf $(CURDIR)/.libs
rm -f GDALmake.opt-*
-   rm -rf $(CURDIR)/man/man1
rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp
-   rm -rf $(CURDIR)/html $(CURDIR)/doc/br/html $(CURDIR)/doc/ru/html
+   rm -rf $(CURDIR)/doc/br/html $(CURDIR)/doc/ru/html
rm -rf $(CURDIR)/frmts/o/.libs
rm -f  $(CURDIR)/islibdappost310.*
# Removes per arch symbols for compatible archs

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit aa569386481289ebf19fc8a6d23700e220df7f21
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 17:17:31 2013 +0200

Reinstate doc patch, refresh and update to fix more links.

diff --git a/debian/changelog b/debian/changelog
index 255ac10..8277fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Add doc-base configuration for libgdal-doc.
   * Only install NEWS.Debian in libgdal-dev.
 (closes: #677693)
+  * Reinstate doc patch, refresh and update to fix more links.
+(closes: #471198)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/doc b/debian/patches/doc
index 48627d6..0efa1b1 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,21 +1,26 @@
-Index: gdal/doc/index.dox
-===
 gdal.orig/doc/index.dox2013-06-20 10:03:58.0 +0200
-+++ gdal/doc/index.dox 2013-06-20 10:03:58.0 +0200
-@@ -19,7 +19,7 @@
+--- a/doc/index.dox
 b/doc/index.dox
+@@ -19,7 +19,7 @@ for data translation and processing.  Th
  a href=http://trac.osgeo.org/gdal/wiki/Release/1.9.2-News;NEWS/a
  page describes the October 2012 GDAL/OGR 1.9.2 release.
  
 -The related a href=ogr/index.htmlOGR/a library (which lives within the 
GDAL source tree) 
-+The related a href=../ogr/index.htmlOGR/a library (which lives within 
the GDAL source tree) 
++The related a href=../ogr/index.htmlOGR/a library (which lives within 
the GDAL source tree)
  provides a similar capability for simple features vector data.
  
  Master: http://www.gdal.orgbr
-Index: gdal/ogr/index.dox
-===
 gdal.orig/ogr/index.dox2013-06-20 10:03:58.0 +0200
-+++ gdal/ogr/index.dox 2013-06-20 10:03:58.0 +0200
-@@ -6,7 +6,7 @@
+@@ -51,7 +51,7 @@ Download:
+ li a href=gdal_tutorial.htmlGDAL API Tutorial/a
+ li a href=gdal_drivertut.htmlGDAL Driver Implementation Tutorial/a
+ li a href=warptut.htmlGDAL Warp API Tutorial/a
+-li a href=ogr/osr_tutorial.htmlOGRSpatialReference Tutorial/a
++li a href=../ogr/osr_tutorial.htmlOGRSpatialReference Tutorial/a
+ li a href=gdal_8h.htmlGDAL C API/a
+ li a href=gdal__alg_8h.htmlGDAL Algorithms C API/a
+ li a href=classGDALDataset.htmlGDALDataset C++ API/a
+--- a/ogr/index.dox
 b/ogr/index.dox
+@@ -6,7 +6,7 @@ tools) providing read (and sometimes wri
  formats including ESRI Shapefiles, S-57, SDTS, PostGIS, Oracle Spatial, 
  and Mapinfo mid/mif and TAB formats.p
  
@@ -24,3 +29,61 @@ Index: gdal/ogr/index.dox
  
  h2Resources/h2
  
+@@ -14,7 +14,7 @@ OGR is a part of the a href=http://www
+ 
+ li a href=ogr_formats.htmlOGR Supported Formats/a : ESRI Shapefile, 
ESRI ArcSDE, MapInfo (tab and mid/mif), GML, KML, PostGIS, Oracle Spatial, ...
+ 
+-li a href=../ogr_utilities.htmlOGR Utility Programs/a : ogrinfo, 
ogr2ogr, ogrtindex
++li a href=../gdal/ogr_utilities.htmlOGR Utility Programs/a : ogrinfo, 
ogr2ogr, ogrtindex
+ 
+ li a href=hierarchy.htmlOGR Class Documentation/a
+ 
+@@ -51,7 +51,7 @@ or a href=http://home.gdal.org/project
+ 
+ h3Ready to Use Executables/h3
+ 
+-The best way to get OGR a href=ogr_utilities.htmlutilities/a
++The best way to get OGR a href=../gdal/ogr_utilities.htmlutilities/a
+ in ready-to-use form is to download the latest 
+ a href=http://fwtools.maptools.org/;FWTools/a kit
+ for your platform.  While large, these include builds of the OGR utilities
+--- a/doc/ru/index_ru.dox
 b/doc/ru/index_ru.dox
+@@ -26,7 +26,7 @@ GDAL/OGR 1.5.1 (март 2008) можн�
+ a href=http://trac.osgeo.org/gdal/wiki/Release/1.5.1-News;новостей/a.
+ 
+ Связанная с GDAL библиотека
+-a href=ogrOGR/a (исходные тексты которой поставляются вместе с GDAL)
++a href=../ogr/index.htmlOGR/a (исходные тексты которой поставляются 
вместе с GDAL)
+ предоставляет сходные возможности для работы с векторными данными. На странице
+ a href=NEWS.htmlобновлений/a вы сможете найти описание версии 1.3.1,
+ выпущенной в октябре 2005 г.p
+@@ -67,7 +67,7 @@ GDAL/OGR 1.5.1 (март 2008) можн�
+ li a href=gdal_tutorial_ru.htmlРуководство по использованию GDAL/a
+ li a href=gdal_drivertut.htmlРуководство по написанию драйверов GDAL/a
+ li a href=warptut.htmlРуководство по использованию интерфейса 
трансформации/a
+-li a href=ogr/osr_tutorial.htmlРуководство по OGRSpatialReference/a
++li a href=../ogr/osr_tutorial.htmlРуководство по OGRSpatialReference/a
+ li a href=gdal_8h.htmlgdal.h/a - интерфейс GDAL для языка C.
+ li a href=classGDALDataset.htmlGDALDataset/a
+ li a href=classGDALRasterBand.htmlGDALRasterBand/a
+--- a/doc/br/index_br.dox
 b/doc/br/index_br.dox
+@@ -29,7 +29,7 @@ A paacute;gina
+ a href=http://trac.osgeo.org/gdal/wiki/Release/1.9.0-News;novidades/a 
descreve o 
+ lanccedil;amento em Dezembro de 2011 da release 1.9.0 da biblioteca GDAL/OGR.
+ 
+-A bilioteca 

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 7ebc19935640033295e129fcbe9ae462078ea0d7
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 16:53:26 2013 +0200

Only install NEWS.Debian in libgdal-dev.

diff --git a/debian/changelog b/debian/changelog
index c2d5299..255ac10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Install java files with mode 644.
   * Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.
   * Add doc-base configuration for libgdal-doc.
+  * Only install NEWS.Debian in libgdal-dev.
+(closes: #677693)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/NEWS b/debian/libgdal-dev.NEWS
similarity index 100%
rename from debian/NEWS
rename to debian/libgdal-dev.NEWS

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 9754c0f96aee8139b5c46617a34ddc6b7d525c83
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 14:43:52 2013 +0200

Add lintian override for spelling error via debian/rules.

diff --git a/debian/libgdal1h.lintian-overrides 
b/debian/libgdal1h.lintian-overrides
deleted file mode 100644
index b63a7b1..000
--- a/debian/libgdal1h.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# False positive on: {136, Socialist Republic of Viet Nam},
-libgdal1h: spelling-error-in-binary usr/lib/libgdal.so.1.17.1 Nam Name
diff --git a/debian/rules b/debian/rules
index 72b7ba1..8a1a09c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -192,12 +192,19 @@ install: build
mv $(CURDIR)/debian/tmp$(PERL_PATH)/auto/* 
$(CURDIR)/debian/tmp/usr/lib/perl5/auto/.
mv $(CURDIR)/debian/tmp$(PERL_PATH)/Geo 
$(CURDIR)/debian/tmp/usr/lib/perl5/.
mv $(CURDIR)/debian/tmp/usr/local/lib/site_ruby/$(RUBYDEF)/* 
$(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)/.
+
# copy sample programs for python-gdal
install -o root -g root -d 
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples
install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py 
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples/.
+
# create lintian overrides file
+   echo # Used for BigTIFF support (#501127)  
$(CURDIR)/debian/libgdal1h.lintian-overrides
echo libgdal1h: embedded-library usr/lib/libgdal.so.$$(basename 
debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff \
-   $(CURDIR)/debian/libgdal1h.lintian-overrides
+$(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo  $(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo # False positive on: {136, Socialist Republic of Viet Nam},  
$(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo libgdal1h: spelling-error-in-binary 
usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. 
-f3,4,5) Nam Name \
+$(CURDIR)/debian/libgdal1h.lintian-overrides
 
 binary-common:
dh_testdir

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 7b310b2a9d47c5d2dc02c29c215a35d4933f
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 18:46:24 2013 +0200

Add patch to add a brief description to {gdal,ogr}_utilities documentation.

diff --git a/debian/changelog b/debian/changelog
index b1188c2..02039ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 (closes: #471198)
   * Drop temporary fix for #564243, doxygen doesn't generate files with extra
 underscores anymore.
+  * Add patch to add a brief description to {gdal,ogr}_utilities documentation.
+(closes: #421653)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/doc-brief b/debian/patches/doc-brief
new file mode 100644
index 000..c07933c
--- /dev/null
+++ b/debian/patches/doc-brief
@@ -0,0 +1,18 @@
+--- a/apps/gdal_utilities.dox
 b/apps/gdal_utilities.dox
+@@ -4,6 +4,7 @@
+ 
+ /*! 
+ \page gdal_utilities GDAL Utilities
++\brief A collection of GDAL related programs.
+ 
+ The following utility programs are distributed with GDAL. 
+ 
+--- a/apps/ogr_utilities.dox
 b/apps/ogr_utilities.dox
+@@ -1,4 +1,5 @@
+ /*! \page ogr_utilities OGR Utility Programs
++\brief A collection of OGR related programs.
+ 
+ The following utilities are distributed as part of the OGR Simple Features
+ toolkit:
diff --git a/debian/patches/series b/debian/patches/series
index b8945e4..b15f7be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ unkown-typo
 usefull-typo
 developement-typo
 algoritm-typo
+doc-brief

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit c2e2da8a1949eda933885ac7cd491d1b1628dfcc
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 17:55:43 2013 +0200

Drop temporary fix for #564243, doxygen doesn't generate files with extra 
underscores anymore.

diff --git a/debian/changelog b/debian/changelog
index 8277fda..b1188c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 (closes: #677693)
   * Reinstate doc patch, refresh and update to fix more links.
 (closes: #471198)
+  * Drop temporary fix for #564243, doxygen doesn't generate files with extra
+underscores anymore.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 8a1a09c..95a32ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,9 +129,7 @@ build-stamp: configure-stamp
mkdir $(CURDIR)/html || true
$(MAKE) docs
$(MAKE) man
-   # a temporary workaround for doxygen problem #564243
-   cd man/man1  \
-   for i in `find . -name *__*`; do basename=`basename 
$$i`; mv $$basename `echo $$basename|sed -e 's/__/_/'`; done
+
touch $@
 
 clean:

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 362a1fed3593a0c6fe16b95703459aa5880bc850
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 12:54:52 2013 +0200

Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.

diff --git a/debian/changelog b/debian/changelog
index 8a67c33..1a098c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
   * Bump dephelper compatibility to 9.
   * Install java files with mode 644.
+  * Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 9b74fb4..db754ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -220,9 +220,9 @@ binary-common:
ln -f $(CURDIR)/debian/libgdal*.symbols.i386 
$(CURDIR)/debian/libgdal1h.symbols.kfreebsd-i386
ln -f $(CURDIR)/debian/libgdal*.symbols.amd64 
$(CURDIR)/debian/libgdal1h.symbols.kfreebsd-amd64
# Forces failure ignoring to collect new symbols on all archs
-   dh_makeshlibs -- -c0
+   dh_makeshlibs -Xlibgdal-java -- -c0
# Forces failure when symbols change
-   #dh_makeshlibs
+   #dh_makeshlibs -Xlibgdal-java
dh_installdeb
dh_shlibdeps -L libgdal1h -l debian/libgdal1h/usr/lib
dh_gencontrol

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 9b9ab7b67e5207ccc1ee97a6c689acf8800990ed
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 16:50:00 2013 +0200

Drop libgdal1h.docs, NEWS is already installed as changelog.

diff --git a/debian/libgdal1h.docs b/debian/libgdal1h.docs
deleted file mode 100644
index edc0071..000
--- a/debian/libgdal1h.docs
+++ /dev/null
@@ -1 +0,0 @@
-NEWS

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 98b7b7617624382c7837da8d6ec10b243798da41
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sat Oct 12 13:16:45 2013 +0200

Add doc-base configuration for libgdal-doc.

diff --git a/debian/changelog b/debian/changelog
index 1a098c5..c2d5299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Bump dephelper compatibility to 9.
   * Install java files with mode 644.
   * Exclude libgdal-java from dh_makeshlibs, doesn't install in default paths.
+  * Add doc-base configuration for libgdal-doc.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/libgdal-doc.doc-base b/debian/libgdal-doc.doc-base
new file mode 100644
index 000..63db6fe
--- /dev/null
+++ b/debian/libgdal-doc.doc-base
@@ -0,0 +1,9 @@
+Document: gdal-ogr
+Title: GDAL/OGR Documentation
+Abstract: This manual describes the GDAL/OGR APIs and associated utilities.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/libgdal-doc/gdal/index.html
+Files: /usr/share/doc/libgdal-doc/gdal/*.html
+ /usr/share/doc/libgdal-doc/ogr/*.html

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 22fbdb2e662104b4c102f5b28922daddde58ee5d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 02:52:58 2013 +0200

Also install python examples.

diff --git a/debian/python-gdal.install b/debian/python-gdal.install
index 64e51a4..799be9f 100644
--- a/debian/python-gdal.install
+++ b/debian/python-gdal.install
@@ -21,6 +21,7 @@ usr/bin/gdal_sieve
 usr/bin/mkgraticule
 usr/bin/pct2rgb
 usr/bin/rgb2pct
+usr/share/doc/python-gdal/examples/
 usr/share/man/man1/gdal2tiles.1
 usr/share/man/man1/gdalmove.1
 usr/share/man/man1/gdal_edit.1

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 86f0b5d61d764ac61e8c090244b422d0012872b3
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 22:45:07 2013 +0200

Add patch to use hardening flags for java and perl bindings.

diff --git a/debian/changelog b/debian/changelog
index 84cdbd9..7d9796e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Drop ruby extension for ruby1.8 removal transition. See also: #684433.
 (closes: #722383)
   * Use minimal dh rules with dh-python, and dh-autoreconf for retooling.
+  * Add patch to use hardening flags for java and perl bindings.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/hardening b/debian/patches/hardening
new file mode 100644
index 000..6e1716a
--- /dev/null
+++ b/debian/patches/hardening
@@ -0,0 +1,33 @@
+--- a/swig/perl/Makefile.PL
 b/swig/perl/Makefile.PL
+@@ -1,4 +1,5 @@
+ use ExtUtils::MakeMaker;
++use Config;
+ 
+ # pick up our parameters from @ARGV
+ my %ARGV;
+@@ -120,6 +121,8 @@ for my $module (keys %object) {
+  MAKEFILE = 'Makefile_'.$add,
+  LIBS = $LIB,
+  INC = $INC,
++ OPTIMIZE = $ENV{CFLAGS} $ENV{CPPFLAGS},
++ LD = $Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS},
+  OBJECT = $object{$module},
+  PM = {'lib/Geo/GDAL.pm' = '$(INST_LIBDIR)/GDAL.pm',
+ 'lib/Geo/OGR.pm' = '$(INST_LIBDIR)/OGR.pm',
+--- a/swig/java/GNUmakefile
 b/swig/java/GNUmakefile
+@@ -76,10 +76,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
+ # Do not remove -fno-strict-aliasing while SWIG generates weird code in 
upcast methods
+ # See http://trac.osgeo.org/gdal/changeset/16006
+ %.$(OBJ_EXT): %.cpp
+-  $(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) 
-c $
++  $(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) 
$(JAVA_INCLUDE) -c $
+ 
+ %.$(OBJ_EXT): %.cxx
+-  $(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) 
-c $
++  $(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) 
$(JAVA_INCLUDE) -c $
+ 
+ %.$(OBJ_EXT): %.c
+-  $(CC) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c 
$
++  $(CC) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) 
$(JAVA_INCLUDE) -c $
diff --git a/debian/patches/series b/debian/patches/series
index 4f47799..235a559 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ usefull-typo
 developement-typo
 algoritm-typo
 doc-brief
+hardening

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 16e6d1b51c8652026a600eb87c550dcfb6214cc0
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 00:13:33 2013 +0200

Add patch headers.

diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index bd48e26..6de5547 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -1,3 +1,6 @@
+Description: Fix 'accomodate' typo, replace with 'accommodate'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -3106,7 +3106,7 @@ GeoTIFF driver :
diff --git a/debian/patches/algoritm-typo b/debian/patches/algoritm-typo
index 71e1462..8154f14 100644
--- a/debian/patches/algoritm-typo
+++ b/debian/patches/algoritm-typo
@@ -1,3 +1,6 @@
+Description: Fix 'algoritm' typo, replace with 'algorithm'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/swig/include/Operations.i
 +++ b/swig/include/Operations.i
 @@ -447,7 +447,7 @@ int wrapper_GridCreate( char* algorithmO
diff --git a/debian/patches/bandwith-typo b/debian/patches/bandwith-typo
index b51afaf..71db03a 100644
--- a/debian/patches/bandwith-typo
+++ b/debian/patches/bandwith-typo
@@ -1,3 +1,6 @@
+Description: Fix 'bandwith' typo, replace with 'bandwidth'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
 +++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
 @@ -444,7 +444,7 @@ int OGRSQLiteDataSource::OpenOrCreateDB(
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index 8376736..8705b51 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -1,3 +1,6 @@
+Description: Fix 'consistant' typo, replace with 'consistent'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -1149,7 +1149,7 @@ Utilities:
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index 86b949d..d24af28 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -1,3 +1,6 @@
+Description: Fix 'developement' typo, replace with 'development'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -224,7 +224,7 @@ Build(Unix):
diff --git a/debian/patches/doc b/debian/patches/doc
index 0efa1b1..f3743f6 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,3 +1,6 @@
+Description: Fix links to OGR documentation.
+Author: Francesco Paolo Lovergine fran...@debian.org, Bas Couwenberg 
sebas...@xs4all.nl
+Last-Update: 2013-10-13
 --- a/doc/index.dox
 +++ b/doc/index.dox
 @@ -19,7 +19,7 @@ for data translation and processing.  Th
diff --git a/debian/patches/doc-brief b/debian/patches/doc-brief
index c07933c..788de72 100644
--- a/debian/patches/doc-brief
+++ b/debian/patches/doc-brief
@@ -1,3 +1,7 @@
+Description: Add a brief summary to the GDAL and OGR utilities pages.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421653
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-13
 --- a/apps/gdal_utilities.dox
 +++ b/apps/gdal_utilities.dox
 @@ -4,6 +4,7 @@
diff --git a/debian/patches/ecw-plugin b/debian/patches/ecw-plugin
index 5ab3757..aaf4a2a 100644
--- a/debian/patches/ecw-plugin
+++ b/debian/patches/ecw-plugin
@@ -1,3 +1,6 @@
+Description: Add support for building the libgdal-ecw plugin.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2013-10-04
 --- a/frmts/ecw/GNUmakefile
 +++ b/frmts/ecw/GNUmakefile
 @@ -21,3 +21,12 @@ plugin: $(PLUGIN_SO)
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index ff94f92..93aeb93 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -1,3 +1,6 @@
+Description: Fix 'explicitely' typo, replace with 'explicitly'.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-11
 --- a/NEWS
 +++ b/NEWS
 @@ -752,7 +752,7 @@ GML driver:
diff --git a/debian/patches/gdal-grass b/debian/patches/gdal-grass
index 5730379..55885a6 100644
--- a/debian/patches/gdal-grass
+++ b/debian/patches/gdal-grass
@@ -1,3 +1,7 @@
+Description: Add support for building the libgdal-grass plugin.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544978
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2009-09-08
 --- a/frmts/grass/GNUmakefile
 +++ b/frmts/grass/GNUmakefile
 @@ -21,11 +21,13 @@ clean:
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index ba29df1..e5c8ebf 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,3 +1,6 @@
+Description: Install GDAL plugins in version specific subdirectory.
+Author: Francesco Paolo Lovergine fran...@debian.org
+Last-Update: 2013-07-01
 --- a/gcore/gdaldrivermanager.cpp
 +++ b/gcore/gdaldrivermanager.cpp
 @@ -667,7 +667,7 @@ void GDALDriverManager::AutoLoadDrivers(
diff --git a/debian/patches/hardening 

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 51bc70b23045e225351aff0594a8a351e1781ef1
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 01:56:14 2013 +0200

Add lintian override for package-name-doesnt-match-sonames.

diff --git a/debian/rules b/debian/rules
index 80fe146..7da133b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,9 +173,15 @@ override_dh_auto_install:
install -o root -g root -m 755 $(CURDIR)/swig/python/samples/*.py 
$(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples/.
 
# create lintian overrides file
-   echo # Used for BigTIFF support (#501127)  
$(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo # TIFF/GEOTIFF symbols are renamed to definitively solve problem 
of  $(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo # symbol collisions for programs that both links geotiff/tiff 
libraries.  $(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo libgdal1h: package-name-doesnt-match-sonames libgdal1  
$(CURDIR)/debian/libgdal1h.lintian-overrides
+
+   echo  $(CURDIR)/debian/libgdal1h.lintian-overrides
+   echo # Used for BigTIFF support (#501127)  
$(CURDIR)/debian/libgdal1h.lintian-overrides
echo libgdal1h: embedded-library usr/lib/libgdal.so.$$(basename 
debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. -f3,4,5): tiff \
 $(CURDIR)/debian/libgdal1h.lintian-overrides
+
echo  $(CURDIR)/debian/libgdal1h.lintian-overrides
echo # False positive on: {136, Socialist Republic of Viet Nam},  
$(CURDIR)/debian/libgdal1h.lintian-overrides
echo libgdal1h: spelling-error-in-binary 
usr/lib/libgdal.so.$$(basename debian/tmp/usr/lib/libgdal.so.*.*.*|cut -d. 
-f3,4,5) Nam Name \

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 5996a9f863e90ff5c3b3621d355ebabda5764e34
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 03:01:02 2013 +0200

Remove additional files not installed.

diff --git a/debian/rules b/debian/rules
index 7da133b..d7e2ad1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -154,12 +154,24 @@ override_dh_auto_install:
install -o root -g root -m 644 $(CURDIR)/swig/java/gdal.jar 
$(CURDIR)/debian/tmp/usr/share/java/.
install -o root -g root -m 644 $(CURDIR)/swig/java/*jni.so* 
$(CURDIR)/debian/tmp/usr/lib/jni
 
+   # removing useless autogenerated man pages
+   rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/_*_apps_.1
+
# removing license file
rm -f 
$(CURDIR)/debian/tmp/usr/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)/LICENSE.TXT
+
+   # removing la file
+   rm -f $(CURDIR)/debian/tmp/usr/lib/libgdal.la
+   
+   # removing perllocal.pod
+   rm -f $(CURDIR)/debian/tmp$(PERL_PATH)/perllocal.pod
+
# removing empty packlist MakeMaker files
-find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name .packlist -exec rm 
-f {} \;
+
# removing embedded rpath in perl shlibs
-   -find $(CURDIR)/debian/tmp/$(PERL_PATH) -type f -name *.so -exec 
chrpath --delete {} \;
+   -find $(CURDIR)/debian/tmp$(PERL_PATH) -type f -name *.so -exec 
chrpath --delete {} \;
+
# removing embedded rpath in main lib
-find $(CURDIR)/debian/tmp/usr/lib -type f -name *.so* -exec chrpath 
--delete {} \;
 

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 0ddca5cb9dcac702662b35d17b3a19beec19a53d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 00:30:11 2013 +0200

Install python scripts without .py extension.

diff --git a/debian/changelog b/debian/changelog
index 7d9796e..81abd3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 (closes: #722383)
   * Use minimal dh rules with dh-python, and dh-autoreconf for retooling.
   * Add patch to use hardening flags for java and perl bindings.
+  * Install python scripts without .py extension.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/python-gdal.install b/debian/python-gdal.install
index 8d1d3c9..0dac0f2 100644
--- a/debian/python-gdal.install
+++ b/debian/python-gdal.install
@@ -1,5 +1,26 @@
 usr/lib/python2*
-usr/bin/*.py
+usr/bin/epsg_tr
+usr/bin/esri2wkt
+usr/bin/gcps2vec
+usr/bin/gcps2wld
+usr/bin/gdal2tiles
+usr/bin/gdal2xyz
+usr/bin/gdalchksum
+usr/bin/gdalident
+usr/bin/gdalimport
+usr/bin/gdalmove
+usr/bin/gdal_auth
+usr/bin/gdal_calc
+usr/bin/gdal_edit
+usr/bin/gdal_fillnodata
+usr/bin/gdal_merge
+usr/bin/gdal_polygonize
+usr/bin/gdal_proximity
+usr/bin/gdal_retile
+usr/bin/gdal_sieve
+usr/bin/mkgraticule
+usr/bin/pct2rgb
+usr/bin/rgb2pct
 usr/share/man/man1/gdal_merge.1
 usr/share/man/man1/pct2rgb.1
 usr/share/man/man1/rgb2pct.1
diff --git a/debian/rules b/debian/rules
index 83bf75f..80fe146 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,7 +145,9 @@ override_dh_auto_install:
# install python stuff previuosly built and pre-installed
cp -a $(CURDIR)/debian/python-tmp/usr/lib/* 
$(CURDIR)/debian/tmp/usr/lib/.
install -o root -g root -d $(CURDIR)/debian/tmp/usr/bin
-   install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py 
$(CURDIR)/debian/tmp/usr/bin/.
+   for pyfile in $(shell find swig/python/scripts/ -name *.py); do \
+   install -o root -g root -m 755 $$pyfile 
$(CURDIR)/debian/tmp/usr/bin/`basename $$pyfile | sed 's/\.py//'`; \
+   done
 
# java stuff
mkdir -p $(CURDIR)/debian/tmp/usr/share/java 
$(CURDIR)/debian/tmp/usr/lib/jni

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit efbf0bae2dff7560295031865721ac2a22fd6cf5
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 20:54:58 2013 +0200

Use minimal dh rules with dh-python, and dh-autoreconf for retooling.

diff --git a/debian/changelog b/debian/changelog
index 394a7b7..84cdbd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 (closes: #421653)
   * Drop ruby extension for ruby1.8 removal transition. See also: #684433.
 (closes: #722383)
+  * Use minimal dh rules with dh-python, and dh-autoreconf for retooling.
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/control b/debian/control
index 58c9961..f256540 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org,
 Section: science
 Priority: extra
 Build-Depends: debhelper (= 9),
+   dh-autoreconf,
zlib1g-dev,
libnetcdf-dev (= 1:4.0.0),
netcdf-bin,
@@ -21,6 +22,7 @@ Build-Depends: debhelper (= 9),
d-shlibs,
libgeos-dev,
libmysqlclient-dev,
+   dh-python,
python-all-dev (= 2.6.6-3~),
python-numpy,
python3-all-dev,
diff --git a/debian/rules b/debian/rules
index 50e41c8..83bf75f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ GDAL_MAJOR=$(word 1,$(GDALVER))
 GDAL_MINOR=$(word 2,$(GDALVER))
 GDAL_PATCH=$(word 3,$(GDALVER))
 
+%:
+   dh $@ --with autoreconf,python2,python3
+
 versions:
@echo Gdal version: $(GDAL_MAJOR).$(GDAL_MINOR).$(GDAL_PATCH)
@echo Swig version: $(SWIGVER)
@@ -31,33 +34,42 @@ versions:
 #
 # The following targets are useful to autogen independent plugins sources
 #
-gdal-grass: configure gdal-grass-dist clean
+gdal-grass: override_dh_auto_configure gdal-grass-dist override_dh_auto_clean 
dh_clean
 gdal-grass-dist:
ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
[ -e $(CURDIR)/GDALmake.opt ]  $(MAKE) -C $(CURDIR)/frmts/grass dist
mv $(CURDIR)/frmts/grass/libgdal-grass-*.tar.gz $(CURDIR)/..
rm -f $(CURDIR)/GDALmake.opt
 
-gdal-ecw: configure gdal-ecw-dist clean
+gdal-ecw: override_dh_auto_configure gdal-ecw-dist override_dh_auto_clean 
dh_clean
 gdal-ecw-dist:
ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
[ -e $(CURDIR)/GDALmake.opt ]  $(MAKE) -C $(CURDIR)/frmts/ecw dist
mv $(CURDIR)/frmts/ecw/libgdal-ecw-*.tar.gz $(CURDIR)/..
rm -f $(CURDIR)/GDALmake.opt
 
-gdal-mrsid: configure gdal-mrsid-dist clean
+gdal-mrsid: override_dh_auto_configure gdal-mrsid-dist override_dh_auto_clean 
dh_clean
 gdal-mrsid-dist:
ln -fs $(CURDIR)/GDALmake.opt-$(PYDEF) $(CURDIR)/GDALmake.opt
[ -e $(CURDIR)/GDALmake.opt ]  $(MAKE) -C $(CURDIR)/frmts/mrsid dist
mv $(CURDIR)/frmts/mrsid/libgdal-mrsid-*.tar.gz $(CURDIR)/..
rm -f $(CURDIR)/GDALmake.opt
 
+override_dh_auto_clean:
+   [ ! -f GDALmake.opt ] || $(MAKE) distclean
+   rm -rf $(CURDIR)/swig/perl/*.bs
+   rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o 
$(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs
+   rm -rf $(CURDIR)/.libs
+   rm -f GDALmake.opt-*
+   rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp
+   rm -rf $(CURDIR)/doc/br/html $(CURDIR)/doc/ru/html
+   rm -rf $(CURDIR)/frmts/o/.libs
+   rm -f  $(CURDIR)/islibdappost310.*
 
+   # Removes per arch symbols for compatible archs
+   rm -f $(CURDIR)/debian/libgdal*.symbols.kfreebsd-i386 
$(CURDIR)/debian/libgdal*.symbols.kfreebsd-amd64
 
-configure: configure-stamp
-configure-stamp:
-   dh_testdir
-
+override_dh_auto_configure:
for V in $(PYVERS); do \
PYTHON=/usr/bin/python$$V ./configure --prefix=/usr \
--mandir=\$$\{prefix\}/share/man \
@@ -99,15 +111,7 @@ configure-stamp:
mv GDALmake.opt GDALmake.opt-$$V; \
done
 
-   touch $@
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp: configure-stamp
-   dh_testdir
-
+override_dh_auto_build:
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
$(MAKE) lib-target apps-target
rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
@@ -127,31 +131,7 @@ build-stamp: configure-stamp
$(MAKE) docs
$(MAKE) man
 
-   touch $@
-
-clean:
-   dh_testdir
-   dh_testroot
-
-   [ ! -f GDALmake.opt ] || $(MAKE) distclean
-   rm -rf $(CURDIR)/swig/perl/*.bs
-   rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o 
$(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs
-   rm -rf $(CURDIR)/.libs
-   rm -f GDALmake.opt-*
-   rm -rf $(CURDIR)/debian/tmp 

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 8382f0852d693705c742ec69b8a76422000213e4
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 03:17:56 2013 +0200

Add patch to fix allows typo.

diff --git a/debian/patches/allows-typo b/debian/patches/allows-typo
new file mode 100644
index 000..947abd8
--- /dev/null
+++ b/debian/patches/allows-typo
@@ -0,0 +1,14 @@
+Description: Fix 'allows to' typo.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-13
+--- a/swig/python/scripts/gdal_edit.dox
 b/swig/python/scripts/gdal_edit.dox
+@@ -14,7 +14,7 @@ gdal_edit [--help-general] [-a_srs srs_d
+ 
+ \section gdal_edit_description DESCRIPTION
+ 
+-The gdal_edit.py script can be used to allows to edit in place various 
information
++The gdal_edit.py script can be used to edit in place various information
+ of an existing GDAL dataset (projection, geotransform, nodata, metadata).
+ 
+ It works only with raster formats that support update access to
diff --git a/debian/patches/series b/debian/patches/series
index 235a559..811006b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,5 +24,6 @@ unkown-typo
 usefull-typo
 developement-typo
 algoritm-typo
+allows-typo
 doc-brief
 hardening

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 263d1261f0818181cdcd6a5cd1997553c65ea79e
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 01:01:30 2013 +0200

Update man pages to install.

diff --git a/debian/gdal-bin.install b/debian/gdal-bin.install
index d886a11..6b4d46e 100644
--- a/debian/gdal-bin.install
+++ b/debian/gdal-bin.install
@@ -1,36 +1,35 @@
+usr/bin/gdaladdo
+usr/bin/gdalbuildvrt
 usr/bin/gdaldem
-usr/bin/gdal_grid
 usr/bin/gdalenhance
+usr/bin/gdalinfo
+usr/bin/gdallocationinfo
 usr/bin/gdalmanage
+usr/bin/gdalsrsinfo
+usr/bin/gdaltindex
 usr/bin/gdaltransform
-usr/bin/nearblack
-usr/bin/gdal_translate
-usr/bin/gdal_rasterize
-usr/bin/gdalinfo
-usr/bin/gdaladdo
 usr/bin/gdalwarp
-usr/bin/gdaltindex
 usr/bin/gdal_contour
+usr/bin/gdal_grid
+usr/bin/gdal_rasterize
+usr/bin/gdal_translate
+usr/bin/nearblack
 usr/bin/ogr*
-usr/bin/gdalbuildvrt
 usr/bin/testepsg
-usr/bin/gdallocationinfo
-usr/bin/gdalsrsinfo
-usr/share/man/man1/gdal_rasterize.1
-usr/share/man/man1/gdal_translate.1
-usr/share/man/man1/gdal_utilities.1
-usr/share/man/man1/gdalinfo.1
 usr/share/man/man1/gdaladdo.1
-usr/share/man/man1/gdalwarp.1
+usr/share/man/man1/gdalbuildvrt.1
+usr/share/man/man1/gdaldem.1
+usr/share/man/man1/gdalinfo.1
+usr/share/man/man1/gdalmanage.1
+usr/share/man/man1/gdallocationinfo.1
+usr/share/man/man1/gdalsrsinfo.1
 usr/share/man/man1/gdaltindex.1
+usr/share/man/man1/gdaltransform.1
+usr/share/man/man1/gdalwarp.1
 usr/share/man/man1/gdal_contour.1
-usr/share/man/man1/ogr*.1
-usr/share/man/man1/gdal2tiles.1
 usr/share/man/man1/gdal_grid.1
-usr/share/man/man1/gdal_retile.1
-usr/share/man/man1/gdaltindex.1
-usr/share/man/man1/gdaltransform.1
+usr/share/man/man1/gdal_rasterize.1
+usr/share/man/man1/gdal_translate.1
+usr/share/man/man1/gdal_utilities.1
 usr/share/man/man1/nearblack.1
-usr/share/man/man1/gdaldem.1
-usr/share/man/man1/gdallocationinfo.1
-usr/share/man/man1/gdalsrsinfo.1
+usr/share/man/man1/ogr*.1
diff --git a/debian/python-gdal.install b/debian/python-gdal.install
index 0dac0f2..64e51a4 100644
--- a/debian/python-gdal.install
+++ b/debian/python-gdal.install
@@ -21,6 +21,14 @@ usr/bin/gdal_sieve
 usr/bin/mkgraticule
 usr/bin/pct2rgb
 usr/bin/rgb2pct
+usr/share/man/man1/gdal2tiles.1
+usr/share/man/man1/gdalmove.1
+usr/share/man/man1/gdal_edit.1
+usr/share/man/man1/gdal_fillnodata.1
 usr/share/man/man1/gdal_merge.1
+usr/share/man/man1/gdal_polygonize.1
+usr/share/man/man1/gdal_proximity.1
+usr/share/man/man1/gdal_retile.1
+usr/share/man/man1/gdal_sieve.1
 usr/share/man/man1/pct2rgb.1
 usr/share/man/man1/rgb2pct.1

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit b195a7460d12101d195736bebaac7b9c3d8f5473
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 03:04:45 2013 +0200

Also install gdalserver.

diff --git a/debian/gdal-bin.install b/debian/gdal-bin.install
index 6b4d46e..1a384e1 100644
--- a/debian/gdal-bin.install
+++ b/debian/gdal-bin.install
@@ -5,6 +5,7 @@ usr/bin/gdalenhance
 usr/bin/gdalinfo
 usr/bin/gdallocationinfo
 usr/bin/gdalmanage
+usr/bin/gdalserver
 usr/bin/gdalsrsinfo
 usr/bin/gdaltindex
 usr/bin/gdaltransform

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 5b4918a508be52da6219629a44828da23f17019a
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Sun Oct 13 19:20:11 2013 +0200

Drop ruby extension for ruby1.8 removal transition.

diff --git a/debian/changelog b/debian/changelog
index 02039ea..394a7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
 underscores anymore.
   * Add patch to add a brief description to {gdal,ogr}_utilities documentation.
 (closes: #421653)
+  * Drop ruby extension for ruby1.8 removal transition. See also: #684433.
+(closes: #722383)
 
  -- Bas Couwenberg sebas...@xs4all.nl  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/control b/debian/control
index 1e827a3..58c9961 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,6 @@ Build-Depends: debhelper (= 9),
libcurl4-gnutls-dev,
libsqlite3-dev,
libogdi3.2-dev,
-   ruby1.8,
-   ruby1.8-dev,
chrpath,
swig,
patch,
@@ -89,7 +87,7 @@ Architecture: all
 Section: libdevel
 Depends: libgdal-dev,
  ${misc:Depends}
-Description: Geospatial Data Abstraction Library - Development files
+Description: Geospatial Data Abstraction Library - Transitional package
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
  calling application for all supported formats. The related OGR
@@ -292,39 +290,6 @@ Description: Perl bindings to the Geospatial Data 
Abstraction Library
  This package contains Perl bindings for GDAL/OGR library.
 Homepage: http://map.hut.fi/doc/Geo-GDAL/html/
 
-Package: libgdal-ruby1.8
-Architecture: any
-Section: ruby
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Ruby 1.8 bindings to the Geospatial Data Abstraction Library
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. The related OGR
- library (which lives within the GDAL source tree) provides
- a similar capability for simple features vector data.
- .
- GDAL supports 40+ popular data formats, including commonly used
- ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
- GIS and remote sensing software packages (ERDAS Imagine,
- ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
- sensing and scientific data distribution formats such as HDF,
- EOS FAST, NOAA L1B, NetCDF, FITS.
- .
- OGR library supports popular vector formats like ESRI Shapefile,
- TIGER data, S57, MapInfo File, DGN, GML and more.
- .
- This package contains ruby 1.8 bindings for GDAL/OGR library.
-
-Package: libgdal-ruby
-Architecture: any
-Section: ruby
-Depends: libgdal-ruby1.8,
- ${misc:Depends}
-Description: Ruby bindings to the Geospatial Data Abstraction Library
- This is a dummy package which depends on current ruby version
- to support GDAL/OGR library binding upgrades.
-
 Package: libgdal-java
 Architecture: any
 Section: java
diff --git a/debian/libgdal-ruby1.8.install b/debian/libgdal-ruby1.8.install
deleted file mode 100644
index 59e85d1..000
--- a/debian/libgdal-ruby1.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ruby/*
diff --git a/debian/patches/force-ruby1.8 b/debian/patches/force-ruby1.8
deleted file mode 100644
index 3990bf1..000
--- a/debian/patches/force-ruby1.8
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: force building with ruby 1.8
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/684433
-Forwarded: no
-Author: gregor herrmann gre...@debian.org
-Last-Update: 2012-09-18
-
 a/swig/ruby/RubyMakefile.mk
-+++ b/swig/ruby/RubyMakefile.mk
-@@ -13,18 +13,18 @@
- 
- BINDING = ruby
- GDAL_ROOT = ../..
--RUBY = ruby
-+RUBY = ruby1.8
- 
- include $(GDAL_ROOT)/GDALmake.opt
- 
- RUBY_MODULES_LIN = gdal.so ogr.so gdalconst.so osr.so  # Linux, Solaris, ...
- RUBY_MODULES_MAC = gdal.bundle ogr.bundle gdalconst.bundle osr.bundle # Darwin
- 
--RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e puts 
Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir'])
--RUBY_ARCH_INCLUDE_DIR := $(shell ruby -rrbconfig -e puts 
Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless 
Config::CONFIG['rubyhdrdir'].nil?)
--RUBY_LIB_DIR := $(shell ruby -rrbconfig -e puts Config::CONFIG['libdir'])
--RUBY_SO_NAME := $(shell ruby -rrbconfig -e puts 
Config::CONFIG['RUBY_SO_NAME'])
--RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e puts 
Config::CONFIG['sitearchdir'])
-+RUBY_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e puts 
Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir'])
-+RUBY_ARCH_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e puts 
Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless 
Config::CONFIG['rubyhdrdir'].nil?)
-+RUBY_LIB_DIR := $(shell $(RUBY) -rrbconfig -e puts 

[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 2316cb1c84d657ec2e34c5b6a1602a4c3dbb758d
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 03:10:54 2013 +0200

Only run dh_python on python packages.

diff --git a/debian/rules b/debian/rules
index d7e2ad1..75d5c7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -206,11 +206,11 @@ override_dh_installchangelogs:
dh_installchangelogs NEWS
 
 override_dh_python2:
-   dh_python2 -X.info
+   dh_python2 -X.info -ppython-gdal
dh_numpy
 
 override_dh_python3:
-   dh_python3 -X.info
+   dh_python3 -X.info -ppython3-gdal
dh_numpy3
 
 override_dh_makeshlibs:

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit d262b5f63917d8260c0a1f1bbb80330734745963
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 03:56:47 2013 +0200

Also override binary-without-manpage lintian issues.

diff --git a/debian/gdal-bin.lintian-overrides 
b/debian/gdal-bin.lintian-overrides
index 60320d0..eb24375 100644
--- a/debian/gdal-bin.lintian-overrides
+++ b/debian/gdal-bin.lintian-overrides
@@ -1,3 +1,4 @@
 # Man pages are automatically generated with sphinx.
 gdal-bin: hyphen-used-as-minus-sign
 gdal-bin: manpage-has-errors-from-man
+gdal-bin: binary-without-manpage
diff --git a/debian/python-gdal.lintian-overrides 
b/debian/python-gdal.lintian-overrides
index f501897..431c4b6 100644
--- a/debian/python-gdal.lintian-overrides
+++ b/debian/python-gdal.lintian-overrides
@@ -1,2 +1,3 @@
 # Man pages are automatically generated with sphinx.
 python-gdal: hyphen-used-as-minus-sign 
+python-gdal: binary-without-manpage

-- 
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


[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

2013-10-13 Thread Bas Couwenberg
The following commit has been merged in the master branch:
commit 009bec6d4aea465e5b9ec75b757612be8e583ba3
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Mon Oct 14 04:13:27 2013 +0200

Set distribution to experimental.

diff --git a/debian/changelog b/debian/changelog
index 81abd3f..72254b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
+gdal (1.10.1+dfsg-0~exp1) experimental; urgency=low
 
   * New upstream release.
   * Add myself to Uploaders.

-- 
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