author | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-09 03:02:21 (UTC) |
commit | 67d1d0b292553af550219d770cbd5c00987d8b8b (patch) (side-by-side diff) | |
tree | 517759c7fbda44a40ff733e3b5d5667d90558caa /libopie2 | |
parent | 987bc9a2c5b39ddd4dc2a665cea65688bfd2179e (diff) | |
download | opie-67d1d0b292553af550219d770cbd5c00987d8b8b.zip opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.gz opie-67d1d0b292553af550219d770cbd5c00987d8b8b.tar.bz2 |
CONTROL files : reset version to 'standard' format
(partly rolls back my drastic
all-applicatoins-same-version change)
now format is x.y(.z)$EXTRAVERSION
where x.y (and aptionally .z)
are x : major version
y : minor version
z : application patch
and extra version is seconds-since-epoch
this value can be used to automatically
upgrade versions with minor changes (without
manual update of the control file)
-rw-r--r-- | libopie2/libopie2.control | 2 | ||||
-rw-r--r-- | libopie2/opiecore/libopiecore2.control | 2 | ||||
-rw-r--r-- | libopie2/opiedb/libopiedb2.control | 2 | ||||
-rw-r--r-- | libopie2/opiemm/libopiemm2.control | 2 | ||||
-rw-r--r-- | libopie2/opienet/libopienet2.control | 2 | ||||
-rw-r--r-- | libopie2/opiepim/libopiepim2.control | 2 | ||||
-rw-r--r-- | libopie2/opiesecurity/libopiesecurity2.control | 2 | ||||
-rw-r--r-- | libopie2/opieui/oresource.cpp | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control index fcd44b4..e72c535 100644 --- a/libopie2/libopie2.control +++ b/libopie2/libopie2.control @@ -1,10 +1,10 @@ Package: libopie2 Files: Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) Provides: libopie2 Description: Opie library 2.0 diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index c7fc141..1d27c1c 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control @@ -1,10 +1,10 @@ Package: libopiecore2 Files: lib/libopiecore2.so.* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.5$EXTRAVERSION Depends: libqpe1 Provides: libopiecore2 Description: Opie library 2.0 CORE diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control index 7e9354a..5744b24 100644 --- a/libopie2/opiedb/libopiedb2.control +++ b/libopie2/opiedb/libopiedb2.control @@ -1,10 +1,10 @@ Package: libopiedb2 Files: lib/libopiedb2.so* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin Provides: libopiedb2 Description: Opie library 2.1 DB diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control index 0dd2df2..38d7ddc 100644 --- a/libopie2/opiemm/libopiemm2.control +++ b/libopie2/opiemm/libopiemm2.control @@ -1,10 +1,10 @@ Package: libopiemm2 Files: lib/libopiemm2.so.* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.2$EXTRAVERSION Depends: libqpe1, libopiecore2 (1.8.2) Provides: libopiemm2 Description: Opie library 2.0 MM diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control index 69876b5..da53e2b 100644 --- a/libopie2/opienet/libopienet2.control +++ b/libopie2/opienet/libopienet2.control @@ -1,10 +1,10 @@ Package: libopienet2 Files: lib/libopienet2.so.* etc/manufacturers Priority: optional Section: opie/libs Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.4$EXTRAVERSION Depends: libopiecore2, libpcap0.8 (>=0.7.2) Provides: libopienet2 Description: Opie library 2.0 NET diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control index 28b7505..457e20a 100644 --- a/libopie2/opiepim/libopiepim2.control +++ b/libopie2/opiepim/libopiepim2.control @@ -1,10 +1,10 @@ Package: libopiepim2 Files: lib/libopiepim2.so.* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.3$EXTRAVERSION Depends: libqpe1, libopiecore2 (>=1.8.0) Provides: libopiepim2 Description: Opie library 2.0 PIM diff --git a/libopie2/opiesecurity/libopiesecurity2.control b/libopie2/opiesecurity/libopiesecurity2.control index 1eabb93..0a29a47 100644 --- a/libopie2/opiesecurity/libopiesecurity2.control +++ b/libopie2/opiesecurity/libopiesecurity2.control @@ -1,11 +1,11 @@ Package: libopiesecurity2 Files: lib/libopiesecurity2.so.* Priority: optional Section: opie/system Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Version: $QPE_VERSION$EXTRAVERSION +Version: 1.8.5$EXTRAVERSION Depends: libqpe1, libopiecore2, libopieui2 Provides: libopiesecurity2 Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security Description: Opie library 2.0 security diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp index 9559210..c94421a 100644 --- a/libopie2/opieui/oresource.cpp +++ b/libopie2/opieui/oresource.cpp @@ -37,16 +37,17 @@ #ifdef QWS namespace Resource { QPixmap loadPixmap( const QString& pix ) { QString filename; filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); + odebug << "Load pixmap " << filename << oendl; QPixmap pixmap( filename ); if ( pixmap.isNull() ) { odebug << "libopie2 resource: can't find pixmap " << filename << oendl; } return pixmap; }; |