diff options
Diffstat (limited to 'debian')
27 files changed, 174 insertions, 156 deletions
diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/postrm b/debian/lenny/applications/tdeio-umountwrapper/debian/postrm index 18fc57ee1..9a4c04dbd 100644 --- a/debian/lenny/applications/tdeio-umountwrapper/debian/postrm +++ b/debian/lenny/applications/tdeio-umountwrapper/debian/postrm @@ -1,7 +1,7 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -23,6 +23,7 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in @@ -38,6 +39,7 @@ case "$1" in # try to remove the dirs we've created for pkg-divert rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/konqueror/servicemenus/ + rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/dolphin/servicemenus/ rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/d3lphin/servicemenus/ ;; diff --git a/debian/lenny/applications/tdeio-umountwrapper/debian/preinst b/debian/lenny/applications/tdeio-umountwrapper/debian/preinst index 589e2ed5c..a258f8481 100644 --- a/debian/lenny/applications/tdeio-umountwrapper/debian/preinst +++ b/debian/lenny/applications/tdeio-umountwrapper/debian/preinst @@ -1,5 +1,5 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 # # This program is free software; you can redistribute it and/or modify @@ -24,10 +24,26 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop + fi + + # add new diversions dpkg-divert --package $package_name \ --divert /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop.distrib \ --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop diff --git a/debian/lenny/applications/tdesudo/debian/preinst b/debian/lenny/applications/tdesudo/debian/preinst index 770dfaacb..9633ba544 100644 --- a/debian/lenny/applications/tdesudo/debian/preinst +++ b/debian/lenny/applications/tdesudo/debian/preinst @@ -11,15 +11,30 @@ fi case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu + fi + divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu + fi + + # add new diversion dpkg-divert --package $package_name \ --divert /opt/trinity/bin/tdesu.distrib \ --rename /opt/trinity/bin/tdesu ;; + upgrade) + # remove old diversion if present divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"` if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu" fi + + # add new diversion divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"` if [ -z "$divert" ]; then dpkg-divert --package $package_name \ @@ -27,6 +42,7 @@ case "$1" in --rename /opt/trinity/bin/tdesu fi ;; + abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install index a8f4abfa7..fe4f0fefb 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,7 +1,7 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libtqteditor.prl +usr/lib/libtqteditor.a +usr/lib/libtqtdesignercore.prl +usr/lib/libtqtdesignercore.a +usr/lib/libtqassistantclient.prl +usr/lib/libtqassistantclient.a usr/include/tqt3/ntqassistantclient.h diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links index b009faf61..b62dc9759 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl -/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a -/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl -/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a -/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl -/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a +/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/debian/lenny/libraries/libtqt-perl/debian/control b/debian/lenny/libraries/libtqt-perl/debian/control index e1b839fa0..c80a71a35 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/control +++ b/debian/lenny/libraries/libtqt-perl/debian/control @@ -12,6 +12,7 @@ Architecture: any Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Replaces: libtqt-perl (<< 4:14.0.0~) Breaks: libtqt-perl (<< 4:14.0.0~) +Conflicts: libqt-perl Description: Perl bindings for the TQt library This module lets you use the TQt library from Perl. It provides an object-oriented interface and is easy to use. diff --git a/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst deleted file mode 100644 index 12e16e22d..000000000 --- a/debian/lenny/metapackages/rename-meta/debian/kdesudo-trinity.preinst +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kdesudo-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --rename --remove \ - /opt/trinity/bin/kdesu -fi - -exit 0 diff --git a/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst deleted file mode 100644 index b7af2273b..000000000 --- a/debian/lenny/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kio-umountwrapper-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop -fi - -exit 0 diff --git a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst index 4a2ab8a19..503524a11 100644 --- a/debian/lenny/tdebase/debian/ksmserver-trinity.preinst +++ b/debian/lenny/tdebase/debian/ksmserver-trinity.preinst @@ -6,8 +6,14 @@ case "$1" in upgrade) # Remove old-style Plasma diversions - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true + divert=`dpkg-divert --listpackage "/usr/bin/plasma"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma + fi + divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop + fi mkdir -p /usr/share/autostart ;; diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/postrm b/debian/squeeze/applications/tdeio-umountwrapper/debian/postrm index 18fc57ee1..9a4c04dbd 100644 --- a/debian/squeeze/applications/tdeio-umountwrapper/debian/postrm +++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/postrm @@ -1,7 +1,7 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -23,6 +23,7 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in @@ -38,6 +39,7 @@ case "$1" in # try to remove the dirs we've created for pkg-divert rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/konqueror/servicemenus/ + rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/dolphin/servicemenus/ rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/d3lphin/servicemenus/ ;; diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst b/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst index 589e2ed5c..a258f8481 100644 --- a/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst +++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/preinst @@ -1,5 +1,5 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 # # This program is free software; you can redistribute it and/or modify @@ -24,10 +24,26 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop + fi + + # add new diversions dpkg-divert --package $package_name \ --divert /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop.distrib \ --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop diff --git a/debian/squeeze/applications/tdesudo/debian/preinst b/debian/squeeze/applications/tdesudo/debian/preinst index 770dfaacb..9633ba544 100644 --- a/debian/squeeze/applications/tdesudo/debian/preinst +++ b/debian/squeeze/applications/tdesudo/debian/preinst @@ -11,15 +11,30 @@ fi case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu + fi + divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu + fi + + # add new diversion dpkg-divert --package $package_name \ --divert /opt/trinity/bin/tdesu.distrib \ --rename /opt/trinity/bin/tdesu ;; + upgrade) + # remove old diversion if present divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"` if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu" fi + + # add new diversion divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"` if [ -z "$divert" ]; then dpkg-divert --package $package_name \ @@ -27,6 +42,7 @@ case "$1" in --rename /opt/trinity/bin/tdesu fi ;; + abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install index a8f4abfa7..fe4f0fefb 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,7 +1,7 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libtqteditor.prl +usr/lib/libtqteditor.a +usr/lib/libtqtdesignercore.prl +usr/lib/libtqtdesignercore.a +usr/lib/libtqassistantclient.prl +usr/lib/libtqassistantclient.a usr/include/tqt3/ntqassistantclient.h diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links index b009faf61..b62dc9759 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl -/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a -/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl -/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a -/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl -/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a +/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/debian/squeeze/libraries/libtqt-perl/debian/control b/debian/squeeze/libraries/libtqt-perl/debian/control index e1b839fa0..c80a71a35 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/control +++ b/debian/squeeze/libraries/libtqt-perl/debian/control @@ -12,6 +12,7 @@ Architecture: any Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Replaces: libtqt-perl (<< 4:14.0.0~) Breaks: libtqt-perl (<< 4:14.0.0~) +Conflicts: libqt-perl Description: Perl bindings for the TQt library This module lets you use the TQt library from Perl. It provides an object-oriented interface and is easy to use. diff --git a/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst deleted file mode 100644 index 12e16e22d..000000000 --- a/debian/squeeze/metapackages/rename-meta/debian/kdesudo-trinity.preinst +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kdesudo-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --rename --remove \ - /opt/trinity/bin/kdesu -fi - -exit 0 diff --git a/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst deleted file mode 100644 index b7af2273b..000000000 --- a/debian/squeeze/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kio-umountwrapper-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop -fi - -exit 0 diff --git a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst index 4a2ab8a19..503524a11 100644 --- a/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst +++ b/debian/squeeze/tdebase/debian/ksmserver-trinity.preinst @@ -6,8 +6,14 @@ case "$1" in upgrade) # Remove old-style Plasma diversions - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true + divert=`dpkg-divert --listpackage "/usr/bin/plasma"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma + fi + divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop + fi mkdir -p /usr/share/autostart ;; diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/postrm b/debian/wheezy/applications/tdeio-umountwrapper/debian/postrm index 18fc57ee1..9a4c04dbd 100644 --- a/debian/wheezy/applications/tdeio-umountwrapper/debian/postrm +++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/postrm @@ -1,7 +1,7 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -23,6 +23,7 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in @@ -38,6 +39,7 @@ case "$1" in # try to remove the dirs we've created for pkg-divert rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/konqueror/servicemenus/ + rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/dolphin/servicemenus/ rmdir --ignore-fail-on-non-empty /opt/trinity/share/apps/d3lphin/servicemenus/ ;; diff --git a/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst b/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst index 589e2ed5c..a258f8481 100644 --- a/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst +++ b/debian/wheezy/applications/tdeio-umountwrapper/debian/preinst @@ -1,5 +1,5 @@ #! /bin/sh -# -*- Mode: Sh -*- +# -*- Mode: Sh -*- # Author: Frode M. Døving <frode@lnix.net> (C) 2007 # # This program is free software; you can redistribute it and/or modify @@ -24,10 +24,26 @@ package_name=tdeio-umountwrapper-trinity # make sure than the directories exist before running dpkg-divert mkdir -p /opt/trinity/share/apps/konqueror/servicemenus/ +mkdir -p /opt/trinity/share/apps/dolphin/servicemenus/ mkdir -p /opt/trinity/share/apps/d3lphin/servicemenus/ case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop + fi + divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` + if [ -n "$divert" ] && [ "$divert" = "kio-umountwrapper-trinity" ]; then + dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop + fi + + # add new diversions dpkg-divert --package $package_name \ --divert /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop.distrib \ --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop diff --git a/debian/wheezy/applications/tdesudo/debian/preinst b/debian/wheezy/applications/tdesudo/debian/preinst index 770dfaacb..9633ba544 100644 --- a/debian/wheezy/applications/tdesudo/debian/preinst +++ b/debian/wheezy/applications/tdesudo/debian/preinst @@ -11,15 +11,30 @@ fi case "$1" in install) + # remove old diversions if present + divert=`dpkg-divert --listpackage "/usr/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /usr/trinity/bin/kdesu + fi + divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` + if [ -n "$divert" ] && [ "$divert" = "kdesudo-trinity" ]; then + dpkg-divert --remove --package kdesudo-trinity --rename /opt/trinity/bin/kdesu + fi + + # add new diversion dpkg-divert --package $package_name \ --divert /opt/trinity/bin/tdesu.distrib \ --rename /opt/trinity/bin/tdesu ;; + upgrade) + # remove old diversion if present divert=`dpkg-divert --listpackage "/usr/trinity/bin/tdesu"` if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then dpkg-divert --remove --package $package_name --rename "/usr/trinity/bin/tdesu" fi + + # add new diversion divert=`dpkg-divert --listpackage "/opt/trinity/bin/tdesu"` if [ -z "$divert" ]; then dpkg-divert --package $package_name \ @@ -27,6 +42,7 @@ case "$1" in --rename /opt/trinity/bin/tdesu fi ;; + abort-upgrade) ;; *) echo "$0: didn't understand being called with \`$1'" 1>&2 diff --git a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install index a8f4abfa7..fe4f0fefb 100644 --- a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,7 +1,7 @@ -usr/lib/libeditor.prl -usr/lib/libeditor.a -usr/lib/libdesignercore.prl -usr/lib/libdesignercore.a -usr/lib/libqassistantclient.prl -usr/lib/libqassistantclient.a +usr/lib/libtqteditor.prl +usr/lib/libtqteditor.a +usr/lib/libtqtdesignercore.prl +usr/lib/libtqtdesignercore.a +usr/lib/libtqassistantclient.prl +usr/lib/libtqassistantclient.a usr/include/tqt3/ntqassistantclient.h diff --git a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.links index b009faf61..b62dc9759 100644 --- a/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/debian/wheezy/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libeditor.prl /usr/share/tqt3/lib/libeditor.prl -/usr/lib/libeditor.a /usr/share/tqt3/lib/libeditor.a -/usr/lib/libdesignercore.prl /usr/share/tqt3/lib/libdesignercore.prl -/usr/lib/libdesignercore.a /usr/share/tqt3/lib/libdesignercore.a -/usr/lib/libqassistantclient.prl /usr/share/tqt3/lib/libqassistantclient.prl -/usr/lib/libqassistantclient.a /usr/share/tqt3/lib/libqassistantclient.a +/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/debian/wheezy/libraries/libtqt-perl/debian/control b/debian/wheezy/libraries/libtqt-perl/debian/control index e1b839fa0..c80a71a35 100644 --- a/debian/wheezy/libraries/libtqt-perl/debian/control +++ b/debian/wheezy/libraries/libtqt-perl/debian/control @@ -12,6 +12,7 @@ Architecture: any Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} Replaces: libtqt-perl (<< 4:14.0.0~) Breaks: libtqt-perl (<< 4:14.0.0~) +Conflicts: libqt-perl Description: Perl bindings for the TQt library This module lets you use the TQt library from Perl. It provides an object-oriented interface and is easy to use. diff --git a/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst b/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst deleted file mode 100644 index 12e16e22d..000000000 --- a/debian/wheezy/metapackages/rename-meta/debian/kdesudo-trinity.preinst +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kdesudo-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/bin/kdesu"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --rename --remove \ - /opt/trinity/bin/kdesu -fi - -exit 0 diff --git a/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst b/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst deleted file mode 100644 index b7af2273b..000000000 --- a/debian/wheezy/metapackages/rename-meta/debian/kio-umountwrapper-trinity.preinst +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh - -set -e - -package_name=kio-umountwrapper-trinity - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop -fi - -divert=`dpkg-divert --listpackage "/opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop"` -if [ -n "$divert" ] && [ "$divert" = $package_name ]; then - dpkg-divert --package $package_name --remove --rename /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop -fi - -exit 0 diff --git a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst index 4a2ab8a19..503524a11 100644 --- a/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst +++ b/debian/wheezy/tdebase/debian/ksmserver-trinity.preinst @@ -6,8 +6,14 @@ case "$1" in upgrade) # Remove old-style Plasma diversions - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma || true - dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop || true + divert=`dpkg-divert --listpackage "/usr/bin/plasma"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma + fi + divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"` + if [ -n "$divert" ]; then + dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop + fi mkdir -p /usr/share/autostart ;; |