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

johanvdw-guest pushed a commit to branch master
in repository rasterio.

commit 04a566fc2db4844aed8b1bf17bb6dd7ca39c29e6
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date:   Wed Oct 29 08:33:09 2014 +0100

    Install rio command only for python2 to avoid name clashes
---
 debian/control | 2 --
 debian/rules   | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c530db2..a3ec50d 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:depends}
-Conflicts: python3-rasterio
 Description: Python API for using geospatial raster data with Numpy
  Rasterio reads and writes geospatial raster datasets.
  .
@@ -44,7 +43,6 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:depends}
-Conflicts: python-rasterio
 Description: Python 3 API for using geospatial raster data with Numpy
  Rasterio reads and writes geospatial raster datasets.
  .
diff --git a/debian/rules b/debian/rules
index 53463a0..3a42201 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,7 @@ override_dh_clean:
 
 debian/rio.1:
        help2man rio -N >debian/rio.1
+
+override_dh_install:
+       dh_install
+       rm -rf debian/python3-rasterio/usr/bin

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

_______________________________________________
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