packages/libgpelaunch/libgpelaunch_svn.bb

* added svn build for libgpelaunch
packages/libgpepimc/libgpepimc_svn.bb
* added svn build for libgpepimc
packages/libgpeplugin/libgpeplugin_svn.bb
* added svn build fot libgpeplugin
packages/libgtkinput/libgtkinput_svn.bb
* added svn build for libgtkinput
packages/libgtkstylus/libgtkstylus_svn.bb
* added svn build for libgtkstylus
packages/libschedule/libschedule_svn.bb
* added svn build for libschedule
packages/libtododb/libtododb_svn.bb
* added svn build for libtododb
packages/libxsettings/libxsettings_svn.bb
packages/libxsettings/files
packages/libxsettings/files/libxsettings-svn-makefile-fix.patch
packages/libxsettings/files/Makefile.translation
packages/libxsettings/files/Makefile.dpkg_ipkg
* added svn build for libxsettings (with patch and needed extra files)
packages/libgpevtype/libgpevtype_svn.bb
* added svn build for libgpevtype
packages/gpe-mini-browser/gpe-mini-browser_svn.bb
* bumped ${PV} from 0.19+... to 0.20+... as 0.20 has been released
conf/bitbake.conf
* added GPE_SVN_EXTRA entry to have a shorthand for all packages that are in 
  the extra part of the GPE svn repo

15 files changed, 456 insertions, 11 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f86dd4c7ef..55c0e51295 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -324,6 +324,7 @@ SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net"
 GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
 GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone"
 GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+GPE_EXTRA_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}"
 GPEPHONE_SVN = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
index 369ea5153d..f71237f4e4 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE = "-1"
 DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg"
 
-PV = "0.19+svn${SRCDATE}"
+PV = "0.20+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}"
diff --git a/packages/libgpelaunch/libgpelaunch_svn.bb b/packages/libgpelaunch/libgpelaunch_svn.bb
new file mode 100644
index 0000000000..2470e99c08
--- /dev/null
+++ b/packages/libgpelaunch/libgpelaunch_svn.bb
@@ -0,0 +1,21 @@
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+LICENSE = "LGPL"
+DESCRIPTION = "GPE program launcher library"
+SECTION = "libs"
+DEPENDS = "gtk+ startup-notification"
+PR = "r0"
+PV = "0.14+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+FILES_${PN}-dbg += "/usr/libexec/libgpelaunch/.debug"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/libgpepimc/libgpepimc_svn.bb b/packages/libgpepimc/libgpepimc_svn.bb
new file mode 100644
index 0000000000..4b6dfd91e3
--- /dev/null
+++ b/packages/libgpepimc/libgpepimc_svn.bb
@@ -0,0 +1,30 @@
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+LICENSE     = "LGPL"
+PR          = "r0"
+PV = "0.8+svn${SRCDATE}"
+DESCRIPTION = "Common code for GPE PIMs"
+SECTION     = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "libgpewidget gtk+ sqlite"
+PROVIDES    = "libgepepimc"
+RPROVIDES   = "libgepepimc"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+inherit pkgconfig autotools
+
+headers = "pim-categories.h pim-categories-ui.h"
+
+do_stage () {
+        oe_libinstall -so libgpepimc ${STAGING_LIBDIR}
+
+        mkdir -p ${STAGING_INCDIR}/gpe
+        for h in ${headers}; do
+                install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+        done
+}
+
diff --git a/packages/libgpeplugin/libgpeplugin_svn.bb b/packages/libgpeplugin/libgpeplugin_svn.bb
new file mode 100644
index 0000000000..398941c1c4
--- /dev/null
+++ b/packages/libgpeplugin/libgpeplugin_svn.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Plugin system for GPE applications"
+AUTHOR = "Luce DeCicco <ldecicco@gmail.com>"
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+
+DEPENDS = "gtk+ libgpewidget"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+#put examples in a seperate package
+PACKAGES += "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/* ${libexecdir}/*"
+FILES_${PN} = "${libdir}/*.so.*"
+
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
diff --git a/packages/libgpevtype/libgpevtype_svn.bb b/packages/libgpevtype/libgpevtype_svn.bb
index 235a1312db..baad6bd8e3 100644
--- a/packages/libgpevtype/libgpevtype_svn.bb
+++ b/packages/libgpevtype/libgpevtype_svn.bb
@@ -1,19 +1,19 @@
-LICENSE = 	"LGPL"
-DESCRIPTION = 	"Data interchange library for GPE"
-SECTION = 	"gpe/libs"
-PRIORITY = 	"optional"
-DEPENDS = 	"libmimedir"
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+LICENSE     = "LGPL"
+DESCRIPTION = "Data interchange library for GPE"
+SECTION     = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "libmimedir libeventdb"
+PR          = "r0"
+PV = "0.17+svn${SRCDATE}"
 
 DEFAULT_PREFERENCE = "-1"
 
