From e16d333ec2e8509fc665921ca106c25325bae9e0 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sat, 09 Aug 2003 16:24:58 +0000
Subject: Merge from BRANCH_1_0

---
(limited to 'noncore/comm')

diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 04f4b64..7af60f9 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -11,8 +11,7 @@ HEADERS		= d3des.h \
 		  krfbserverinfo.h \
 		  kvnc.h \
 		  kvncconndlg.h \
-		  kvncbookmarkdlg.h \
-		  version.h \
+		  kvncbookmarkdlg.h \		  
 		  vncauth.h
 SOURCES		= d3des.c \
 		  vncauth.c \
diff --git a/noncore/comm/keypebble/opie-keypebble.control b/noncore/comm/keypebble/opie-keypebble.control
index 123f307..23e4e89 100644
--- a/noncore/comm/keypebble/opie-keypebble.control
+++ b/noncore/comm/keypebble/opie-keypebble.control
@@ -5,7 +5,7 @@ Section: opie/applications
 Maintainer: Martin Imobersteg <imm@gmx.ch>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: VNC Viewer
  Virtual Network Computing (VNC) viewer
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/comm/mobilemsg/opie-mobilemsg.control b/noncore/comm/mobilemsg/opie-mobilemsg.control
index 1713af5..c5fbc7f 100644
--- a/noncore/comm/mobilemsg/opie-mobilemsg.control
+++ b/noncore/comm/mobilemsg/opie-mobilemsg.control
@@ -4,7 +4,7 @@ Priority: optional
 Section: opie/comm
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Mobile Messaging
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
--
cgit v0.9.0.2