4 files changed, 10 insertions, 6 deletions

diff --git a/noncore/multimedia/camera/ChangeLog b/noncore/multimedia/camera/ChangeLog
index d8b342d..37c03e5 100644
--- a/noncore/multimedia/camera/ChangeLog
+++ b/noncore/multimedia/camera/ChangeLog
@@ -1,27 +1,31 @@
+        2004-04-24      Michael Lauer   <mickey@Vanille.de>
+
+        * Rename binary and library for more consitency
+
         2003-12-18      Michael Lauer   <mickey@Vanille.de>
 
         * Released as Version 1.0.1 (Stable)
         * Added persistant configuration settings
         * Refactored the camera API into a library
         * Added a command line capturing application (e.g. for web-cam)
 
         2003-04-25      Michael Lauer   <mickey@Vanille.de>
         
         * Released as Version 1.0 (Stable)
         * Added video capturing
 
         2003-04-08      Michael Lauer   <mickey@Vanille.de>
 
         * Released as Version 0.2 (Beta)
         * Added photo capturing
         * Made the main layout a full preview window
         * Implemented portrait/landscape switching based on OpenZaurus life-rotation
 
         2003-04-06      Michael Lauer   <mickey@Vanille.de>
 
         * Released as Version 0.1 (Alpha)
         * Added picture preview widget
 
         2003-04-01      Michael Lauer   <mickey@Vanille.de>
 
         * Started with Opie-Camera application by implementing the core camera API
diff --git a/noncore/multimedia/camera/gui/gui.pro b/noncore/multimedia/camera/gui/gui.pro
index 9503862..cb7c4ca 100644
--- a/noncore/multimedia/camera/gui/gui.pro
+++ b/noncore/multimedia/camera/gui/gui.pro
@@ -1,19 +1,19 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          += qt warn_on 
 
 HEADERS         = previewwidget.h \
                   mainwindow.h
 
 SOURCES         = previewwidget.cpp \
                   mainwindow.cpp \
                   main.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include ../lib
 DEPENDPATH      += $(OPIEDIR)/include ../lib
-LIBS            += -lopiecore2 -lopieui2 -lopiecam
+LIBS            += -lopiecore2 -lopieui2 -lcamera
 INTERFACES      =
-TARGET          = opiecam
+TARGET          = camera
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/multimedia/camera/lib/lib.pro b/noncore/multimedia/camera/lib/lib.pro
index f3c25ec..b7a13c9 100644
--- a/noncore/multimedia/camera/lib/lib.pro
+++ b/noncore/multimedia/camera/lib/lib.pro
@@ -1,22 +1,22 @@
 DESTDIR         = $(OPIEDIR)/lib
 TEMPLATE        = lib
 CONFIG          += qt warn_on 
 
 HEADERS         = avi.h \
                   imageio.h \
                   zcameraio.h \
 
 SOURCES         = avi.c \
                   imageio.cpp \
                   zcameraio.cpp \
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 INTERFACES      =
-VERSION         = 1.0.0
-TARGET          = opiecam
+VERSION         = 1.0.1
+TARGET          = camera
 
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control
index 80647e6..d9eaab8 100644
--- a/noncore/multimedia/camera/opie-camera.control
+++ b/noncore/multimedia/camera/opie-camera.control
@@ -1,10 +1,10 @@
 Package: opie-camera
-Files: lib/libopiecam.* bin/opiecam bin/capture pics/camera apps/Applications/camera.desktop
+Files: lib/libcamera.* bin/camera bin/capture pics/camera apps/Applications/camera.desktop
 Priority: optional
 Section: opie/multimedia
 Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de>
 Architecture: arm
 Version: 1.0.1
-Depends: libqpe1, libopiecore2
+Depends: libqpe1, libopiecore2, libopieui2
 Description: A Camera Application
  A Camera Application to use with the Sharp CE-AG06.