summaryrefslogtreecommitdiffstats
path: root/debian/wheezy
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-12-02 14:35:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-12-02 14:35:58 -0600
commitaa94cd3c574a442956f905b05988839e1d964575 (patch)
tree0d8234e98217529a5260c4381813b8384fb815b8 /debian/wheezy
parentef7f47c200c1eba81b9fe7aae98878c8ceb290ec (diff)
downloadtde-packaging-aa94cd3c574a442956f905b05988839e1d964575.tar.gz
tde-packaging-aa94cd3c574a442956f905b05988839e1d964575.zip
Fix upgrade problems from 3.5.13.x to R14
Diffstat (limited to 'debian/wheezy')
-rw-r--r--debian/wheezy/applications/tdeio-umountwrapper/debian/postrm6
-rw-r--r--debian/wheezy/applications/tdeio-umountwrapper/debian/preinst9
-rw-r--r--debian/wheezy/libraries/libtqt-perl/debian/control1
3 files changed, 13 insertions, 3 deletions
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..a4d27d2cd 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,17 @@ 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
+ dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/konqueror/servicemenus/media_safelyremove.desktop || true
+ dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/dolphin/servicemenus/media_safelyremove.desktop || true
+ dpkg-divert --package kio-umountwrapper-trinity --rename --remove /opt/trinity/share/apps/d3lphin/servicemenus/media_safelyremove.desktop || true
+
+ # 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/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.