summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/debianutils/debianutils_2.14.3.bb (renamed from packages/debianutils/debianutils_2.13.2.bb)0
-rw-r--r--packages/gpe-today/gpe-today-0.09/.mtn2git_empty (renamed from packages/ipkg/ipkg-0.99.129/.mtn2git_empty)0
-rw-r--r--packages/gpe-today/gpe-today-0.09/makefile.patch65
-rw-r--r--packages/gpe-today/gpe-today_0.09.bb9
-rw-r--r--packages/ipkg/ipkg-0.99.129/buffer-overflow.patch38
-rw-r--r--packages/ipkg/ipkg-0.99.130/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.130/terse.patch27
-rw-r--r--packages/ipkg/ipkg-0.99.135/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.135/depends.patch107
-rw-r--r--packages/ipkg/ipkg-0.99.135/remove-c99isms.patch42
-rw-r--r--packages/ipkg/ipkg-0.99.140/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.140/remove-c99isms.patch124
-rw-r--r--packages/ipkg/ipkg-0.99.144/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.144/paths.patch193
-rw-r--r--packages/ipkg/ipkg-0.99.147/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.147/libdir.patch11
-rw-r--r--packages/ipkg/ipkg-0.99.148/.mtn2git_empty0
-rw-r--r--packages/ipkg/ipkg-0.99.148/libdir.patch11
-rw-r--r--packages/ipkg/ipkg-native_0.99.130.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.135.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.138.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.140.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.144.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.146.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.147.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.148.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.151.bb2
-rw-r--r--packages/ipkg/ipkg-native_0.99.153.bb (renamed from packages/ipkg/ipkg-native_0.99.129.bb)0
-rw-r--r--packages/ipkg/ipkg_0.99.129.bb7
-rw-r--r--packages/ipkg/ipkg_0.99.130.bb5
-rw-r--r--packages/ipkg/ipkg_0.99.135.bb6
-rw-r--r--packages/ipkg/ipkg_0.99.140.bb4
-rw-r--r--packages/ipkg/ipkg_0.99.144.bb3
-rw-r--r--packages/ipkg/ipkg_0.99.146.bb1
-rw-r--r--packages/ipkg/ipkg_0.99.147.bb2
-rw-r--r--packages/ipkg/ipkg_0.99.148.bb2
-rw-r--r--packages/ipkg/ipkg_0.99.151.bb1
-rw-r--r--packages/ipkg/ipkg_0.99.153.bb (renamed from packages/ipkg/ipkg_0.99.138.bb)0
-rw-r--r--packages/libopieobex/libopieobex0.inc20
-rw-r--r--packages/libopieobex/libopieobex0_1.2.0.bb21
-rw-r--r--packages/libopieobex/libopieobex0_cvs.bb22
-rw-r--r--packages/meta/task-python-everything_0.9.2.bb6
-rw-r--r--packages/meta/task-python-sharprom_0.9.0.bb6
-rw-r--r--packages/mtd/mtd-utils_20050801.bb3
-rw-r--r--packages/python/python-gnosis_1.1.1.bb2
-rw-r--r--packages/xserver-common/xserver-common_1.1.bb4
46 files changed, 110 insertions, 650 deletions
diff --git a/packages/debianutils/debianutils_2.13.2.bb b/packages/debianutils/debianutils_2.14.3.bb
index b20ae66108..b20ae66108 100644
--- a/packages/debianutils/debianutils_2.13.2.bb
+++ b/packages/debianutils/debianutils_2.14.3.bb
diff --git a/packages/ipkg/ipkg-0.99.129/.mtn2git_empty b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipkg/ipkg-0.99.129/.mtn2git_empty
+++ b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty
diff --git a/packages/gpe-today/gpe-today-0.09/makefile.patch b/packages/gpe-today/gpe-today-0.09/makefile.patch
new file mode 100644
index 0000000000..6f405a6d7f
--- /dev/null
+++ b/packages/gpe-today/gpe-today-0.09/makefile.patch
@@ -0,0 +1,65 @@
+--- /tmp/Makefile 2005-09-01 17:07:30.218823872 +0200
++++ gpe-today-0.09/Makefile 2005-09-01 17:07:32.698446912 +0200
+@@ -1,7 +1,7 @@
+ PACKAGE = gpe-today
+ PREFIX = /usr/local
+ VERSION = 0.09
+-CVSBUILD = no
++CVSBUILD =no
+ #DEBUG = yes
+ #EFENCE = yes
+
+@@ -9,28 +9,27 @@
+
+ MEMBERS = main todo calendar date xsettings
+
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLDFLAGS += `pkg-config --libs gtk+-2.0`
+-
+-CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE
+-
+ ifeq ($(EFENCE),yes)
+-LDFLAGS = -lefence
++PACKAGE_LDFLAGS = -lefence
+ endif
+
+ ifeq ($(DEBUG),yes)
+-CFLAGS = -g
++package_CFLAGS = -g
+ else
+-CFLAGS = -Os -fomit-frame-pointer
++PACKAGE_CFLAGS = -Os -fomit-frame-pointer
+ endif
+
+-CFLAGS += -Wall $(GTKCFLAGS)
+-LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings -Wl,-rpath-link,../libgpepimc -Wl,-rpath-link,../libdisplaymigration
+-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+-#CFLAGS += -MD
+-
+ .SUFFIXES: .d
+
++ifeq ($(CVSBUILD),yes)
++PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc
++PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc
++endif
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS)
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -lsqlite -lgpepimc
++
++
+ OBJS = $(patsubst %,%.o,$(MEMBERS))
+ DEPS = $(patsubst %,%.d,$(MEMBERS))
+ SOURCES = $(patsubst %,%.c,$(MEMBERS))
+@@ -43,10 +42,10 @@
+ BUILD = build
+ endif
+
+-all: $(PACKAGE) all-mo
++all: $(PACKAGE)
+
+ $(PACKAGE): $(OBJS)
+- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS)
++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
+
+ install-program: all $(PACKAGE).desktop
+ for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done
diff --git a/packages/gpe-today/gpe-today_0.09.bb b/packages/gpe-today/gpe-today_0.09.bb
new file mode 100644
index 0000000000..916b5ab50f
--- /dev/null
+++ b/packages/gpe-today/gpe-today_0.09.bb
@@ -0,0 +1,9 @@
+LICENSE = "GPL"
+inherit gpe
+
+DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead"
+DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://makefile.patch;patch=1"
diff --git a/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch b/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
deleted file mode 100644
index 91234fd53f..0000000000
--- a/packages/ipkg/ipkg-0.99.129/buffer-overflow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ipkg_cmd.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
-retrieving revision 1.96
-diff -u -r1.96 ipkg_cmd.c
---- C/ipkg_cmd.c 19 Aug 2004 10:55:47 -0000 1.96
-+++ C/ipkg_cmd.c 11 Sep 2004 19:43:14 -0000
-@@ -860,6 +860,7 @@
- str_list_elt_t *iter;
- char *pkg_version;
- size_t buff_len = 8192;
-+ size_t used_len;
- char *buff ;
-
- buff = (char *)malloc(buff_len);
-@@ -891,9 +892,20 @@
- }
- #else
- if (buff) {
-- snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-- pkg->name, pkg_version, pkg->dest->name);
-+ try_again:
-+ used_len = snprintf(buff, buff_len, "Package %s (%s) is installed on %s and has the following files:\n",
-+ pkg->name, pkg_version, pkg->dest->name) + 1;
-+ if (used_len > buff_len) {
-+ buff_len *= 2;
-+ buff = realloc (buff, buff_len);
-+ goto try_again;
-+ }
- for (iter = installed_files->head; iter; iter = iter->next) {
-+ used_len += strlen (iter->data) + 1;
-+ while (buff_len <= used_len) {
-+ buff_len *= 2;
-+ buff = realloc (buff, buff_len);
-+ }
- strncat(buff, iter->data, buff_len);
- strncat(buff, "\n", buff_len);
- }
diff --git a/packages/ipkg/ipkg-0.99.130/.mtn2git_empty b/packages/ipkg/ipkg-0.99.130/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.130/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.130/terse.patch b/packages/ipkg/ipkg-0.99.130/terse.patch
deleted file mode 100644
index 9a07df5df3..0000000000
--- a/packages/ipkg/ipkg-0.99.130/terse.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- C/ipkg_cmd.c~terse
-+++ C/ipkg_cmd.c
-@@ -119,8 +119,6 @@
- " writing status file\n");
- ipkg_conf_write_status_files(conf);
- pkg_write_changed_filelists(conf);
-- } else {
-- ipkg_message(conf, IPKG_NOTICE, "Nothing to be done\n");
- }
- }
-
-@@ -148,9 +146,7 @@
- int result;
- p_userdata = userdata;
- result = (cmd->fun)(conf, argc, argv);
-- if ( result == 0 ) {
-- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
-- } else {
-+ if ( result != 0 ) {
- ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
- }
-
diff --git a/packages/ipkg/ipkg-0.99.135/.mtn2git_empty b/packages/ipkg/ipkg-0.99.135/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.135/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.135/depends.patch b/packages/ipkg/ipkg-0.99.135/depends.patch
deleted file mode 100644
index 8f472ab405..0000000000
--- a/packages/ipkg/ipkg-0.99.135/depends.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Index: ipkg_cmd.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_cmd.c,v
-retrieving revision 1.99
-diff -u -r1.99 ipkg_cmd.c
---- ipkg/ipkg_cmd.c 6 Jan 2005 00:21:49 -0000 1.99
-+++ ipkg/ipkg_cmd.c 8 Jan 2005 13:11:16 -0000
-@@ -1150,7 +1150,7 @@
-
- int pkg_mark_provides(pkg_t *pkg)
- {
-- int provides_count = pkg->provides_count;
-+ int provides_count = pkg->provides_count + 1;
- abstract_pkg_t **provides = pkg->provides;
- int i;
- pkg->parent->state_flag |= SF_MARKED;
-@@ -1207,7 +1207,7 @@
- for (j = 0; j < available_pkgs->len; j++) {
- pkg_t *pkg = available_pkgs->pkgs[j];
- int k;
-- int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count : pkg->replaces_count;
-+ int count = (what_field_type == WHATPROVIDES) ? pkg->provides_count + 1 : pkg->replaces_count;
- for (k = 0; k < count; k++) {
- abstract_pkg_t *apkg =
- ((what_field_type == WHATPROVIDES)
-Index: ipkg_remove.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/ipkg_remove.c,v
-retrieving revision 1.40
-diff -u -r1.40 ipkg_remove.c
---- ipkg/ipkg_remove.c 10 May 2004 21:37:07 -0000 1.40
-+++ ipkg/ipkg_remove.c 8 Jan 2005 13:11:19 -0000
-@@ -39,7 +39,7 @@
- */
- int pkg_has_installed_dependents(ipkg_conf_t *conf, abstract_pkg_t *parent_apkg, pkg_t *pkg, abstract_pkg_t *** pdependents)
- {
-- int nprovides = pkg->provides_count;
-+ int nprovides = pkg->provides_count + 1;
- abstract_pkg_t **provides = pkg->provides;
- int n_installed_dependents = 0;
- int i;
-Index: pkg_depends.c
-===================================================================
-RCS file: /cvs/familiar/dist/ipkg/C/pkg_depends.c,v
-retrieving revision 1.61
-diff -u -r1.61 pkg_depends.c
---- ipkg/pkg_depends.c 1 Sep 2004 20:30:39 -0000 1.61
-+++ ipkg/pkg_depends.c 8 Jan 2005 13:11:21 -0000
-@@ -420,9 +420,9 @@
- int pkg_has_common_provides(pkg_t *pkg, pkg_t *replacee)
- {
- abstract_pkg_t **provides = pkg->provides;
-- int provides_count = pkg->provides_count;
-+ int provides_count = pkg->provides_count + 1;
- abstract_pkg_t **replacee_provides = replacee->provides;
-- int replacee_provides_count = replacee->provides_count;
-+ int replacee_provides_count = replacee->provides_count + 1;
- int i, j;
- for (i = 0; i < provides_count; i++) {
- abstract_pkg_t *apkg = provides[i];
-@@ -443,7 +443,7 @@
- int pkg_provides_abstract(pkg_t *pkg, abstract_pkg_t *providee)
- {
- abstract_pkg_t **provides = pkg->provides;
-- int provides_count = pkg->provides_count;
-+ int provides_count = pkg->provides_count + 1;
- int i;
- for (i = 0; i < provides_count; i++) {
- if (provides[i] == providee)
-@@ -461,7 +461,7 @@
- abstract_pkg_t **replaces = pkg->replaces;
- int replaces_count = pkg->replaces_count;
- abstract_pkg_t **replacee_provides = pkg->provides;
-- int replacee_provides_count = pkg->provides_count;
-+ int replacee_provides_count = pkg->provides_count + 1;
- int i, j;
- for (i = 0; i < replaces_count; i++) {
- abstract_pkg_t *abstract_replacee = replaces[i];
-@@ -504,7 +504,7 @@
- compound_depend_t *conflicts = pkg->conflicts;
- int conflicts_count = pkg->conflicts_count;
- abstract_pkg_t **conflictee_provides = conflictee->provides;
-- int conflictee_provides_count = conflictee->provides_count;
-+ int conflictee_provides_count = conflictee->provides_count + 1;
- int i, j, k;
- for (i = 0; i < conflicts_count; i++) {
- int possibility_count = conflicts[i].possibility_count;
-@@ -605,9 +605,6 @@
- /* every pkg provides itself */
- abstract_pkg_vec_insert(ab_pkg->provided_by, ab_pkg);
-
-- if (!pkg->provides_count)
-- return 0;
--
- pkg->provides = (abstract_pkg_t **)malloc(sizeof(abstract_pkg_t *) * (pkg->provides_count + 1));
- if (pkg->provides == NULL) {
- fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
-@@ -615,6 +612,9 @@
- }
- pkg->provides[0] = ab_pkg;
-
-+ if (pkg->provides_count == 0)
-+ return 0;
-+
- // if (strcmp(ab_pkg->name, pkg->name))
- // fprintf(stderr, __FUNCTION__ ": ab_pkg=%s pkg=%s\n", ab_pkg->name, pkg->name);
-
diff --git a/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch b/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
deleted file mode 100644
index e70f3af9ff..0000000000
--- a/packages/ipkg/ipkg-0.99.135/remove-c99isms.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- C/ipkg_install.c~remove-c99isms.patch
-+++ C/ipkg_install.c
-@@ -186,14 +186,16 @@
- {
- abstract_pkg_vec_t *providers = pkg_hash_fetch_all_installation_candidates (&conf->pkg_hash, pkg_name);
- int i;
-+ ipkg_error_t err;
-+ abstract_pkg_t *ppkg;
-
- if (providers == NULL)
- return IPKG_PKG_HAS_NO_CANDIDATE;
-
- for (i = 0; i < providers->len; i++) {
-- abstract_pkg_t *ppkg = abstract_pkg_vec_get(providers, i);
-- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
-- ipkg_error_t err = ipkg_install_by_name(conf, ppkg->name);
-+ ppkg = abstract_pkg_vec_get(providers, i);
-+ ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_by_name %d \n",__FUNCTION__, i);
-+ err = ipkg_install_by_name(conf, ppkg->name);
- if (err)
- return err;
- }
-@@ -614,12 +616,13 @@
- int pkg_remove_installed_replacees_unwind(ipkg_conf_t *conf, pkg_vec_t *replacees)
- {
- int i;
-+ int err;
- int replaces_count = replacees->len;
- for (i = 0; i < replaces_count; i++) {
- pkg_t *replacee = replacees->pkgs[i];
- if (replacee->state_status != SS_INSTALLED) {
- ipkg_message(conf, IPKG_DEBUG2,"Function: %s calling ipkg_install_pkg \n",__FUNCTION__);
-- int err = ipkg_install_pkg(conf, replacee);
-+ err = ipkg_install_pkg(conf, replacee);
- if (err)
- return err;
- }
diff --git a/packages/ipkg/ipkg-0.99.140/.mtn2git_empty b/packages/ipkg/ipkg-0.99.140/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.140/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch b/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
deleted file mode 100644
index f1ad2a3f6c..0000000000
--- a/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: C/pkg_depends.c
-===================================================================
---- C.orig/pkg_depends.c 2005-02-08 14:32:46.000000000 +0000
-+++ C/pkg_depends.c 2005-02-08 15:50:50.000000000 +0000
-@@ -251,15 +251,16 @@
- really conflicts
- returns 0 if conflicts <> replaces or 1 if conflicts == replaces
- */
--int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg){
--
--int i ;
--int replaces_count = pkg->replaces_count;
-+int is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg)
-+{
-+ int i ;
-+ int replaces_count = pkg->replaces_count;
-+ abstract_pkg_t **replaces;
-
-- if (pkg->replaces_count==0) // No replaces, it's surely a conflict
-- return 0;
-+ if (pkg->replaces_count==0) // No replaces, it's surely a conflict
-+ return 0;
-
-- abstract_pkg_t **replaces = pkg->replaces;
-+ replaces = pkg->replaces;
-
- for (i = 0; i < replaces_count; i++) {
- if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) // Found
-@@ -280,6 +281,8 @@
- register int i, j, k;
- int count;
- abstract_pkg_t * ab_pkg;
-+ pkg_t **pkg_scouts;
-+ pkg_t *pkg_scout;
-
- /*
- * this is a setup to check for redundant/cyclic dependency checks,
-@@ -316,9 +319,9 @@
- if (test_vec) {
- /* pkg_vec found, it is an actual package conflict
- * cruise this possiblity's pkg_vec looking for an installed version */
-- pkg_t **pkg_scouts = test_vec->pkgs;
-+ pkg_scouts = test_vec->pkgs;
- for(k = 0; k < test_vec->len; k++){
-- pkg_t *pkg_scout = pkg_scouts[k];
-+ pkg_scout = pkg_scouts[k];
- if (!pkg_scout) {
- fprintf(stderr, "%s: null pkg scout\n", __FUNCTION__);
- continue;
-@@ -381,13 +384,16 @@
- abstract_pkg_vec_t *provider_apkgs = apkg->provided_by;
- int n_providers = provider_apkgs->len;
- abstract_pkg_t **apkgs = provider_apkgs->pkgs;
-+ pkg_vec_t *pkg_vec;
-+ int n_pkgs ;
- int i;
-+ int j;
-+
- for (i = 0; i < n_providers; i++) {
- abstract_pkg_t *papkg = apkgs[i];
-- pkg_vec_t *pkg_vec = papkg->pkgs;
-+ pkg_vec = papkg->pkgs;
- if (pkg_vec) {
-- int n_pkgs = pkg_vec->len;
-- int j;
-+ n_pkgs = pkg_vec->len;
- for (j = 0; j < n_pkgs; j++) {
- pkg_t *pkg = pkg_vec->pkgs[j];
- if (version_constraints_satisfied(depend, pkg)) {
-@@ -406,12 +412,14 @@
- int n_providers = provider_apkgs->len;
- abstract_pkg_t **apkgs = provider_apkgs->pkgs;
- int i;
-+ int n_pkgs;
-+ int j;
-+
- for (i = 0; i < n_providers; i++) {
- abstract_pkg_t *papkg = apkgs[i];
- pkg_vec_t *pkg_vec = papkg->pkgs;
- if (pkg_vec) {
-- int n_pkgs = pkg_vec->len;
-- int j;
-+ n_pkgs = pkg_vec->len;
- for (j = 0; j < n_pkgs; j++) {
- pkg_t *pkg = pkg_vec->pkgs[j];
- if (version_constraints_satisfied(depend, pkg)) {
-@@ -532,11 +540,15 @@
- abstract_pkg_t **conflictee_provides = conflictee->provides;
- int conflictee_provides_count = conflictee->provides_count;
- int i, j, k;
-+ int possibility_count;
-+ struct depend **possibilities;
-+ abstract_pkg_t *possibility ;
-+
- for (i = 0; i < conflicts_count; i++) {
-- int possibility_count = conflicts[i].possibility_count;
-- struct depend **possibilities = conflicts[i].possibilities;
-+ possibility_count = conflicts[i].possibility_count;
-+ possibilities = conflicts[i].possibilities;
- for (j = 0; j < possibility_count; j++) {
-- abstract_pkg_t *possibility = possibilities[j]->pkg;
-+ possibility = possibilities[j]->pkg;
- for (k = 0; k < conflictee_provides_count; k++) {
- if (possibility == conflictee_provides[k]) {
- return 1;
-@@ -832,6 +844,8 @@
- compound_depend_t * depends;
- int count, othercount;
- register int i, j;
-+ abstract_pkg_t * ab_depend;
-+ abstract_pkg_t ** temp;
-
- count = pkg->pre_depends_count + pkg->depends_count;
- depends = pkg->depends;
-@@ -843,8 +857,7 @@
- if (0 && pkg->pre_depends_count)
- fprintf(stderr, " i=%d possibility_count=%x depends=%p\n", i, depends->possibility_count, depends);
- for (j = 0; j < depends->possibility_count; j++){
-- abstract_pkg_t * ab_depend = depends->possibilities[j]->pkg;
-- abstract_pkg_t ** temp;
-+ ab_depend = depends->possibilities[j]->pkg;
- if(!ab_depend->depended_upon_by)
- ab_depend->depended_upon_by = (abstract_pkg_t **)calloc(1, sizeof(abstract_pkg_t *));
-
diff --git a/packages/ipkg/ipkg-0.99.144/.mtn2git_empty b/packages/ipkg/ipkg-0.99.144/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.144/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.144/paths.patch b/packages/ipkg/ipkg-0.99.144/paths.patch
deleted file mode 100644
index f40131e252..0000000000
--- a/packages/ipkg/ipkg-0.99.144/paths.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Index: C/ipkg.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ C/ipkg.h 2005-02-25 15:28:24.000000000 -0600
-@@ -0,0 +1,59 @@
-+/* ipkg.h - the itsy package management system
-+
-+ Carl D. Worth
-+
-+ Copyright (C) 2001 University of Southern California
-+
-+ This program is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU General Public License as
-+ published by the Free Software Foundation; either version 2, or (at
-+ your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ General Public License for more details.
-+*/
-+
-+#ifndef IPKG_H
-+#define IPKG_H
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#if 0
-+#define IPKG_DEBUG_NO_TMP_CLEANUP
-+#endif
-+
-+#include "includes.h"
-+#include "ipkg_conf.h"
-+#include "ipkg_message.h"
-+
-+#define IPKG_PKG_EXTENSION ".ipk"
-+#define DPKG_PKG_EXTENSION ".deb"
-+
-+#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
-+#define IPKG_PKG_VERSION_SEP_CHAR '_'
-+
-+#define IPKG_STATE_DIR_PREFIX IPKGDIR
-+#define IPKG_LISTS_DIR_SUFFIX "lists"
-+#define IPKG_INFO_DIR_SUFFIX "info"
-+#define IPKG_STATUS_FILE_SUFFIX "status"
-+
-+#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
-+
-+#define IPKG_LIST_DESCRIPTION_LENGTH 128
-+
-+enum ipkg_error {
-+ IPKG_SUCCESS = 0,
-+ IPKG_PKG_DEPS_UNSATISFIED,
-+ IPKG_PKG_IS_ESSENTIAL,
-+ IPKG_PKG_HAS_DEPENDENTS,
-+ IPKG_PKG_HAS_NO_CANDIDATE
-+};
-+typedef enum ipkg_error ipkg_error_t;
-+
-+extern int ipkg_state_changed;
-+
-+#endif
-Index: C/configure.ac
-===================================================================
---- C.orig/configure.ac 2005-02-25 15:27:58.000000000 -0600
-+++ C/configure.ac 2005-02-25 15:28:00.000000000 -0600
-@@ -10,6 +10,14 @@
- test -f $top_builddir/configure && break
- done
-
-+AC_MSG_CHECKING([ipkg data location])
-+AC_ARG_WITH(ipkgdir,
-+ AS_HELP_STRING([--with-ipkgdir=ARG],
-+ [Where to look for plugins (default=${libdir}/ipkg)]),
-+ [ipkgdir=$withval],
-+ [ipkgdir='${libdir}/ipkg'])
-+AC_MSG_RESULT($ipkgdir)
-+AC_SUBST(ipkgdir)
-
- # Checks for programs
- AC_PROG_AWK
-@@ -50,4 +58,4 @@
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([memmove memset mkdir regcomp strchr strcspn strdup strerror strndup strrchr strstr strtol strtoul sysinfo utime])
-
--AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc ipkg.h)
-+AC_OUTPUT(Makefile etc/Makefile replace/Makefile familiar/Makefile familiar/control familiar/control-unstripped familiar/libipkg-control familiar/libipkg-dev-control libbb/Makefile libipkg.pc)
-Index: C/Makefile.am
-===================================================================
---- C.orig/Makefile.am 2005-02-25 15:27:58.000000000 -0600
-+++ C/Makefile.am 2005-02-25 15:28:00.000000000 -0600
-@@ -3,7 +3,8 @@
-
- HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
--ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\"
-+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ \
-+ -DLIBDIR=\"$(libdir)\" -DIPKGDIR=\"$(ipkgdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-
- bin_PROGRAMS = ipkg-cl
-
-Index: C/ipkg_conf.c
-===================================================================
---- C.orig/ipkg_conf.c 2005-03-12 21:08:36.000000000 +1030
-+++ C/ipkg_conf.c 2005-03-12 21:09:46.000000000 +1030
-@@ -103,7+103,7 @@
- nv_pair_list_t tmp_dest_nv_pair_list;
- char * lists_dir =NULL;
- glob_t globbuf;
-- char *etc_ipkg_conf_pattern = "/etc/ipkg/*.conf";
-+ char *etc_ipkg_conf_pattern = SYSCONFDIR"/ipkg/*.conf";
- char *pending_dir =NULL;
-
- memset(conf, 0, sizeof(ipkg_conf_t));
-Index: C/args.h
-===================================================================
---- C.orig/args.h 2005-03-12 21:49:31.000000000 +1030
-+++ C/args.h 2005-03-12 21:49:42.000000000 +1030
-@@ -43,7 +43,7 @@
- };
- typedef struct args args_t;
-
--#define ARGS_DEFAULT_CONF_FILE_DIR "/etc"
-+#define ARGS_DEFAULT_CONF_FILE_DIR SYSCONFDIR
- #define ARGS_DEFAULT_CONF_FILE_NAME "ipkg.conf"
- #define ARGS_DEFAULT_DEST NULL
- #define ARGS_DEFAULT_FORCE_DEFAULTS 0
-Index: C/ipkg.h.in
-===================================================================
---- C.orig/ipkg.h.in 2005-02-25 15:27:58.000000000 -0600
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,60 +0,1 @@
--/* ipkg.h - the itsy package management system
--
-- Carl D. Worth
--
-- Copyright (C) 2001 University of Southern California
--
-- This program is free software; you can redistribute it and/or
-- modify it under the terms of the GNU General Public License as
-- published by the Free Software Foundation; either version 2, or (at
-- your option) any later version.
--
-- This program is distributed in the hope that it will be useful, but
-- WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- General Public License for more details.
--*/
--
--#ifndef IPKG_H
--#define IPKG_H
--
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--#if 0
--#define IPKG_DEBUG_NO_TMP_CLEANUP
--#endif
--
--#include "includes.h"
--#include "ipkg_conf.h"
--#include "ipkg_message.h"
--
--#define IPKG_PKG_EXTENSION ".ipk"
--#define DPKG_PKG_EXTENSION ".deb"
--
--#define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
--#define IPKG_PKG_VERSION_SEP_CHAR '_'
--
--#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
--#define IPKG_LISTS_DIR_SUFFIX "lists"
--#define IPKG_INFO_DIR_SUFFIX "info"
--#define IPKG_STATUS_FILE_SUFFIX "status"
--
--#define IPKG_BACKUP_SUFFIX "-ipkg.backup"
--
--#define IPKG_LIST_DESCRIPTION_LENGTH 128
--
--enum ipkg_error {
-- IPKG_SUCCESS = 0,
-- IPKG_PKG_DEPS_UNSATISFIED,
-- IPKG_PKG_IS_ESSENTIAL,
-- IPKG_PKG_HAS_DEPENDENTS,
-- IPKG_PKG_HAS_NO_CANDIDATE
--};
--typedef enum ipkg_error ipkg_error_t;
--
--extern int ipkg_state_changed;
--
--#endif
diff --git a/packages/ipkg/ipkg-0.99.147/.mtn2git_empty b/packages/ipkg/ipkg-0.99.147/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.147/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.147/libdir.patch b/packages/ipkg/ipkg-0.99.147/libdir.patch
deleted file mode 100644
index 38f0b4d286..0000000000
--- a/packages/ipkg/ipkg-0.99.147/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
-+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
-@@ -36,7 +36,7 @@
- #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
- #define IPKG_PKG_VERSION_SEP_CHAR '_'
-
--#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
-+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
- #define IPKG_LISTS_DIR_SUFFIX "lists"
- #define IPKG_INFO_DIR_SUFFIX "info"
- #define IPKG_STATUS_FILE_SUFFIX "status"
diff --git a/packages/ipkg/ipkg-0.99.148/.mtn2git_empty b/packages/ipkg/ipkg-0.99.148/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/ipkg/ipkg-0.99.148/.mtn2git_empty
+++ /dev/null
diff --git a/packages/ipkg/ipkg-0.99.148/libdir.patch b/packages/ipkg/ipkg-0.99.148/libdir.patch
deleted file mode 100644
index 38f0b4d286..0000000000
--- a/packages/ipkg/ipkg-0.99.148/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- C/ipkg.h.in.old 2005-04-02 17:11:02.762413624 +0100
-+++ C/ipkg.h.in 2005-04-02 17:11:06.314873568 +0100
-@@ -36,7 +36,7 @@
- #define IPKG_LEGAL_PKG_NAME_CHARS "abcdefghijklmnopqrstuvwxyz0123456789.+-"
- #define IPKG_PKG_VERSION_SEP_CHAR '_'
-
--#define IPKG_STATE_DIR_PREFIX LIBDIR"/ipkg"
-+#define IPKG_STATE_DIR_PREFIX "/usr/lib/ipkg"
- #define IPKG_LISTS_DIR_SUFFIX "lists"
- #define IPKG_INFO_DIR_SUFFIX "info"
- #define IPKG_STATUS_FILE_SUFFIX "status"
diff --git a/packages/ipkg/ipkg-native_0.99.130.bb b/packages/ipkg/ipkg-native_0.99.130.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.130.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.135.bb b/packages/ipkg/ipkg-native_0.99.135.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.135.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.138.bb b/packages/ipkg/ipkg-native_0.99.138.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.138.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.140.bb b/packages/ipkg/ipkg-native_0.99.140.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.140.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.144.bb b/packages/ipkg/ipkg-native_0.99.144.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.144.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.146.bb b/packages/ipkg/ipkg-native_0.99.146.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.146.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.147.bb b/packages/ipkg/ipkg-native_0.99.147.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.147.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.148.bb b/packages/ipkg/ipkg-native_0.99.148.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.148.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.151.bb b/packages/ipkg/ipkg-native_0.99.151.bb
deleted file mode 100644
index d59eab3a61..0000000000
--- a/packages/ipkg/ipkg-native_0.99.151.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg_${PV}.bb
-include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.129.bb b/packages/ipkg/ipkg-native_0.99.153.bb
index d59eab3a61..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.129.bb
+++ b/packages/ipkg/ipkg-native_0.99.153.bb
diff --git a/packages/ipkg/ipkg_0.99.129.bb b/packages/ipkg/ipkg_0.99.129.bb
deleted file mode 100644
index 35d096739b..0000000000
--- a/packages/ipkg/ipkg_0.99.129.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include ipkg.inc
-PR = "r5"
-
-SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
- file://buffer-overflow.patch;patch=1 \
- file://uninclude-replace.patch;patch=1 \
- file://uclibc.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.130.bb b/packages/ipkg/ipkg_0.99.130.bb
deleted file mode 100644
index 8d646be408..0000000000
--- a/packages/ipkg/ipkg_0.99.130.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-include ipkg.inc
-PR = "r5"
-
-SRC_URI += "file://uninclude-replace.patch;patch=1 \
- file://uclibc.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
deleted file mode 100644
index 9a05a1ed05..0000000000
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include ipkg.inc
-PR = "r2"
-SRC_URI += "file://depends.patch;patch=1 \
- file://uninclude-replace.patch;patch=1 \
- file://remove-c99isms.patch;patch=1 \
- file://uclibc.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.140.bb b/packages/ipkg/ipkg_0.99.140.bb
deleted file mode 100644
index 88bf4a5ac1..0000000000
--- a/packages/ipkg/ipkg_0.99.140.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include ipkg.inc
-PR = "r2"
-
-SRC_URI += "file://remove-c99isms.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.144.bb b/packages/ipkg/ipkg_0.99.144.bb
deleted file mode 100644
index ff3da77a22..0000000000
--- a/packages/ipkg/ipkg_0.99.144.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-include ipkg.inc
-PR = "r2"
-SRC_URI += "file://paths.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.146.bb b/packages/ipkg/ipkg_0.99.146.bb
deleted file mode 100644
index 1898c6656e..0000000000
--- a/packages/ipkg/ipkg_0.99.146.bb
+++ /dev/null
@@ -1 +0,0 @@
-include ipkg.inc
diff --git a/packages/ipkg/ipkg_0.99.147.bb b/packages/ipkg/ipkg_0.99.147.bb
deleted file mode 100644
index 778fa86042..0000000000
--- a/packages/ipkg/ipkg_0.99.147.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg.inc
-SRC_URI += "file://libdir.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.148.bb b/packages/ipkg/ipkg_0.99.148.bb
deleted file mode 100644
index 778fa86042..0000000000
--- a/packages/ipkg/ipkg_0.99.148.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-include ipkg.inc
-SRC_URI += "file://libdir.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.151.bb b/packages/ipkg/ipkg_0.99.151.bb
deleted file mode 100644
index 1898c6656e..0000000000
--- a/packages/ipkg/ipkg_0.99.151.bb
+++ /dev/null
@@ -1 +0,0 @@
-include ipkg.inc
diff --git a/packages/ipkg/ipkg_0.99.138.bb b/packages/ipkg/ipkg_0.99.153.bb
index 1898c6656e..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.138.bb
+++ b/packages/ipkg/ipkg_0.99.153.bb
diff --git a/packages/libopieobex/libopieobex0.inc b/packages/libopieobex/libopieobex0.inc
new file mode 100644
index 0000000000..40475cf8c3
--- /dev/null
+++ b/packages/libopieobex/libopieobex0.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "IrDA obex support library"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "LGPL"
+DEPENDS = "opie-taskbar"
+RDEPENDS = "openobex-apps"
+APPNAME = "obex"
+
+S = "${WORKDIR}/obex"
+
+inherit opie
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+ oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
+}
+
+FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/packages/libopieobex/libopieobex0_1.2.0.bb b/packages/libopieobex/libopieobex0_1.2.0.bb
index 59f4004c05..a90177b6d5 100644
--- a/packages/libopieobex/libopieobex0_1.2.0.bb
+++ b/packages/libopieobex/libopieobex0_1.2.0.bb
@@ -1,24 +1,7 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
-APPNAME = "obex"
+include libopieobex0.inc
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
file://chdir-patch.patch;patch=1;pnum=0 "
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
- install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
- oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index c43faf8659..05983a8ee3 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,23 +1,7 @@
-DESCRIPTION = "IrDA obex support library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-DEPENDS = "opie-taskbar"
-RDEPENDS = "openobex-apps"
+include libopieobex0.inc
+
PV = "1.2.0+cvs-${CVSDATE}"
-APPNAME = "obex"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
${HANDHELDS_CVS};module=opie/pics"
-S = "${WORKDIR}/obex"
-
-inherit opie
-
-do_install() {
- install -d ${D}${palmtopdir}/pics/${APPNAME}/ ${D}${palmtopdir}/plugins/obex/
- install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
- oe_libinstall -so libopieobex ${D}${palmtopdir}/plugins/obex/
-}
-
-FILES_${PN} = "${palmtopdir}/plugins/obex/ ${palmtopdir}/pics/obex/"
diff --git a/packages/meta/task-python-everything_0.9.2.bb b/packages/meta/task-python-everything_0.9.2.bb
index 54123c6b4f..f77399c571 100644
--- a/packages/meta/task-python-everything_0.9.2.bb
+++ b/packages/meta/task-python-everything_0.9.2.bb
@@ -2,11 +2,11 @@ DESCRIPTION= "Everything Python"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml1"
+PR = "ml2"
DEPENDS = "\
- python-ao \
- python-bluez \
+ python-ao \
+ python-pybluez \
python-constraint \
python-crypto \
python-dialog \
diff --git a/packages/meta/task-python-sharprom_0.9.0.bb b/packages/meta/task-python-sharprom_0.9.0.bb
index b836ff0c1a..12009b4717 100644
--- a/packages/meta/task-python-sharprom_0.9.0.bb
+++ b/packages/meta/task-python-sharprom_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python for SharpROM"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml3"
+PR = "ml4"
NONWORKING = "\
python-codes \
@@ -15,8 +15,8 @@ NONWORKING = "\
python-vorbis"
DEPENDS = "\
- python-ao \
- python-bluez \
+ python-ao \
+ python-pybluez \
python-constraint \
python-dialog \
python-egenix-mx-base \
diff --git a/packages/mtd/mtd-utils_20050801.bb b/packages/mtd/mtd-utils_20050801.bb
index bfc78c19ea..20ef373566 100644
--- a/packages/mtd/mtd-utils_20050801.bb
+++ b/packages/mtd/mtd-utils_20050801.bb
@@ -4,8 +4,9 @@ DEPENDS = "zlib"
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
LICENSE = "GPLv2"
PR = "r0"
+CVSDATE = "${PV}"
-SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
file://more-verbosity.patch;patch=1"
S = "${WORKDIR}/mtd/"
diff --git a/packages/python/python-gnosis_1.1.1.bb b/packages/python/python-gnosis_1.1.1.bb
index 8053a4f40f..b9b297adef 100644
--- a/packages/python/python-gnosis_1.1.1.bb
+++ b/packages/python/python-gnosis_1.1.1.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPLv2"
SRCNAME = "Gnosis_Utils"
-SRC_URI = "http://gnosis.cx/download/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://gnosis.cx/download/Gnosis_Utils.More/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb
index 9daa0c3000..70e689c9d8 100644
--- a/packages/xserver-common/xserver-common_1.1.bb
+++ b/packages/xserver-common/xserver-common_1.1.bb
@@ -1,11 +1,11 @@
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
+PR = "r2"
# we are using a gpe-style Makefile
inherit gpe
-SRC_URI += "file://remove-run-calibrate-sh.patch;patch=1" \ No newline at end of file