From 0cb1c3163d43f6058a7b4dc702344ec8b76cbc1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Sep 2011 17:39:24 -0500 Subject: [PATCH 1/5] Fix up kdm postinst file based on the "fixed" version that ships with KDE4 Time will tell if it is actually fixed or not... --- debian/lenny/kdebase/debian/kdm-trinity.postinst | 7 +------ debian/squeeze/kdebase/debian/kdm-trinity.postinst | 7 +------ ubuntu/maverick/kdebase/debian/kdm-trinity.postinst | 7 +------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/debian/lenny/kdebase/debian/kdm-trinity.postinst b/debian/lenny/kdebase/debian/kdm-trinity.postinst index c787b37a3..7b4ac4ee3 100644 --- a/debian/lenny/kdebase/debian/kdm-trinity.postinst +++ b/debian/lenny/kdebase/debian/kdm-trinity.postinst @@ -8,13 +8,8 @@ set -e # debconf is not a registry, so we only fiddle with the default file if it # does not exist DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then - cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" -fi - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER=kdm-trinity + DEFAULT_DISPLAY_MANAGER= if db_get shared/default-x-display-manager; then DEFAULT_DISPLAY_MANAGER="$RET" fi diff --git a/debian/squeeze/kdebase/debian/kdm-trinity.postinst b/debian/squeeze/kdebase/debian/kdm-trinity.postinst index c787b37a3..7b4ac4ee3 100644 --- a/debian/squeeze/kdebase/debian/kdm-trinity.postinst +++ b/debian/squeeze/kdebase/debian/kdm-trinity.postinst @@ -8,13 +8,8 @@ set -e # debconf is not a registry, so we only fiddle with the default file if it # does not exist DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then - cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" -fi - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER=kdm-trinity + DEFAULT_DISPLAY_MANAGER= if db_get shared/default-x-display-manager; then DEFAULT_DISPLAY_MANAGER="$RET" fi diff --git a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst index 04c8a9af8..0c9b05b4a 100644 --- a/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst +++ b/ubuntu/maverick/kdebase/debian/kdm-trinity.postinst @@ -8,13 +8,8 @@ set -e # debconf is not a registry, so we only fiddle with the default file if it # does not exist DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager - -if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then - cp -Rp "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" "$DEFAULT_DISPLAY_MANAGER_FILE" -fi - if [ ! -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then - DEFAULT_DISPLAY_MANAGER=kdm-trinity + DEFAULT_DISPLAY_MANAGER= if db_get shared/default-x-display-manager; then DEFAULT_DISPLAY_MANAGER="$RET" fi From 3df843dd085e7a6d4e589019d388a317e837b7d1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Sep 2011 20:58:13 -0500 Subject: [PATCH 2/5] Add tsak to kdebase for Debian and Ubuntu --- debian/lenny/kdebase/debian/kdebase-trinity-bin.install | 1 + debian/squeeze/kdebase/debian/kdebase-trinity-bin.install | 1 + ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install | 1 + 3 files changed, 3 insertions(+) diff --git a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install index 87b20ee6c..2322b0008 100644 --- a/debian/lenny/kdebase/debian/kdebase-trinity-bin.install +++ b/debian/lenny/kdebase/debian/kdebase-trinity-bin.install @@ -1,5 +1,6 @@ debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kdmtsak +debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog debian/tmp/opt/trinity/bin/kreadconfig debian/tmp/opt/trinity/bin/kwriteconfig diff --git a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install index 87b20ee6c..2322b0008 100644 --- a/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install +++ b/debian/squeeze/kdebase/debian/kdebase-trinity-bin.install @@ -1,5 +1,6 @@ debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kdmtsak +debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog debian/tmp/opt/trinity/bin/kreadconfig debian/tmp/opt/trinity/bin/kwriteconfig diff --git a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install b/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install index 87b20ee6c..2322b0008 100644 --- a/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install +++ b/ubuntu/maverick/kdebase/debian/kdebase-trinity-bin.install @@ -1,5 +1,6 @@ debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/kdmtsak +debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog debian/tmp/opt/trinity/bin/kreadconfig debian/tmp/opt/trinity/bin/kwriteconfig From c6f9514625b7fe62e3f6080ffe30ac0c80d8946e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Sep 2011 15:23:09 -0500 Subject: [PATCH 3/5] Fix kmymoney2 FTBFS under Ubuntu --- ubuntu/maverick/applications/kmymoney/debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/ubuntu/maverick/applications/kmymoney/debian/control b/ubuntu/maverick/applications/kmymoney/debian/control index b194bd33f..c0dbe5b9b 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/control +++ b/ubuntu/maverick/applications/kmymoney/debian/control @@ -12,7 +12,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${shlibs:Misc}, ${misc:Depends}, Replaces: kmymoney2-kde3 (<< 4:3.5.13) Breaks: kmymoney2-kde3 (<< 4:3.5.13) - kmymoney2-common-trinity (>= ${source:Version}) Recommends: kmymoney2-plugin-aqbanking-trinity Description: personal finance manager for TDE KMyMoney is the Personal Finance Manager for TDE. It operates similar to From e8efd372737dfc0db712f7f689a13dbb5c1ee1b0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Sep 2011 21:16:48 -0500 Subject: [PATCH 4/5] Enable default kdm theme under Ubuntu if disto-specific kdm theme package not installed --- .../debian/patches/disable_default_kdm_theme.diff | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff index ad6fa4cf8..7293d03fc 100644 --- a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -12,14 +12,4 @@ Comment: & Description: Whether the greeter should be themed. - - Key: Theme - Type: string --Default: KDMDATA "/themes/o2_enterprise" -+Default: "" - User: greeter --Instance: */KDMDATA "/themes/o2_enterprise" -+Instance: */ "@@@ToBeReplacedByDesktopBase@@@" - Comment: & - Description: - The theme to use for the greeter. Can point to either a directory or an XML + From 645725620fe61bc988efee8a944a0e7805ac45ae Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Sep 2011 00:49:40 -0500 Subject: [PATCH 5/5] Fix Ubuntu kdm theme patch --- .../kdebase/debian/patches/disable_default_kdm_theme.diff | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff index 7293d03fc..9f439d657 100644 --- a/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick/kdebase/debian/patches/disable_default_kdm_theme.diff @@ -1,6 +1,6 @@ --- kdm/config.def +++ kdm/config.def -@@ -2614,18 +2614,18 @@ +@@ -2614,8 +2614,8 @@ Key: UseTheme Type: bool @@ -12,4 +12,3 @@ Comment: & Description: Whether the greeter should be themed. -