[rasterio] 02/02: Another wily build Conflicts: debian/changelog

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch ubuntugis/wily
in repository rasterio.

commit e8715279ae96b72b6a4f48044c2e2008cc9fa5d9
Merge: 945db20 2373f2b
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Mon Jun 15 14:42:12 2015 +0200

    Another wily build
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  6 ++--
 debian/control                                     |  1 -
 ...0001-Rename-rio-to-rasterio-Closes-788463.patch | 22 +++++++++++++
 .../0003-Fix-compatibility-with-Cython-0.22.patch  | 37 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 debian/{rio.1 => rasterio.1}                       |  0
 debian/rules                                       |  4 +--
 7 files changed, 67 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 5453730,7579cfc..a6075a1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- rasterio (0.24.0-1~wily) wily; urgency=medium
 -rasterio (0.24.0-1) UNRELEASED; urgency=medium
++rasterio (0.24.0-1~wily2) wily; urgency=medium
  
    * Imported Upstream version 0.18
    * Update manpage

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