diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-12-06 11:09:49 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-12-06 11:09:49 +0100 |
| commit | 0d1416257df38f0dcd62b2cd4ec2c91eb87a2260 (patch) | |
| tree | 9cfeca7ba7aa3997d70a20d4e245e2b978152b7d /ubuntu/maverick/tdebase/debian | |
| parent | 7971a216ffb39774a606f62250213d634418bd17 (diff) | |
| parent | 3f6c8810956e8e919d98299132e4482132314dd6 (diff) | |
| download | tde-packaging-0d1416257df38f0dcd62b2cd4ec2c91eb87a2260.tar.gz tde-packaging-0d1416257df38f0dcd62b2cd4ec2c91eb87a2260.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdebase/debian')
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/control | 7 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdm-trinity.txt | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/twin-trinity.install | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index 47de154c6..9397884f0 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -33,7 +33,6 @@ Section: tde Architecture: all Replaces: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~) Breaks: kdebase-runtime-data-common-kde3 (<< 4:14.0.0~), kdebase-runtime-data-common-trinity (<< 4:14.0.0~) -Depends: tdebase-trinity Description: Shared common files for Trinity and KDE4 . Shared common files for both Trinity and KDE4 @@ -220,9 +219,8 @@ Section: utils Architecture: any Replaces: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~) Breaks: kdeprint-kde3 (<< 4:14.0.0~), kdeprint-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, enscript, poster, psutils +Depends: ${shlibs:Depends}, enscript, poster, psutils, foomatic-db | foomatic-db-compressed-ppds Recommends: kghostview-trinity | postscript-viewer -Conflicts: foomatic-db-compressed-ppds Suggests: khelpcenter-trinity, efax | hylafax-client | mgetty-fax, smbclient Description: print system for TDE This package contains the TDE printing subsystem. It can use CUPS, @@ -359,7 +357,8 @@ Architecture: any Replaces: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~) Breaks: konqueror-kde3 (<< 4:14.0.0~), konqueror-trinity (<< 4:14.0.0~) Provides: info-browser, man-browser, www-browser, konqueror -Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}), konqueror-nsplugins-trinity +Depends: ${shlibs:Depends}, kcontrol-trinity (= ${Source-Version}), tdebase-tdeio-plugins-trinity (= ${Source-Version}), kdesktop-trinity (= ${Source-Version}), kfind-trinity (= ${Source-Version}) +Recommends: konqueror-nsplugins-trinity Suggests: khelpcenter-trinity, konq-plugins-trinity, ksvg-trinity, gij-4.1, libgcj7-awt, libjessie-java Conflicts: tdebase-audiolibs-trinity (<< 4:3.0.0), tdebase-libs-trinity (<< 4:3.0.0) Description: TDE's advanced file manager, web browser and document viewer diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt index bdae3fc62..2aa4cd688 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.txt @@ -70,6 +70,7 @@ gentdmconf --in $TDMCFGDIR 1> /dev/null [ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG [ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG [ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG +[ -n "$COMPOSITOR" ] && sed -i "s|^#\?Compositor=.*|Compositor=$COMPOSITOR|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG diff --git a/ubuntu/maverick/tdebase/debian/twin-trinity.install b/ubuntu/maverick/tdebase/debian/twin-trinity.install index d9a6a12eb..515dfd1f0 100644 --- a/ubuntu/maverick/tdebase/debian/twin-trinity.install +++ b/ubuntu/maverick/tdebase/debian/twin-trinity.install @@ -1,4 +1,3 @@ -debian/tmp/opt/trinity/bin/kompmgr debian/tmp/opt/trinity/bin/compton-tde debian/tmp/opt/trinity/bin/twin debian/tmp/opt/trinity/bin/twin_killer_helper |