Continue control file cleanup

debian/control

@@ -6,34 +6,28 @@ Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libpcre3, libx11
 Standards-Version: 3.9.3
 Homepage: http://djbushido.github.com/libcvautomation/
 
-Package: libcvautomation
+Package: libcvautomation-dev
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxtst-dev, libx11-dev, libopencv-core2.3, libopencv-highgui2.3, libopencv-imgproc2.3
 Description: GUI Automation and Testing Library
- Contains the Libcvautomation main library - libcvautomation is a GUI
+ Contains the Libcvautomation main library, headers, and pkg-config files.
- automation and testing tool based on image recognition and response. This
+ Libcvautomation is a GUI automation and testing tool based on image
- program was designed as a direct replacement for Sikuli and Xpresser. Each
+ recognition and response. This program was designed as a direct replacement
- solution had large problems with crashing, and both refused to function on
+ for Sikuli and Xpresser. Each solution had large problems with crashing, and
- Red Hat Linux and Ubuntu 12.04. The author really liked the way each of these
+ both refused to function on Red Hat Linux and Ubuntu 12.04. The author really
- programs approached GUI automation, but they simply didn't work. As such, a
+ liked the way each of these programs approached GUI automation, but they
- simple library was designed to integrate OpenCV and XTest, which can be used
+ simply didn't work. As such, a simple library was designed to integrate OpenCV
- by BASH to drive GUI testing and automation, and works on both new and old
+ and XTest, which can be used by BASH to drive GUI testing and automation, and
- Linux distributions.
+ works on both new and old Linux distributions.
 
 Package: libcvautomation-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}, ${source:Version}
 Description: documentation for libcvautomation
  Contains the HTML documentation for libcvautomation.
 
-Package: libcvautomation-dev
-Section: libdevel
-Depends: libcvautomation (= ${binary:Version})
-Architecture: any
-Description: development files for libcvautomation
- Contains all headers, and pkg-config files needed to build programs
- on top of libcvautomation
-
 Package: libcvautomation-examples
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxtst-dev, libx11-dev, libopencv-core2.3, libopencv-highgui2.3, libopencv-imgproc2.3
 Architecture: any

debian/libcvautomation-dev.install

@@ -1 +1,3 @@
+usr/lib/*
+usr/share/man/man3/*
 usr/include/*

debian/libcvautomation.install

@@ -1,3 +0,0 @@
-usr/lib/*
-usr/share/man/man3/*
-

debian/rules

@@ -19,3 +19,8 @@ export DH_OPTIONS
 
 %:
 	dh $@
+
+override_dh_install:
+	find debian/tmp/usr/lib -name "*.la" -exec \
+	sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} \;
+	dh_install

libcvautomation/Makefile.am

@@ -5,8 +5,9 @@ AM_LIBS = -shared
 #Lists the libraries to build
 lib_LTLIBRARIES = libcvautomation.la
 libcvautomation_la_SOURCES = libcvautomation-opencv.c libcvautomation-xlib.c libcvautomation-xtest.c
-libcvautomation_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ @X11_LIBS@ @XTEST_LIBS@ @CV_LIBS@
+libcvautomation_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-libcvautomation_la_CFLAGS = -shared -Wall -Werror -O2 -I$(top_srcdir)/include @X11_CFLAGS@ @XTEST_CFLAGS@ @CV_CFLAGS@
+libcvautomation_la_LIBADD = @X11_LIBS@ @XTEST_LIBS@ @CV_LIBS@
+libcvautomation_la_CFLAGS = -Wall -Werror -O2 -I$(top_srcdir)/include @X11_CFLAGS@ @XTEST_CFLAGS@ @CV_CFLAGS@
 
 #Lists the headers to distribute
 pkginclude_HEADERS = $(top_srcdir)/include/libcvautomation/libcvautomation.h $(top_srcdir)/include/libcvautomation/libcvautomation-opencv.h $(top_srcdir)/include/libcvautomation/libcvautomation-xlib.h $(top_srcdir)/include/libcvautomation/libcvautomation-xtest.h $(top_srcdir)/include/libcvautomation/xautomation_kbd.h $(top_srcdir)/include/libcvautomation/xautomation_keysym_map.h $(top_srcdir)/include/libcvautomation/xautomation_multikey_map.h