cleanup, add tinykate control file

5 files changed, 7 insertions, 43 deletions

diff --git a/noncore/apps/tinykate/install b/noncore/apps/tinykate/install
deleted file mode 100755
index 912c91b..0000000
--- a/noncore/apps/tinykate/install
+++ b/dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ a$OPIEDIR = a ]
-then
-echo OPIEDIR must be set
-exit
-fi
-[ -f $OPIEDIR/pics/tinykate_icon.xpm ] || cp tinykate_icon.xpm $OPIEDIR/pics/
-[ -f $OPIEDIR/apps/tinykate.desktop ] || cp tinykate.desktop $OPIEDIR/apps/
-mv $OPIEDIR/Makefile $OPIEDIR/Makefile.orig
-sed "s/APPS=/&tinykate \\\\ \\
-    /" $OPIEDIR/Makefile.orig >> $OPIEDIR/Makefile
-echo You may wish to move the desktop file in to
-echo an appropriate subdirectory of the menus.
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index a78351a..0dd5b4c 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -1,94 +1,90 @@
 TEMPLATE	= lib
 CONFIG		= qt warn_on release
-DESTDIR		= $(OPIEDIR)/bin
 HEADERS		= microkde/kapplication.h \
 		  microkde/kconfig.h \
                   microkde/kdebug.h \
                   microkde/kdialog.h \
                   microkde/kdialogbase.h \
                   microkde/kfiledialog.h \
                   microkde/kglobal.h \
                   microkde/kiconloader.h \
                   microkde/klineedit.h \
                   microkde/klocale.h \
                   microkde/kmessagebox.h \
                   microkde/kprinter.h \
                   microkde/krestrictedline.h \
                   microkde/kseparator.h \
                   microkde/ksimpleconfig.h \
                   microkde/kstandarddirs.h \
                   microkde/ktempfile.h \
                   microkde/kunload.h \
                   microkde/kurlrequester.h \
                   microkde/kfontdialog.h \
                   microkde/krun.h \
                   microkde/knumvalidator.h \
                   microkde/kstaticdeleter.h \
                   microkde/klistview.h \
                   microkde/kglobalsettings.h \
 		  microkde/kcolorbtn.h \
 		  \
 	          \
 		  qt3back/qregexp3.h \
 		  kde/ksharedptr.h \
 		  document/katebuffer.h  document/katedialogs.h \
 		  document/katetextline.h \
 		  document/katecmd.h \
 		  document/katehighlight.h \
 		  document/katecmds.h    document/katedocument.h  \
 		  document/katesyntaxdocument.h \
 		  view/kateundohistory.h  \
 		  view/kateview.h  \
 		  view/kateviewdialog.h \
 		  interfaces/view.h \
 		  interfaces/document.h \
 		  ktexteditor/ktexteditor.h
 
 SOURCES		= microkde/kapplication.cpp \
                   microkde/kdialogbase.cpp \
 		  microkde/kconfig.cpp \
                   microkde/klocale.cpp \
                   microkde/kmessagebox.cpp \
                   microkde/kprocess.cpp \
                   microkde/kstandarddirs.cpp \
                   microkde/ktempfile.cpp \
                   microkde/kurlrequester.cpp \
                   microkde/kcolordialog.cpp \
                   microkde/kfontdialog.cpp \
                   microkde/krun.cpp \
                   microkde/knumvalidator.cpp \
                   microkde/kglobal.cpp \
                   microkde/kglobalsettings.cpp \
 		  microkde/kcolorbtn.cpp \
 		  \
 		  \
 		  qt3back/qregexp3.cpp \
 		  ktexteditor/ktexteditor.cpp \
 		  document/katebuffer.cpp  document/katedialogs.cpp \
 		  document/katehighlight.cpp  \
 		  document/katecmd.cpp   \
 		  document/katesyntaxdocument.cpp document/katecmds.cpp \
 		  document/katedocument.cpp    document/katetextline.cpp \
 		  view/kateundohistory.cpp \
 		  view/kateview.cpp \
 		  view/kateviewdialog.cpp \
 		  interfaces/interfaces.cpp
 
 INTERFACES	= 
 INCLUDEPATH	+= $(OPIEDIR)/include $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
 			$(OPIEDIR)/noncore/apps/tinykate/libkate/document \
 			$(OPIEDIR)/noncore/apps/tinykate/libkate/view \
 			$(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
 			$(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
 			$(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET		= tinykate
 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 
-
-
-
 include ( ../../../../include.pro )
diff --git a/noncore/apps/tinykate/opie-tinykate.control b/noncore/apps/tinykate/opie-tinykate.control
new file mode 100644
index 0000000..902a25c
--- a/dev/null
+++ b/noncore/apps/tinykate/opie-tinykate.control
@@ -0,0 +1,7 @@
+Files: bin/tinykate apps/Applications/tinykate.desktop pics/tinykate $(OPIEDIR)/lib/libtinykate*
+Priority: optional
+Section: opie/applications
+Maintainer: Opie Team <opie@handhelds.org>
+Architecture: arm
+Version: $QPE_VERSION-$SUB_VERSION
+Depends: opie-base ($QPE_VERSION)
diff --git a/noncore/apps/tinykate/tinykate.desktop b/noncore/apps/tinykate/tinykate.desktop
deleted file mode 100644
index 2230a6b..0000000
--- a/noncore/apps/tinykate/tinykate.desktop
+++ b/dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=tinykate
-Icon=tinykate_icon.xpm
-Name=TinyKATE
-Comment=Opie Advanced Texteditor
diff --git a/noncore/apps/tinykate/tinykate_icon.xpm b/noncore/apps/tinykate/tinykate_icon.xpm
deleted file mode 100644
index e48e7c9..0000000
--- a/noncore/apps/tinykate/tinykate_icon.xpm
+++ b/dev/null
@@ -1,20 +0,0 @@
-/* XPM */
-static char *tinykate_xpm[] = {
-"14 14 3 1",
-" 	c None",
-".	c #000000",
-"a	c #FFFFFF",
-"              ",
-" aaaaaaaaaaaa ",
-" a..........a ",
-" a..aaaaaa..a ",
-" a.a.aaaa.a.a ",
-" a.aa.aa.aa.a ",
-" a.aaa..aaa.a ",
-" a.aaa..aaa.a ",
-" a.aa.aa.aa.a ",
-" a.a.aaaa.a.a ",
-" a..aaaaaa..a ",
-" a..........a ",
-" aaaaaaaaaaaa ",
-"              "};