[python-geopandas] 07/07: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/python-geopandas

[Johan Van de Wauw]

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

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

commit 92ce38f83dda9397404ec2925573fdaef48ad05c
Merge: a135c4d 5cc2e2e
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Wed Feb 4 23:16:34 2015 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/python-geopandas
    
    Conflicts:
    	debian/control

 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --cc debian/control
index 012790a,3f64703..aadd8ec
--- a/debian/control
+++ b/debian/control
@@@ -14,6 -14,10 +14,8 @@@ Build-Depends: debhelper (>= 9)
                 python3-descartes,
                 python-fiona,
                 python3-fiona,
 -               python-pyproj,
 -               python3-pyproj,
+                python-shapely,
+                python3-shapely,
                 python-pandas,
                 python3-pandas,
  Standards-Version: 3.9.6

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