From e4d953b836d587233d546c5156a258d8c86682cc Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 10 Jan 2007 13:02:48 +0000
Subject: gpm: provide libgpm.so.1 link, use update-rc.d class - close #543

---
 packages/gpm/gpm_1.20.1.bb | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb
index 5623ebbf16..c017cafc9a 100644
--- a/packages/gpm/gpm_1.20.1.bb
+++ b/packages/gpm/gpm_1.20.1.bb
@@ -1,21 +1,25 @@
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "ncurses"
 DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
 for the console and xterm, with sample clients included \
 (emacs, etc)."
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
 
-PR="r1"
-PARALLEL_MAKE=""
+PR = "r2"
+PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://no-docs.patch;patch=1 \
 	   file://init"
 
-inherit autotools
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gpm"
+INITSCRIPT_PARAMS = "defaults"
 
 export LIBS = "-lm"
+
 do_configure_prepend () {
 	cp aclocal.m4 acinclude.m4
 }
@@ -29,18 +33,5 @@ do_install () {
 	oe_runmake 'ROOT=${D}' install
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm remove
+	cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1
 }
-- 
cgit v1.2.3


From 5bbcd1c6647233e8e3ef065a9011320d1b4ceb51 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 10 Jan 2007 13:06:33 +0000
Subject: gconf-osso: DEF_PREF = -1 - should close #1780

---
 packages/maemo/gconf-osso_2.6.4-3.1osso13.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 6b7eddb03b..72ddfb5613 100644
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -7,6 +7,8 @@ RPROVIDES = "gconf"
 
 PR = "r3"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \
            file://gconf-update.patch;patch=1;pnum=0 \
            file://free-entry-fix.diff;patch=1 \
-- 
cgit v1.2.3