From 782a90ca8d75915ef999a577fff8985a42c6d93c Mon Sep 17 00:00:00 2001
From: Matt Hill <matthill@openalpr.com>
Date: Sun, 28 Feb 2016 09:51:09 -0500
Subject: [PATCH] Merged Python binding changes.  Incremented version

---
 distros/debian/changelog | 13 +++++++++++++
 distros/debian/control   | 21 ++++++++++++++++++---
 distros/debian/rules     | 10 +++++++++-
 src/CMakeLists.txt       |  2 +-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/distros/debian/changelog b/distros/debian/changelog
index f810242..33c9cef 100644
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@@ -1,3 +1,16 @@
+openalpr (2.2.4-1) unstable; urgency=low
+
+  * Added Python3 bindings (Closes: #815961)
+  * Remove frame number from JSON output (Closes: #813290)
+  * Use dh-python to generate proper depends for python-openalpr (Closes:
+    #815960)
+  * Change python-openalpr from arch any to arch all (Closes: #815959)
+  * Fixed build failure on Hurd (Closes: #812738)
+  * Add bindings package for python3, python3-openalpr
+  * Upload sponsored by Petter Reinholdtsen
+
+ -- Matthew Hill <matthill@openalpr.com>  Sun, 28 Feb 2016 09:51:25 -0500
+
 openalpr (2.2.3-1) unstable; urgency=low
 
   * Changed Debian config to build on all architectures
diff --git a/distros/debian/control b/distros/debian/control
index 64afdde..e28375e 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Matthew Hill <matthill@openalpr.com>
 Build-Depends: debhelper (>= 9), cmake, quilt, 
  libtesseract-dev, libleptonica-dev, liblog4cplus-dev,
- libcurl3-dev, uuid-dev, libopencv-dev, default-jdk
+ libcurl3-dev, uuid-dev, libopencv-dev, default-jdk,
+ python, python3, dh-python
 Standards-Version: 3.9.6
 Homepage: https://github.com/openalpr/openalpr
 Vcs-Browser: https://github.com/openalpr/openalpr
@@ -101,8 +102,9 @@ Description: Utilities for the OpenALPR library
 
 Package: python-openalpr
 Section: python
-Architecture: any
-Depends: libopenalpr-dev (= ${binary:Version}), ${misc:Depends}
+Architecture: all
+Depends: libopenalpr-dev (>= ${source:Version}), (libopenalpr-dev << ${source:Version}.1~),
+ ${python:Depends}, ${misc:Depends}
 Description: Python binding for OpenALPR library
  OpenALPR is an open source Automatic License Plate Recognition library written
  in C++. The library analyzes images and identifies license plates. The output
@@ -110,3 +112,16 @@ Description: Python binding for OpenALPR library
  .
  The Python package allows Python code to interface with OpenALPR directly via 
  native Python bindings.
+
+Package: python3-openalpr
+Section: python
+Architecture: all
+Depends: libopenalpr-dev (>= ${source:Version}), (libopenalpr-dev << ${source:Version}.1~),
+ ${python3:Depends}, ${misc:Depends}
+Description: Python 3 binding for OpenALPR library
+ OpenALPR is an open source Automatic License Plate Recognition library written
+ in C++. The library analyzes images and identifies license plates. The output
+ is the text representation of any license plate characters found in the image.
+ .
+ The Python 3 package allows Python 3 code to interface with OpenALPR directly via
+ native Python 3 bindings.
diff --git a/distros/debian/rules b/distros/debian/rules
index 50d77ea..ea67309 100755
--- a/distros/debian/rules
+++ b/distros/debian/rules
@@ -29,7 +29,7 @@ TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --sourcedirectory=src --with quilt
+	dh $@ --sourcedirectory=src --with quilt,python2,python3
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -38,6 +38,14 @@ override_dh_auto_configure:
 	  -DCMAKE_VERBOSE_MAKEFILE=OFF \
 	  -DCMAKE_COLOR_MAKEFILE=ON
 
+override_dh_auto_install:
+	dh_auto_install
+	cd $(CURDIR)/src/bindings/python ; python3 ./setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-openalpr
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/src/bindings/python/build
+
 # Inspired by https://wiki.debian.org/onlyjob/get-orig-source
 .PHONY: get-orig-source
 get-orig-source: $(TARBALL) $(info I: $(PKG)_$(VER)$(DTYPE))
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index afe07f9..1a48798 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 2.6)
 # Set the OpenALPR version in cmake, and also add it as a DEFINE for the code to access
 SET(OPENALPR_MAJOR_VERSION "2")
 SET(OPENALPR_MINOR_VERSION "2")
-SET(OPENALPR_PATCH_VERSION "3")
+SET(OPENALPR_PATCH_VERSION "4")
 SET(OPENALPR_VERSION ${OPENALPR_MAJOR_VERSION}.${OPENALPR_MINOR_VERSION}.${OPENALPR_PATCH_VERSION})
 
 add_definitions( -DOPENALPR_MAJOR_VERSION=${OPENALPR_MAJOR_VERSION})