merge of a55899e7fb1da0f7185db8d30edf992411f9dffc

     and b7cf70dfa80e94e91bcec0231eb13379bf62e4c8

9 files changed, 23 insertions, 70 deletions

diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty b/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch b/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
deleted file mode 100644
index bfa5567590..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u gpe-timesheet-0.13.orig/Makefile gpe-timesheet-0.13/Makefile
---- gpe-timesheet-0.13.orig/Makefile	2003-10-10 05:56:43.000000000 +1000
-+++ gpe-timesheet-0.13/Makefile	2004-04-29 15:09:46.000000000 +1000
-@@ -21,7 +21,7 @@
- 
- CFLAGS += -MD -Wall $(GTKCFLAGS)
- 
--CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
- 
- MEMBERS = main sql
- 
-@@ -40,6 +40,9 @@
- $(PACKAGE): $(OBJS)
- 	$(CC) -o $@ $^ $(LGPEWIDGET) $(GTKLDFLAGS) -lsqlite $(LDFLAGS)
- 
-+.c.o:;
-+	$(CC) $(PACKAGE_CPPFLAGS)  $(CFLAGS) $(GTKCFLAGS) -c $< -o $@
-+
- install-program: all $(PACKAGE).desktop
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.13.bb b/packages/gpe-timesheet/gpe-timesheet_0.13.bb
deleted file mode 100644
index b97ed97ffc..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.13.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DEPENDS = "libgpewidget glib-2.0 gtk+"
-SECTION = "gpe"
-
-SRC_URI += "file://gpe-timesheet-makefile.patch;patch=0"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.14.bb b/packages/gpe-timesheet/gpe-timesheet_0.14.bb
deleted file mode 100644
index b4f580736c..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.16.bb b/packages/gpe-timesheet/gpe-timesheet_0.16.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.16.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.15.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
index 0cd8b539f0..c23c963446 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.15.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
@@ -1,9 +1,10 @@
 LICENSE = "GPL"
-inherit gpe
+inherit autotools gpe
 
 DESCRIPTION = "GPE time tracker"
+GPE_TARBALL_SUFFIX = "bz2"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libgpewidget gtk+ sqlite"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
+ 
\ No newline at end of file
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
new file mode 100644
index 0000000000..de81537f99
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -0,0 +1,19 @@
+MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+		   file://calibrate_zaurusd.patch;patch=1 \
+		   file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe