[nik4] 04/05: Drop python3.patch, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository nik4.

commit 67c03fa2351dc3e84d2112b570baeb72a0ff48ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 1 10:33:28 2016 +0200

    Drop python3.patch, applied upstream.
---
 debian/changelog             |  1 +
 debian/patches/python3.patch | 50 --------------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9687f74..7af24ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nik4 (1.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop python3.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Jun 2016 10:32:35 +0200
 
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
deleted file mode 100644
index e9fe942..0000000
--- a/debian/patches/python3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Add support for Python 3.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Zverik/Nik4/issues/23
-
---- a/nik4.py
-+++ b/nik4.py
-@@ -376,12 +376,12 @@ if __name__ == "__main__":
- 		select_layers(m, options.add_layers.split(',') if options.add_layers else [], options.hide_layers.split(',') if options.hide_layers else [])
- 
- 	if options.debug:
--		print 'scale={}'.format(scale)
--		print 'scale_factor={}'.format(scale_factor)
--		print 'size={},{}'.format(size[0], size[1])
--		print 'bbox={}'.format(bbox)
--		print 'bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None)
--		print 'layers=' + ','.join([l.name for l in m.layers if l.active])
-+		print('scale={}'.format(scale))
-+		print('scale_factor={}'.format(scale_factor))
-+		print('size={},{}'.format(size[0], size[1]))
-+		print('bbox={}'.format(bbox))
-+		print('bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None))
-+		print('layers=' + ','.join([l.name for l in m.layers if l.active]))
- 
- 	# generate metadata
- 	if options.ozi:
-@@ -424,14 +424,14 @@ if __name__ == "__main__":
- 			m.buffer_size = TILE_BUFFER
- 			tile_cnt = [int(math.ceil(1.0 * size[0] / width)), int(math.ceil(1.0 * size[1] / height))]
- 			if options.debug:
--				print 'tile_count={},{}'.format(tile_cnt[0], tile_cnt[1])
--				print 'tile_size={},{}'.format(width, height)
-+				print('tile_count={},{}'.format(tile_cnt[0], tile_cnt[1]))
-+				print('tile_size={},{}'.format(width, height))
- 			tmp_tile = '{:02d}_{:02d}_{}'
- 			tile_files = []
- 			for row in range(0, tile_cnt[1]):
- 				for column in range(0, tile_cnt[0]):
- 					if options.debug:
--						print 'tile={},{}'.format(row, column)
-+						print('tile={},{}'.format(row, column))
- 					tile_bbox = mapnik.Box2d(bbox.minx + 1.0 * width * scale * column, bbox.maxy - 1.0 * height * scale * row, bbox.minx + 1.0 * width * scale * (column + 1), bbox.maxy - 1.0 * height * scale * (row + 1))
- 					tile_size = [width if column < tile_cnt[0] - 1 else size[0] - width * (tile_cnt[0] - 1), height if row < tile_cnt[1] - 1 else size[1] - height * (tile_cnt[1] - 1)]
- 					m.zoom_to_box(tile_bbox)
-@@ -465,5 +465,5 @@ if __name__ == "__main__":
- 			msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
- 
- 		outfile.seek(0)
--		print outfile.read()
-+		print(outfile.read())
- 		outfile.close()
diff --git a/debian/patches/series b/debian/patches/series
index b67d390..6d07762 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-python3.patch
 nik4.patch

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