Merge from BRANCH_1_0.

3 files changed, 1 insertions, 3 deletions

diff --git a/library/opie-common.control b/library/opie-common.control
index 052d368..9cb0c75 100644
--- a/library/opie-common.control
+++ b/library/opie-common.control
@@ -1,10 +1,10 @@
 Package: opie-common
-Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/* pics/opie-sh/opie-sh.png
+Files: etc/colors bin/opie-reorgfiles apps/*/.directory etc/mime.types apps/Settings/quit.desktop pics/logo/*
 Priority: required
 Section: opie/system
 Maintainer:  Project Opie <opie@handhelds.org>
 Architecture: arm
 Depends: libqpe1, qte-fonts, qpf-bitstream-vera
 Replaces: opie-base
 Description: Core opie files
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/task-opie-minimal.control b/library/task-opie-minimal.control
index c629d51..155bd9a 100644
--- a/library/task-opie-minimal.control
+++ b/library/task-opie-minimal.control
@@ -1,14 +1,13 @@
 Package: task-opie-minimal
 Files: 
 Priority: required
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: libqte2 (>=$QTE_VERSION), qte-fonts (>=$QTE_VERSION), opie-common, libqpe1, libopie1, opie-qcop, opie-sounds, apmd, opie-pics, timezones, opie-aqpkg, opie-taskbar, opie-opiealarm, opie-login 
 Provides: opie-base, qpe-base
 Replaces: opie-base, qpe-base
 Description: Bootstrap Opie environment(minimal)
  A complete GUI environment for handhelds. This is the _minimal_ version.
  You will probably want to install one of the opie-i18n-* packages.
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/library/task-opie-settings.control b/library/task-opie-settings.control
index e8ffb45..7922bff 100644
--- a/library/task-opie-settings.control
+++ b/library/task-opie-settings.control
@@ -1,11 +1,10 @@
 Package: task-opie-settings
 Files: 
 Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiss <max.reiss@gmx.de>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-appearance, opie-security, opie-systemtime, opie-light-and-power
 Description: Opie settings app
  All settings apps
 Version: $QPE_VERSION$EXTRAVERSION