-S = "${WORKDIR}/${PN}"
-PV = "0.17+svn${SRCDATE}"
-PR = "r0"
-
 inherit pkgconfig gpe autotools
 
-SRC_URI = "${GPE_SVN}"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
 
+S = "${WORKDIR}/${PN}"
 
 headers = "tag-db.h vcard.h vevent.h vtodo.h"
 
diff --git a/packages/libgtkinput/libgtkinput_svn.bb b/packages/libgtkinput/libgtkinput_svn.bb
new file mode 100644
index 0000000000..4394b00927
--- /dev/null
+++ b/packages/libgtkinput/libgtkinput_svn.bb
@@ -0,0 +1,21 @@
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+LICENSE = "LGPL"
+inherit gpe autotools
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.3+svn${SRCDATE}"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN} \
+           file://gtkinput.sh"
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += "${libdir}"
+
+
+do_install_append() {
+        install -d ${D}/${sysconfdir}/X11/Xsession.d
+        install -m 755 ${WORKDIR}/gtkinput.sh ${D}/${sysconfdir}/X11/Xsession.d/46gtkinput
+}
+
diff --git a/packages/libgtkstylus/libgtkstylus_svn.bb b/packages/libgtkstylus/libgtkstylus_svn.bb
new file mode 100644
index 0000000000..cd551521f7
--- /dev/null
+++ b/packages/libgtkstylus/libgtkstylus_svn.bb
@@ -0,0 +1,21 @@
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+DESCRIPTION = "GTK plugin for stylus based systems"
+SECTION = "libs"
+DEPENDS = "gtk+"
+LICENSE = "LGPL"
+PR = "r5"
+PV = "0.3+svn${SRCDATE}"
+
+inherit autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${S}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
+}
+
+FILES_${PN} = "/etc ${libdir}/gtk-2.0/*/modules/*.so*"
+
diff --git a/packages/libschedule/libschedule_svn.bb b/packages/libschedule/libschedule_svn.bb
new file mode 100644
index 0000000000..7a2bae0ec7
--- /dev/null
+++ b/packages/libschedule/libschedule_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "RTC alarm handling library for GPE"
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 sqlite libgpewidget"
+PR = "r0"
+PV = "0.16+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/libtododb/libtododb_svn.bb b/packages/libtododb/libtododb_svn.bb
new file mode 100644
index 0000000000..cb05a1ae85
--- /dev/null
+++ b/packages/libtododb/libtododb_svn.bb
@@ -0,0 +1,32 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Database access for GPE to-do list"
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+PR = "r0"
+PV = "0.10+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit pkgconfig gpe autotools
+ 
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+headers = "todo-db.h"
+
+do_stage () {
+	oe_libinstall -so libtododb ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gpe
+	for h in ${headers}; do
+		install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+	done
+}
+
+do_install () {
+	gpe_do_install
+#	oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}
diff --git a/packages/libxsettings/files/.mtn2git_empty b/packages/libxsettings/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libxsettings/files/.mtn2git_empty
diff --git a/packages/libxsettings/files/Makefile.dpkg_ipkg b/packages/libxsettings/files/Makefile.dpkg_ipkg
new file mode 100644
index 0000000000..76c532154f
--- /dev/null
+++ b/packages/libxsettings/files/Makefile.dpkg_ipkg
@@ -0,0 +1,114 @@
+## Please read the README in this directory to see how to use this
+## Makefile snippet
+
+# Let's use whatever clean target the specific app provides
+
+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
+
+# URL to source tarball
+SOURCE = http://gpe.linuxtogo.org/download/source/$(PACKAGE)-$(VERSION).tar.gz
+
+# can change this to e.g. /var/tmp/deb
+DEB_PATH = ../deb
+
+ifeq ($(CVSBUILD),yes)
+LIBGPEWIDGET_PC = libgpewidget-uninstalled
+PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
+else
+LIBGPEWIDGET_PC = libgpewidget
+endif
+
+ifeq ($(IN_LIBGPEWIDGET),)
+GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC))
+GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC))
+endif
+
+GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0)
+GTKLIBS = $(shell pkg-config --libs gtk+-2.0)
+
+STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+STANDARD_CFLAGS = -MD -Wall
+
+ifeq ($(DEBUG),yes)
+CFLAGS += -O2 -g
+LDFLAGS = -g
+else
+CFLAGS += -Os -fomit-frame-pointer
+endif
+
+dist: check-source clean dist-prep
+	rm -rf ../$(PACKAGE)-$(VERSION)
+	mkdir ../$(PACKAGE)-$(VERSION)
+	( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
+	( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
+	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
+	rm -rf ../$(PACKAGE)-$(VERSION)
+	$(MAKE) printinfo
+
+dist-upload: dist
+	scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@linuxtogo.org:/media/data/projects/gpe/source/
+
+dist-prep:
+ipkg-prep:
+install-mo:
+# empty, can be filled in Makefile.translation
+
+install: install-program install-mo
+
+clean-dist:
+	rm -rf familiar/dist familiar/dist.list
+
+clean: clean-dist
+
+check-source:
+	@if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file.  Aborting.\n"; exit 1; fi
+
+ipkg: check-source ipkg-prep clean
+	rm -rf familiar/dist
+	mkdir -p familiar/dist/CONTROL
+	sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
+	if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
+	if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
+	if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
+	if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
+	if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
+	$(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program
+	rm -rf familiar/dist.list
+	ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list
+	if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi
+	md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch
+	rm -rf familiar/dist familiar/dist.list
+	$(MAKE) printinfo
+
+dpkg: dist
+	mkdir -p $(DEB_PATH)
+	( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
+	mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
+	for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
+
+CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
+printinfo:
+	@printf '-------------------------------------------------------------------------------\n'
+	@printf "If this becomes a package release, please add a CVS tag.\n"
+	@printf "You can use 'make tag' for that, it will execute\n"
+	@printf "   cvs tag %s\n" $(CVSTAG)
+	@printf "Please upload a tarball (created with 'make dist') to\n"
+	@printf "   ftp://ftp.handhelds.org/pub/projects/gpe/\n"
+	@printf "   (handhelds.org:~ftp/pub/projects/gpe/source)\n"
+	@printf "You can use 'make dist-upload' to do that.\n"
+	@printf "You are currently known as USER %s.\n" $(USER)
+	@printf '-------------------------------------------------------------------------------\n'
+
+tag: check-source
+	cvs tag $(CVSTAG)
+
+retag: check-source
+	cvs tag -F $(CVSTAG)
+
+source: tag dist-upload
+
+%.pc: %.pc.in
+	sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@
+
+.c.o:;
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@
diff --git a/packages/libxsettings/files/Makefile.translation b/packages/libxsettings/files/Makefile.translation
new file mode 100644
index 0000000000..1ca7d648fd
--- /dev/null
+++ b/packages/libxsettings/files/Makefile.translation
@@ -0,0 +1,107 @@
+.SUFFIXES: .mo .po .pot .po8
+
+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
+
+# use ipkg-build or ipkg-deb-build
+IPKG_BUILD := ipkg-build
+
+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
+
+ifeq ($(DIR_PO),)
+DIR_PO := po
+endif
+
+ifeq ($(BINPACKAGE),)
+BINPACKAGE := $(PACKAGE)
+endif
+
+mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
+po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
+
+ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
+desktop-files += $(PACKAGE).desktop
+endif
+
+ifneq ($(EXTRA_DESKTOPS),)
+desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
+endif
+
+all-mo: $(mo-files)
+
+all-desktop: $(desktop-files)
+
+install-mo: all-mo
+	if [ "$(ENABLE_NLS)" != "no" ]; then \
+		if [ "x$(LINGUAS)" != "x" ]; then \
+			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
+		fi; \
+	fi;
+
+.po8.mo:;
+	if [ "$(ENABLE_NLS)" != "no" ]; then \
+		msgfmt -o $@ $<; \
+	fi;
+
+.po.po8:;
+	CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
+
+update-po: $(po-files) extract-po
+
+dist-prep: update-po freshen-po
+# empty
+
+ifeq ($(CVSBUILD),yes)
+ipkg-prep: freshen-po
+# empty
+endif
+
+extract-po:
+	mkdir -p $(DIR_PO)
+	( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi )
+	if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi
+
+clean: clean-po clean-dist-translation
+
+clean-po:
+	rm -rf $(DIR_PO)/*.mo
+	for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
+
+%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
+	intltool-merge -u -d $(DIR_PO) $< $@
+
+freshen-po:
+	rm -rf tmp-po
+	mkdir tmp-po
+	cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
+	for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
+	rm -rf tmp-po
+
+# ------------------------------------------------------------------------
+
+MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
+
+ifndef BUILD
+BUILD = ../build
+endif
+
+transdist := familiar/dist-translation
+templates := $(BUILD)/familiar
+ipkglist  := translation-ipkgs.txt
+
+clean-dist-translation:
+	rm -rf $(transdist) $(ipkglist)
+
+real-translation-package: all-mo
+	rm -rf $(transdist) $(ipkglist)
+	for LINGUA in $(LINGUAS); do \
+		i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
+		mkdir -p $(transdist)/$$i/CONTROL; \
+		mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
+		install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \
+		sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \
+		install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \
+		$(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
+	done
+
+translation-ipkg:
+	make PREFIX=/usr real-translation-package
diff --git a/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch b/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch
new file mode 100644
index 0000000000..52d15a6e14
--- /dev/null
+++ b/packages/libxsettings/files/libxsettings-svn-makefile-fix.patch
@@ -0,0 +1,20 @@
+--- libxsettings/Makefile.orig	2007-02-10 00:45:33.452674544 +0200
++++ libxsettings/Makefile	2007-02-10 00:52:09.003215686 +0200
+@@ -1,7 +1,7 @@
+ PREFIX = /usr/local
+ PACKAGE = libxsettings
+ DEBUG = no
+-CVSBUILD = yes
++CVSBUILD = no
+ VERSION = 0.11
+ 
+ .SUFFIXES: .os
+@@ -20,7 +20,7 @@
+ ifeq ($(CVSBUILD),yes)
+ BUILD = ../build
+ else
+-BUILD = build
++BUILD = ..
+ endif
+ 
+ .c.os:;
diff --git a/packages/libxsettings/libxsettings_svn.bb b/packages/libxsettings/libxsettings_svn.bb
new file mode 100644
index 0000000000..0b5c45b947
--- /dev/null
+++ b/packages/libxsettings/libxsettings_svn.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Common code for XSETTINGS"
+MAINTAINER = "Philippe De Swert <philippedeswert@scarlet.be>"
+SECTION = "gpe/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11"
+PR          = "r0"
+PV = "0.11+svn${SRCDATE}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpe
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN} \
+           file://libxsettings-svn-makefile-fix.patch;patch=1 \
+	   file://Makefile.dpkg_ipkg \
+	   file://Makefile.translation"
+
+S = "${WORKDIR}/${PN}"
+
+headers = "xsettings-common.h"
+
+do_stage () {
+        oe_libinstall -so libXsettings ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gpe
+	for h in ${headers}; do
+		install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+	done
+}
+
+do_install () {
+	gpe_do_install
+	oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}