updated debian package. split up libcec and libcec-dev

diff --git a/.gitignore b/.gitignore
index 2c1e410e071831fbd9307866dca8d27eb52bf286..3ea373cb2ef2d708c1593be9b45c8989442090bb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ cec-client.exe
 cec-client.ilk
 cec-client.pdb
 
+build
+
 project/Debug/
 project/ipch/
 project/libcec.sdf
@@ -56,4 +58,4 @@ src/testclient/*.o
 
 
 /dpinst-x86.exe
-/dpinst-amd64.exe
\ No newline at end of file
+/dpinst-amd64.exe

diff --git a/debian/control b/debian/control
index 1041755e978a003e3ec065182821cd529adec485..4ca7e36fd2dba63173c9fcde449cbee4b2fdddaa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,23 @@
 Source: libcec
 Section: video
 Priority: extra
-Maintainer: Lars Op den Kamp <info@pulse-eight.com>
-Build-Depends: debhelper (>= 7), libudev-dev, mime-support,
- locales, gawk, autotools-dev, autoconf, automake,
+Maintainer: Lars Op den Kamp <lars.opdenkamp@pulse-eight.com>
+Build-Depends: debhelper (>= 7), libudev-dev, mime-support, locales, gawk, autotools-dev, autoconf, automake, pkg-config 
 Standards-Version: 3.8.3
 Homepage: http://www.pulse-eight.net/
 
 Package: libcec
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CEC interface library
- CEC interface library.
+Description: Pulse-Eight CEC adapter control library
+ With this library you can access your Pulse-Eight CEC adapter.
+
+Package: libcec-dev
+Priority: optional
+Section: libdevel
+Architecture: any
+Depends: libcec (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Pulse-Eight CEC adapter control library (development files)
+ With libcec you can access your Pulse-Eight CEC adapter.
+ .
+ This package provides a static library and C/CPP header files.

diff --git a/debian/rules b/debian/rules
index 3d3d89ca1e685bf1b392d1006f8138034ab8a6fe..f9d1196afb5ccacac49477f7d71436cb6d6e833b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,39 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# debian package for libcec
+# Copyright Pulse-Eight 2011
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+       confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+       confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 %:
        dh  $@
+
+override_dh_clean:
+       rm -rf build
+       rm -rf debian/libcec
+       rm -rf debian/libcec-dev
+       dh_clean
+
+override_dh_auto_clean:
+       dh_clean
+
+override_dh_auto_configure:
+       [ -d build ] || mkdir build
+       cd build && ../configure $(confflags) CFLAGS="$(CFLAGS)" \
+         LDFLAGS="$(LDFLAGS)" --prefix=/usr
+
+override_dh_auto_build:
+       $(MAKE) -C build
+
+override_dh_install:
+       $(MAKE) -C build DESTDIR=$(CURDIR)/debian/libcec install-exec
+       $(MAKE) -C build DESTDIR=$(CURDIR)/debian/libcec-dev install-data
+       mv -v $(CURDIR)/debian/libcec/usr/lib/*.a $(CURDIR)/debian/libcec-dev/usr/lib/.
+       mv -v $(CURDIR)/debian/libcec/usr/lib/*.la $(CURDIR)/debian/libcec-dev/usr/lib/. 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 19f944aa535245c3282a443b476760dde911e0ee..5d93660b37ac56ed98d96ca6d8e30e4c5276ac11 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -8,7 +8,6 @@ library_include_HEADERS = ../../include/libcec/CECExports.h \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcec.pc
 
-
 libcec_la_SOURCES = AdapterCommunication.cpp \
                     AdapterCommunication.h \
                     AdapterDetection.cpp \
@@ -32,4 +31,4 @@ libcec_la_SOURCES = AdapterCommunication.cpp \
                     platform/threads.h
 
 libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@
-libcec_la_CPPFLAGS = -I../../include
+libcec_la_CPPFLAGS = -I@abs_top_srcdir@/include

diff --git a/src/testclient/Makefile.am b/src/testclient/Makefile.am
index a389f1ad975ea79396dac9dd4e595611845f6de6..aa23d92b5222bfb946ad99905d0b007d2c35a683 100644 (file)
--- a/src/testclient/Makefile.am
+++ b/src/testclient/Makefile.am
@@ -2,4 +2,4 @@ bin_PROGRAMS = cec-client
 cec_client_SOURCES = main.cpp \
                      ../lib/platform/threads.cpp
 
-cec_client_CPPFLAGS = -I../../include
\ No newline at end of file
+cec_client_CPPFLAGS = -I@abs_top_srcdir@/include
\ No newline at end of file