diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-08-25 10:31:22 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-08-25 10:31:22 +0000 |
| commit | 4998c9127760da2dd58e9a56a5f724ba7e654cdf (patch) | |
| tree | da3a3a77f2360fd6a38bcce641f6ad980d78d7be /packages | |
| parent | c03d64972247a0433b2052b217e376dba394ec45 (diff) | |
| parent | 219969bfd684be1d202d581830107b98dd1c9165 (diff) | |
merge of bccc39ddc3a30dc4cb16ae8fb2bd3257a1ea2096
and e0b052b513b17e533813c5e89fcf251d1d8e6588
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/libgnomecups_0.2.2.bb | 2 | ||||
| -rw-r--r-- | packages/gpe-edit/gpe-edit_0.32.bb | 4 | ||||
| -rw-r--r-- | packages/linux/handhelds-pxa-2.6_cvs.bb | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb index 86214904c8..53251ba84b 100644 --- a/packages/gnome/libgnomecups_0.2.2.bb +++ b/packages/gnome/libgnomecups_0.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION="Gnome Cups Manager" LICENSE="GPLv2" PR="r0" -DEPENDS="glib-2.0 gtk+ pango cups intltool" +DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" inherit gnome pkgconfig diff --git a/packages/gpe-edit/gpe-edit_0.32.bb b/packages/gpe-edit/gpe-edit_0.32.bb index af59b81e43..e504ec2271 100644 --- a/packages/gpe-edit/gpe-edit_0.32.bb +++ b/packages/gpe-edit/gpe-edit_0.32.bb @@ -1,6 +1,8 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" -SECTION = "gpe"DESCRIPTION = "Editor for the GPE Palmtop Environment" +SECTION = "gpe" +DESCRIPTION = "Editor for the GPE Palmtop Environment" LICENSE = "GPL" +PR = "r1" DEPENDS = "gtk+ libgpewidget" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 7dfcb4d237..75f4425638 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -27,8 +27,8 @@ ALLOW_EMPTY_htcuniversal = 1 K_MAJOR = "2" K_MINOR = "6" -K_MICRO = "16" -HHV = "5" +K_MICRO = "17" +HHV = "0" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" |