Help Browser: libopie->libopie2, make a quicklaunch app

4 files changed, 6 insertions, 9 deletions

diff --git a/core/apps/helpbrowser/config.in b/core/apps/helpbrowser/config.in
index d72df4b..ecc7bff 100644
--- a/core/apps/helpbrowser/config.in
+++ b/core/apps/helpbrowser/config.in
@@ -1,4 +1,4 @@
   config HELPBROWSER
     boolean "opie-helpbrowser (display html help files)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 9df99ba..22e0b50 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,13 +1,11 @@
-        TEMPLATE= app
-        CONFIG  = qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
         HEADERS         = helpbrowser.h magictextbrowser.h
         SOURCES         = helpbrowser.cpp magictextbrowser.cpp \
                   main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
         INTERFACES=
 TARGET          = helpbrowser
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp
index dc82e93..c726cd3 100644
--- a/core/apps/helpbrowser/main.cpp
+++ b/core/apps/helpbrowser/main.cpp
@@ -17,10 +17,9 @@
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "helpbrowser.h"
 
-#include <qtopia/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<HelpBrowser> )
diff --git a/core/apps/helpbrowser/opie-helpbrowser.control b/core/apps/helpbrowser/opie-helpbrowser.control
index e604e18..90deddd 100644
--- a/core/apps/helpbrowser/opie-helpbrowser.control
+++ b/core/apps/helpbrowser/opie-helpbrowser.control
@@ -1,11 +1,11 @@
 Package: opie-helpbrowser
-Files: bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
+Files: plugins/application/libhelpbrowser.so* bin/helpbrowser apps/Applications/helpbrowser.desktop docs pics/helpbrowser
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Arch: iPAQ
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
 Description: Browse HTML help documents
  The HTML help browser for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION