Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

8 files changed, 7 insertions, 31 deletions

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/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/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/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/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
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
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
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..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,14 +12,3 @@
  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