diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-07-09 21:04:46 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-07-09 21:04:46 +0200 |
| commit | 9f07f141355cd13d40a39a2f123c6516209c5fcf (patch) | |
| tree | 4fe83305b55a3c8fea186195f4370d07f98ee386 /debian/lenny | |
| parent | d93278155946c9d82d43a8f5a6b02a7b51f356b5 (diff) | |
| parent | 1ec238be7cfeda3d652bde0414fb551e8aca5ad0 (diff) | |
| download | tde-packaging-9f07f141355cd13d40a39a2f123c6516209c5fcf.tar.gz tde-packaging-9f07f141355cd13d40a39a2f123c6516209c5fcf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian/lenny')
3 files changed, 6 insertions, 4 deletions
diff --git a/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff b/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff index 200843f01..e50536e78 100644 --- a/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff +++ b/debian/lenny/tdebase/debian/patches/disable_default_tdm_theme.diff @@ -1,5 +1,5 @@ ---- tdm/config.def -+++ tdm/config.def +--- a/tdm/config.def ++++ b/tdm/config.def @@ -2614,18 +2614,18 @@ Key: UseTheme diff --git a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff index a45290729..3949f4040 100644 --- a/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff +++ b/debian/lenny/tdebase/debian/patches/disable_starttde_wallpaper.diff @@ -1,5 +1,5 @@ ---- starttde -+++ starttde +--- a/starttde ++++ b/starttde @@ -288,17 +288,17 @@ . "$tdehome/share/config/startupconfig" fi diff --git a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install index bc3a2f1c6..64dfbd22a 100644 --- a/debian/lenny/tdebase/debian/tdebase-trinity-bin.install +++ b/debian/lenny/tdebase/debian/tdebase-trinity-bin.install @@ -1,3 +1,5 @@ +debian/tmp/opt/trinity/bin/migratekde3 +debian/tmp/opt/trinity/bin/r14-xdg-update debian/tmp/opt/trinity/bin/krootbacking debian/tmp/opt/trinity/bin/tdeinit_phase1 debian/tmp/opt/trinity/bin/tdmtsak |