diff options
| author | albator <[email protected]> | 2011-09-18 23:25:28 +0200 |
|---|---|---|
| committer | albator <[email protected]> | 2011-09-18 23:25:28 +0200 |
| commit | d20183da14961148333e1f76f794c19bd763c7b0 (patch) | |
| tree | c3389b9cc8b948f950f30aa85fe9ad008ead1531 /ubuntu/maverick | |
| parent | bca7b432a75bf6ecfd46b10ef8482f3dbf900645 (diff) | |
| parent | 645725620fe61bc988efee8a944a0e7805ac45ae (diff) | |
| download | tde-packaging-d20183da14961148333e1f76f794c19bd763c7b0.tar.gz tde-packaging-d20183da14961148333e1f76f794c19bd763c7b0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick')
4 files changed, 3 insertions, 19 deletions
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 |