summaryrefslogtreecommitdiff
path: root/noncore/settings/packagemanager
Side-by-side diff
Diffstat (limited to 'noncore/settings/packagemanager') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oconfitem.h7
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp7
-rw-r--r--noncore/settings/packagemanager/opie-packagemanager.control4
3 files changed, 13 insertions, 5 deletions
diff --git a/noncore/settings/packagemanager/oconfitem.h b/noncore/settings/packagemanager/oconfitem.h
index 9972c00..7b52ce4 100644
--- a/noncore/settings/packagemanager/oconfitem.h
+++ b/noncore/settings/packagemanager/oconfitem.h
@@ -40,3 +40,8 @@ class OConfItem
public:
- enum Type { Source, Destination, Option, Arch, NotDefined };
+ enum Type { Source=0x01,
+ GzSource=0x02,
+ Destination=0x04,
+ Option=0x08,
+ Arch=0x10,
+ NotDefined=0x20 };
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index f2d7e39..a885ef8 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -116,3 +116,4 @@ OConfItemList *OIpkg::servers()
// Retrieve only servers
- return filterConfItems( OConfItem::Source );
+ return filterConfItems( (OConfItem::Type)((int)OConfItem::Source |
+ (int)OConfItem::GzSource) );
}
@@ -545,2 +546,3 @@ void OIpkg::loadConfiguration()
line.startsWith( "#src" ) ||
+ line.startsWith( "#src/gz" ) ||
line.startsWith( "#dest" ) ||
@@ -620,3 +622,4 @@ OConfItemList *OIpkg::filterConfItems( OConfItem::Type typefilter )
OConfItem *item = it.current();
- if ( retrieveAll || item->type() == typefilter )
+ if ( retrieveAll ||
+ ( item->type() & typefilter ) )
{
diff --git a/noncore/settings/packagemanager/opie-packagemanager.control b/noncore/settings/packagemanager/opie-packagemanager.control
index da3ddfe..0153d40 100644
--- a/noncore/settings/packagemanager/opie-packagemanager.control
+++ b/noncore/settings/packagemanager/opie-packagemanager.control
@@ -4,3 +4,3 @@ Priority: optional
Section: opie/settings
-Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg (>=0.99.120)
+Depends: task-opie-minimal, libopiecore2, libopieui2, libipkg0 (>=0.99.120), ipkg-link
Replaces: packagemanager
@@ -9,2 +9,2 @@ Maintainer: Dan Williams (drw@handhelds.org)
Description: Opie package management client
-Version: 0.6.1$EXTRAVERSION
+Version: $QPE_VERSION$EXTRAVERSION