Merge branch 'dexela'

Conflicts:
	plugins/dexela/CMakeLists.txt
	src/CMakeLists.txt

9 files changed, 22 insertions, 94 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8744c82..39c421e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,19 +10,20 @@ set(UCA_DESCRIPTION "Unified Camera Access")
 set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}")
 set(UCA_ABI_VERSION "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}")
 
-set(PACKAGE_VERSION "${UCA_VERSION_STRING}")
-set(PACKAGE_NAME "${TARNAME}")
+set(CPACK_PACKAGE_VERSION "${UCA_VERSION_STRING}")
+set(CPACK_PACKAGE_NAME "${TARNAME}")
 set(PACKAGE_TARNAME "${TARNAME}")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket")
 
-set(CPACK_GENERATOR "RPM")
+set(CPACK_GENERATOR "DEB;RPM")
 set(CPACK_PACKAGE_RELEASE 3)
-set(CPACK_DEBIAN_PACKAGE_NAME "libuca")
+set(CPACK_RPM_PACKAGE_RELEASE 3)
+set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>")
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION})
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION})
-set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 
 set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 
@@ -39,9 +40,6 @@ set(UCA_ENUM_HDRS
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in
                ${CMAKE_CURRENT_BINARY_DIR}/package.sh)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libuca.spec.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/libuca.spec" @ONLY IMMEDIATE)
-
 
 # --- Common flags ------------------------------------------------------------
 
diff --git a/libuca.spec.in b/libuca.spec.in
deleted file mode 100644
index 0f77f95..0000000
--- a/libuca.spec.in
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- rpm-spec -*-
-Buildroot: @UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/@CPACK_PACKAGE_FILE_NAME@
-Summary:        Abstract interface for different camera classes and frame grabber devices
-Name:           libuca
-Version:        @PACKAGE_VERSION@
-Release:        @CPACK_PACKAGE_RELEASE@
-License:        unknown
-Group:          unknown
-Vendor:         Karlsruhe Institute of Technology/IPE
-Prefix:         @CMAKE_INSTALL_PREFIX@
-
-
-
- 
-#p define prefix /usr/local
-%define _rpmdir @UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM
-%define _rpmfilename @CPACK_PACKAGE_FILE_NAME@.rpm
-%define _unpackaged_files_terminate_build 0
-%define _topdir @UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM
-
-
-  
-%description
-DESCRIPTION
-===========
-
-This is an installer created using CPack (http://www.cmake.org). No additional installation instructions provided.
-
-
-
-# This is a shortcutted spec file generated by CMake RPM generator
-# we skip _install step because CPack does that for us.
-# We do only save CPack installed tree in _prepr
-# and then restore it in build.
-%prep
-mv $RPM_BUILD_ROOT @UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot
-
-#p build
-  
-%install
-if [ -e $RPM_BUILD_ROOT ];
-then
-  rm -Rf $RPM_BUILD_ROOT
-fi 
-mv "@UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT 
-
-%clean
-
-%post
-
-
-%postun
-
-
-%pre
-
-
-%preun
-
-
-%files
-%defattr(-,root,root,-)
-@CMAKE_INSTALL_PREFIX@/bin/control
-@CMAKE_INSTALL_PREFIX@/include/uca/*.h
-@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/*
-@CMAKE_INSTALL_PREFIX@/share/*
-
-
-%changelog
-* Tue Aug 7 2012 Volker Kaiser <volker.kaiser@softwareschneiderei.de>
-pack only existing header files
-* Tue Aug 7 2012 Volker Kaiser <volker.kaiser@softwareschneiderei.de>
-using more variables in spec file
-* Tue Aug 2 2012 Volker Kaiser <volker.kaiser@softwareschneiderei.de>
-First package version
diff --git a/package.sh.in b/package.sh.in
index 7c15b78..b9ac673 100644
--- a/package.sh.in
+++ b/package.sh.in
@@ -1,5 +1,7 @@
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;libraries;/"
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;headers;/" -D CPACK_PACKAGE_FILE_NAME="libuca-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-devel"
+HEADERS_POSTFIX="devel"
+
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;libraries;/" -D CPACK_PACKAGE_VERSION=${UCA_VERSION_STRING}
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;headers;/" -D CPACK_PACKAGE_NAME="${CPACK_PACKAGE_NAME}-$HEADERS_POSTFIX" -D CPACK_PACKAGE_FILE_NAME="${CPACK_PACKAGE_NAME}-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-$HEADERS_POSTFIX"
 
 # Build packages for all available cameras
 for shell_script in `find -name 'package-plugin-*.sh'`; do
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index f6a6ee6..e853b53 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -1,26 +1,27 @@
 cmake_minimum_required(VERSION 2.8)
 project(ucadexela C)
+set(VERSION "1.0.0")
 
 find_package(DEXELA)
 
 if (DEXELA_FOUND)
     set(UCA_CAMERA_NAME "dexela")
-    set(PLUGIN_REVISION "2")
+    set(PLUGIN_REVISION "4")
     set(PLUGIN_VERSION "1.0.0")
+    set(PLUGIN_SUMMARY "Dexela plugin for libuca")
     set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt")
+    set(PLUGIN_DESCRIPTION "Plugin for the Dexela 1207 detector.")
     set(PLUGIN_REQUIRES "libuca = 1.1.0, libdexela >= 0.9.2")
+    set(PLUGIN_VENDOR "ANKA Computing Group")
 
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
                    ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
 
     include_directories(${DEXELA_INCLUDE_DIRS})
 
-    add_library(ucadexela SHARED
-                uca-dexela-camera.c)
+    add_library(ucadexela SHARED uca-dexela-camera.c)
 
-    target_link_libraries(ucadexela
-                          ${UCA_DEPS}
-                          ${DEXELA_LIBRARIES})
+    target_link_libraries(ucadexela ${UCA_DEPS}  ${DEXELA_LIBRARIES})
 
     install(TARGETS ucadexela
             LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca
diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt
index 8b84fa5..2998374 100644
--- a/plugins/dexela/changelog.txt
+++ b/plugins/dexela/changelog.txt
@@ -1,2 +1,4 @@
+* Thu Mar 14 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-3
+- improve package metadata and build scripts
 * Thu Mar 7 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-2
 - add changelog and improve package metadata
diff --git a/plugins/dexela/libucadexela.so b/plugins/dexela/libucadexela.so
new file mode 100755
index 0000000..11070f5
--- /dev/null
+++ b/plugins/dexela/libucadexela.so
diff --git a/plugins/mock/libucamock.so b/plugins/mock/libucamock.so
new file mode 100755
index 0000000..5fd342e
--- /dev/null
+++ b/plugins/mock/libucamock.so
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e7db6a7..c3a037f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -53,8 +53,8 @@ set(libdir      ${prefix}/${LIB_INSTALL_DIR})
 set(includedir  "\${prefix}/include")
 set(VERSION     ${UCA_VERSION_STRING})
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uca.pc.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/uca.pc" @ONLY IMMEDIATE)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libuca.pc.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/libuca.pc" @ONLY IMMEDIATE)
 
 
 # --- Build target ------------------------------------------------------------
@@ -201,7 +201,7 @@ install(TARGETS uca
         LIBRARY DESTINATION ${LIB_INSTALL_DIR}
         COMPONENT libraries)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libuca.pc
         DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
         COMPONENT libraries)
 
diff --git a/src/uca.pc.in b/src/libuca.pc.in
index 3ca4dbe..3ca4dbe 100644
--- a/src/uca.pc.in
+++ b/src/libuca.pc.in