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

13 years ago · d20183da14
parent bca7b432a7 645725620f
commit d20183da14
8 changed files with 7 additions and 31 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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