gpe-login: add CONFFILES so user settings don't get blown away (e.g. autologin) on upgrades and remove old versions

13 files changed, 29 insertions, 152 deletions

diff --git a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty b/packages/gpe-login/gpe-login-0.86/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
deleted file mode 100644
index 5e62a1107e..0000000000
--- a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-login-0.86/gpe-login.keylaunchrc.orig	2006-05-28 20:38:39.846547024 +0200
-+++ gpe-login-0.86/gpe-login.keylaunchrc	2006-05-28 20:38:56.800969560 +0200
-@@ -1,3 +1,8 @@
- key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=???XF86PowerDown:-:/usr/bin/apm --suspend
- key=???Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty b/packages/gpe-login/gpe-login-0.87/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty b/packages/gpe-login/gpe-login-0.88/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb
deleted file mode 100644
index d75af4a3a0..0000000000
--- a/packages/gpe-login/gpe-login_0.87.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS    = "xkbd"
-RPROVIDES_${PN}   = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb
deleted file mode 100644
index a1d4c0e7fa..0000000000
--- a/packages/gpe-login/gpe-login_0.88.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-inherit gpe
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://use-xtscal.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
deleted file mode 100644
index c22d259a9f..0000000000
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r6"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://lock-on-supend.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.91.bb b/packages/gpe-login/gpe-login_0.91.bb
deleted file mode 100644
index 16d9e471d7..0000000000
--- a/packages/gpe-login/gpe-login_0.91.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.92.bb b/packages/gpe-login/gpe-login_0.92.bb
deleted file mode 100644
index ec168bfc93..0000000000
--- a/packages/gpe-login/gpe-login_0.92.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.93.bb b/packages/gpe-login/gpe-login_0.93.bb
index ec168bfc93..4ea1cc235e 100644
--- a/packages/gpe-login/gpe-login_0.93.bb
+++ b/packages/gpe-login/gpe-login_0.93.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -22,3 +22,16 @@ SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 
+
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
diff --git a/packages/gpe-login/gpe-login_svn.bb b/packages/gpe-login/gpe-login_svn.bb
index 9af539bad3..f02e095698 100644
--- a/packages/gpe-login/gpe-login_svn.bb
+++ b/packages/gpe-login/gpe-login_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd"
 RPROVIDES_${PN} = "gpe-session-starter"
-PV = "0.90+svn${SRCDATE}"
+PV = "0.93+svn${SRCDATE}"
 
 inherit autotools
 
@@ -16,4 +16,18 @@ SRC_URI = "${GPE_SVN} \
 
 S = "${WORKDIR}/${PN}"
 
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
+
+
 DEFAULT_PREFERENCE = "-1"