merge of '901930fb1bf09993b1a144bb4ae2c11a1ab98e91'

     and 'ee70175ed0a22d4d4bf77de0cc63ee155b413834'

52 files changed, 1060 insertions, 300 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f73fc47571..b11c0f9825 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2,9 +2,9 @@
 md5=402bdb26356791bd5d277099adacc006
 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7
 
-[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz]
-md5=28d0e78d736748e67f25ad99456f10c3
-sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772
+[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz]
+md5=bc6f32759db02cf32a83640d74fb9993
+sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d
 
 [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index becad95786..6dd4f0d781 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -21,6 +21,12 @@ DISTRO_FEATURES_n2100 += "raid"
 DISTRO_FEATURES_storcenter += "raid"
 DISTRO_FEATURES_lsppchd += "raid"
 DISTRO_FEATURES_lsppchg += "raid"
+DISTRO_FEATURES_lsarm += "raid"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+# This isn't actually in OE yet
+#DISTRO_EXTRA_RDEPENDS = "openlink-machine"
 
 ENABLE_BINARY_LOCALE_GENERATION = "0"
 HOTPLUG = "udev"
@@ -42,7 +48,7 @@ require conf/distro/include/sane-srcdates.inc
 PREFERRED_VERSION_openlink = "svn"
 PREFERRED_VERSION_dtc = "20070216"
 PREFERRED_VERSION_dtc-native = "20070216"
-
+PREFERRED_VERSION_udev = "097"
 
 # Various defines for QNAP Turbostation
 #FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
index be6813369e..59a481a104 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc
@@ -219,6 +219,7 @@ PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1"
 PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1"
 PREFERRED_VERSION_libsm ?= "1.0.2"
 PREFERRED_VERSION_libx11 ?= "1.1.1"
+PREFERRED_VERSION_libx11-native ?= "1.1.1"
 PREFERRED_VERSION_libxau ?= "1.0.3"
 PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2"
 PREFERRED_VERSION_libxcomposite ?= "0.3.1"
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
index ad94a0f029..161f3ad8c1 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
 HOTPLUG = "udev"
 udevdir = "/dev"
 
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"
 
 #tune for the MPC5200B cpu
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
new file mode 100644
index 0000000000..9698fc9a70
--- /dev/null
+++ b/conf/machine/lsarm.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: ARM based Buffalo Linkstation
+#@DESCRIPTION: Machine configuration for various different ARM based linkstations
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+INHERIT += "lsarm-image"
+
+MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+
+TARGET_FPU = "soft"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+USE_DEVFS = "0"
+
+require conf/machine/include/tune-arm926ejs.conf
+
+IMAGE_FSTYPES = "tar.gz"
+
+# serial console port on devboard rev. B3
+SERIAL_CONSOLE = "115200 ttyS0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationarm"
+
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index bf59929b02..ac22703de9 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
\ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchd-image"
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 6040010176..9f03febba6 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
\ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchg-image"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 2acfe812b0..11ec87d205 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -23,5 +23,6 @@ EXTRA_IMAGECMD = "--little-endian"
 # Creating an image that works with the webinterface required encrypting it
 # So we'll need openssl
 EXTRA_IMAGEDEPENDS = "openssl-native"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 2c1a9d70b5..0911dd39af 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -8,6 +8,8 @@ INHERIT += "turbostation-image"
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
+MACHINE_EXTRA_RDEPENDS = "u-boot"
+PREFERRED_VERSION_u-boot = "1.2.0"
 
 MODUTILS=26
 MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
@@ -20,8 +22,8 @@ MACHINE_TASK_PROVIDER = "task-base"
 # We want udev support in the image
 udevdir = "/dev"
 
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"
 IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
 require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/tinder.conf b/conf/tinder.conf
index 99e263c96c..614ed89400 100644
--- a/conf/tinder.conf
+++ b/conf/tinder.conf
@@ -12,7 +12,7 @@ INHERIT          += "tinderclient"
 
 # HTTP posting
 #TINDER_HOST       = "ewi546.ewi.utwente.nl"
-#TINDER_URL        = "/OE_qa/cgi-bin/process_builds.cgi"
+#TINDER_URL        = "/tinderbox"
 
 # Which branch do we build
 #TINDER_BRANCH     = "org.openembedded.dev"
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 2e5dcbd086..5effeb8de6 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r1"
+PR = "r2"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -27,9 +27,14 @@ EXTRA_OECONF = "--with-gfxdrivers=none \
 		"
 
 do_stage() {
+        autotools_stage_all
+}
+
+do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
 
+
 FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
 			      ${libdir}/directfb-${RV}/*/.debug/*.so \
 			  "
diff --git a/packages/dosbox/dosbox_0.70.bb b/packages/dosbox/dosbox_0.70.bb
new file mode 100644
index 0000000000..9d68e27515
--- /dev/null
+++ b/packages/dosbox/dosbox_0.70.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Dos Emulator based on SDL"
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \
+	file://nocdrom.patch;patch=1"
+CXXFLAGS_append = " -DC_SDL_NOCDROM"
+
+inherit autotools
+
diff --git a/packages/libmrss/files/.mtn2git_empty b/packages/freetype/freetype-2.3.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libmrss/files/.mtn2git_empty
+++ b/packages/freetype/freetype-2.3.3/.mtn2git_empty
diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch
new file mode 100644
index 0000000000..ae504dcb0b
--- /dev/null
+++ b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch
@@ -0,0 +1,26 @@
+Index: freetype-2.3.1/builds/unix/configure.raw
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.raw
++++ freetype-2.3.1/builds/unix/configure.raw
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+Index: freetype-2.3.1/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.ac
++++ freetype-2.3.1/builds/unix/configure.ac
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/packages/freetype/freetype-native_2.1.10.bb b/packages/freetype/freetype-native_2.1.10.bb
index b5e8b307cd..6f99f7ee84 100644
--- a/packages/freetype/freetype-native_2.1.10.bb
+++ b/packages/freetype/freetype-native_2.1.10.bb
@@ -1,5 +1,5 @@
 require freetype_${PV}.bb
-inherit native
+inherit pkgconfig native
 DEPENDS = ""
 FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files"
 
@@ -11,8 +11,7 @@ do_configure() {
 }
 
 do_stage() {
-	autotools_stage_includes
-	oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+	autotools_stage_all
 }
 
 do_install() {
diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb
new file mode 100644
index 0000000000..79633a3d7f
--- /dev/null
+++ b/packages/freetype/freetype_2.3.3.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+           file://fix-x86_64-build.patch;patch=1"
+#           file://no-hardcode.patch;patch=1"
+#	   file://configure.patch;patch=1 \
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+DEFAULT_PREFERENCE = "-1"
+
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+	cd builds/unix
+	gnu-configize
+	aclocal -I .
+	autoconf
+	cd ${S}
+	oe_runconf
+}
+
+do_compile_prepend() {
+	${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+do_stage() {
+     export LIBTOOL='${LIBTOOL}'
+	 autotools_stage_includes
+	 oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb
index f982c4517f..f1a932f788 100644
--- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
+++ b/packages/gpe-buttonbox/gpe-buttonbox_svn.bb
@@ -1,17 +1,15 @@
-DEFAULT_PREFERENCE = "-1"
-LICENSE = "GPL"
 DESCRIPTION = "Buttonbox for gpe"
-
-SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox"
-
+LICENSE = "GPL"
 DEPENDS = "libgpewidget libgpelaunch"
-
-S = "${WORKDIR}/${PN}"
-#Remove the dash below when 0.5 changes in PV
-PV = "0.5+cvs-${SRCDATE}"
+PV = "0.5+svn-${SRCDATE}"
 PR = "r0"
 
 inherit autotools
 
-FILES_${PN} +=	"${datadir}/gpe"
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/${PN}"
 
+FILES_${PN} += "${datadir}/gpe"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty b/packages/gpe-clock/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qte-2.3.10/openmn/.mtn2git_empty
+++ b/packages/gpe-clock/files/.mtn2git_empty
diff --git a/packages/gpe-clock/files/svn-build.patch b/packages/gpe-clock/files/svn-build.patch
new file mode 100644
index 0000000000..69c6d6d07f
--- /dev/null
+++ b/packages/gpe-clock/files/svn-build.patch
@@ -0,0 +1,240 @@
+--- gpe-clock/Makefile.orig     2007-04-07 13:50:17.507459397 +0300
++++ gpe-clock/Makefile  2007-04-07 13:50:25.711926944 +0300
+@@ -2,7 +2,7 @@
+ PREFIX = /usr/local
+ DEBUG = no
+ GTK2 = yes
+-CVSBUILD = yes
++CVSBUILD = no
+ VERSION = 0.25
+
+ LINGUAS = nl pt cs fr de ro ru sr sk sv es
+diff -Naur gpe-clock.orig/build/Makefile.dpkg_ipkg gpe-clock/build/Makefile.dpkg_ipkg
+--- gpe-clock.orig/build/Makefile.dpkg_ipkg	1970-01-01 02:00:00.000000000 +0200
++++ gpe-clock/build/Makefile.dpkg_ipkg	2007-02-10 17:21:40.154584782 +0200
+@@ -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 -Naur gpe-clock.orig/build/Makefile.translation gpe-clock/build/Makefile.translation
+--- gpe-clock.orig/build/Makefile.translation	1970-01-01 02:00:00.000000000 +0200
++++ gpe-clock/build/Makefile.translation	2007-02-10 17:21:46.170927636 +0200
+@@ -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),)
+