From 6d00ce849bebbc4e0aa6f1972ef9190ddcd5a0c9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 8 Mar 2006 11:29:19 +0000 Subject: ep93xx-kernel: fix some PV related bugs --- packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb index c3d775a063..0e8de7e9a2 100644 --- a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb +++ b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb @@ -3,13 +3,13 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r11" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.16-rc5.bz2;patch=1 \ http://www.wantstofly.org/~buytenh/ep93xx/derevo14.diff;patch=1 \ file://defconfig \ " -S = "${WORKDIR}/linux-${PV}" +S = "${WORKDIR}/linux-2.6.15" inherit kernel -- cgit v1.2.3 From 413168abc627208e4fe8ceefefd0211c90cab05f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 8 Mar 2006 13:01:50 +0000 Subject: libx11, diet-x11: move errordb-keysymdb-path-fix.patch so diet-x11 can find it (closes #727) --- packages/xlibs/files/.mtn2git_empty | 0 .../xlibs/files/errordb-keysymdb-path-fix.patch | 22 ++++++++++++++++++++++ .../xlibs/libx11/errordb-keysymdb-path-fix.patch | 22 ---------------------- 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 packages/xlibs/files/.mtn2git_empty create mode 100644 packages/xlibs/files/errordb-keysymdb-path-fix.patch delete mode 100644 packages/xlibs/libx11/errordb-keysymdb-path-fix.patch (limited to 'packages') diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/xlibs/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xlibs/files/errordb-keysymdb-path-fix.patch b/packages/xlibs/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/packages/xlibs/files/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065e..0000000000 --- a/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 -+++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 -@@ -56,7 +56,7 @@ - #include - - #ifndef ERRORDB --#define ERRORDB "/usr/lib/X11/XErrorDB" -+#define ERRORDB "/usr/share/X11/XErrorDB" - #endif - - /* ---- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 -+++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 -@@ -36,7 +36,7 @@ - #include "Key.h" - - #ifndef KEYSYMDB --#define KEYSYMDB "/usr/lib/X11/XKeysymDB" -+#define KEYSYMDB "/usr/share/X11/XKeysymDB" - #endif - - static Bool initialized; -- cgit v1.2.3 From 57ffb57b625692158a09b0d0e1adca2982d23416 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 8 Mar 2006 13:18:45 +0000 Subject: gconf-dbus: bump PV up to 2.10 to provide an upgrade path --- packages/gnome/gconf-dbus_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index d6b79494be..9fb02f8211 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "0.0+svn${SRCDATE}" +PV = "2.10.0+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ -- cgit v1.2.3 From 2f81f768373c2ffd26c88ea0f77b5582de975572 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 8 Mar 2006 13:44:29 +0000 Subject: file: upgraded to 4.16 (4.13 is not fetchable) --- packages/file/file-native_4.13.bb | 5 ----- packages/file/file-native_4.16.bb | 5 +++++ packages/file/file_4.13.bb | 19 ------------------- packages/file/file_4.16.bb | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 packages/file/file-native_4.13.bb create mode 100644 packages/file/file-native_4.16.bb delete mode 100644 packages/file/file_4.13.bb create mode 100644 packages/file/file_4.16.bb (limited to 'packages') diff --git a/packages/file/file-native_4.13.bb b/packages/file/file-native_4.13.bb deleted file mode 100644 index f92ff15f78..0000000000 --- a/packages/file/file-native_4.13.bb +++ /dev/null @@ -1,5 +0,0 @@ -include file_${PV}.bb -inherit native - -# avoid dependency loop -DEPENDS = "" diff --git a/packages/file/file-native_4.16.bb b/packages/file/file-native_4.16.bb new file mode 100644 index 0000000000..f92ff15f78 --- /dev/null +++ b/packages/file/file-native_4.16.bb @@ -0,0 +1,5 @@ +include file_${PV}.bb +inherit native + +# avoid dependency loop +DEPENDS = "" diff --git a/packages/file/file_4.13.bb b/packages/file/file_4.13.bb deleted file mode 100644 index ac5201b739..0000000000 --- a/packages/file/file_4.13.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -SECTION = "console/utils" -LICENSE = "BSD-ADV" -DEPENDS = "file-native" -PR = "r2" - -SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" -S = "${WORKDIR}/file-${PV}" - -inherit autotools - -do_configure_prepend() { - sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am -} - -do_stage() { - autotools_stage_all -} diff --git a/packages/file/file_4.16.bb b/packages/file/file_4.16.bb new file mode 100644 index 0000000000..3e579c5ef4 --- /dev/null +++ b/packages/file/file_4.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "File attempts to classify files depending \ +on their contents and prints a description if a match is found." +SECTION = "console/utils" +LICENSE = "BSD-ADV" +DEPENDS = "file-native" + +SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" +S = "${WORKDIR}/file-${PV}" + +inherit autotools + +do_configure_prepend() { + sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am +} + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3