From 02ae3354d0c920a11d08a7c125d664a252be2d28 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bspeice@uncc.edu>
Date: Fri, 17 Aug 2012 17:19:52 -0400
Subject: [PATCH] Fix the debian build process up

---
 ChangeLog                             | 12 +++++++++++-
 debian/control                        |  2 +-
 debian/libcvautomation-python.install |  2 +-
 debian/rules                          |  1 +
 python/Makefile.am                    |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c48112f..bd1c93b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+libcvautomation (2.0-1) precise; urgency=low
+
+  * Release version 2.0-1 of libcvautomation
+  * Now includes Python support (2.x)!
+  * Rename functions in Bash wrapper
+  * Add some minor missing functions in main library
+  * Bugfixes
+
+ -- Bradlee Speice <bspeice@uncc.edu>  Fri, 17 Aug 2012 16:45:00 -0500
+
 libcvautomation (1.5-1) precise; urgency=low
 
   * Release version 1.5-1 of libcvautomation
@@ -5,7 +15,7 @@ libcvautomation (1.5-1) precise; urgency=low
   * Add a function for drag-and-drop
   * Documentation update
  
- -- Bradlee Speice <bspeice@uncc.edu> Mon, 13 Aug 2012 09:05:00 -0500
+ -- Bradlee Speice <bspeice@uncc.edu>  Mon, 13 Aug 2012 09:05:00 -0500
 
 libcvautomation (1.4-1) precise; urgency=low
 
diff --git a/debian/control b/debian/control
index a257731..3d56cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: Example programs to demonstrate libcvautomation functionality
 
 Package: libcvautomation-python
 Depends: ${shlibs:Depends}, ${misc:Depends}, python2.7
-Architecture: all
+Architecture: any
 Description: Python bindings for libcvautomation
  Contains the python libcvautomation module to allow python code to interface
  with libcvautomation.
diff --git a/debian/libcvautomation-python.install b/debian/libcvautomation-python.install
index 620c120..3aeeef1 100644
--- a/debian/libcvautomation-python.install
+++ b/debian/libcvautomation-python.install
@@ -1 +1 @@
-/usr/lib/python*/site-packages/*
+/usr/lib/python*/*
diff --git a/debian/rules b/debian/rules
index 959a008..6193699 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,4 +23,5 @@ override_dh_install:
 	find debian/tmp/usr/lib -name "*.la" -exec \
 	sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} \;
 	find debian/tmp/usr/lib -name "*.pyc" -exec rm {} \;
+	find debian/tmp/usr/lib -name "*.pyo" -exec rm {} \;
 	dh_install
diff --git a/python/Makefile.am b/python/Makefile.am
index ffc79e3..71b9141 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,6 +1,6 @@
 pyexec_LTLIBRARIES = _libcvautomation.la
 _libcvautomation_la_SOURCES = libcvautomation-swig.c
-_libcvautomation_la_LDFLAGS = -avoid-version -module $(PYTHON_LDFLAGS)
+_libcvautomation_la_LDFLAGS = -avoid-version -module $(PYTHON_LDFLAGS) -L$(top_srcdir)/libcvautomation/.libs
 _libcvautomation_la_LIBADD = -lcvautomation
 _libcvautomation_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/include