From 4cfc638f83bd6cb3bf9c1d624b148d00102788e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 31 Aug 2018 14:54:38 +0200 Subject: [PATCH] DEB tdeio-gopher: Add tdebase-tdeio-plugins-trinity << 14.1.0~ to Conflicts to ensure smooth upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk | 2 +- debian/lenny/applications/tdeio-gopher/debian/control | 1 + .../applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk | 2 +- debian/squeeze/applications/tdeio-gopher/debian/control | 1 + .../applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk | 2 +- ubuntu/maverick/applications/tdeio-gopher/debian/control | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk index c5d8ecfd3..c7c382548 100644 --- a/debian/lenny/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/debian/lenny/applications/tdeio-gopher/debian/control b/debian/lenny/applications/tdeio-gopher/debian/control index eeca87807..8d61c5428 100644 --- a/debian/lenny/applications/tdeio-gopher/debian/control +++ b/debian/lenny/applications/tdeio-gopher/debian/control @@ -11,6 +11,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: kio-gopher-trinity (<< 4:14.0.0~) Breaks: kio-gopher-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-trinity (<< 4:14.1.0~), tdebase-tdeio-plugins-trinity (<< 4:14.1.0~) Description: tdeio-slave for the gopher protocol [Trinity] Adds support for the "gopher:" protocol to Konqueror and other TDE applications. diff --git a/debian/squeeze/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk index c5d8ecfd3..c7c382548 100644 --- a/debian/squeeze/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/debian/squeeze/applications/tdeio-gopher/debian/control b/debian/squeeze/applications/tdeio-gopher/debian/control index eeca87807..8d61c5428 100644 --- a/debian/squeeze/applications/tdeio-gopher/debian/control +++ b/debian/squeeze/applications/tdeio-gopher/debian/control @@ -11,6 +11,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: kio-gopher-trinity (<< 4:14.0.0~) Breaks: kio-gopher-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-trinity (<< 4:14.1.0~), tdebase-tdeio-plugins-trinity (<< 4:14.1.0~) Description: tdeio-slave for the gopher protocol [Trinity] Adds support for the "gopher:" protocol to Konqueror and other TDE applications. diff --git a/ubuntu/maverick/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk index c5d8ecfd3..c7c382548 100644 --- a/ubuntu/maverick/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/applications/tdeio-gopher/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/ubuntu/maverick/applications/tdeio-gopher/debian/control b/ubuntu/maverick/applications/tdeio-gopher/debian/control index eeca87807..8d61c5428 100644 --- a/ubuntu/maverick/applications/tdeio-gopher/debian/control +++ b/ubuntu/maverick/applications/tdeio-gopher/debian/control @@ -11,6 +11,7 @@ Architecture: any Depends: ${shlibs:Depends} Replaces: kio-gopher-trinity (<< 4:14.0.0~) Breaks: kio-gopher-trinity (<< 4:14.0.0~) +Conflicts: kdebase-kio-plugins-trinity (<< 4:14.1.0~), tdebase-tdeio-plugins-trinity (<< 4:14.1.0~) Description: tdeio-slave for the gopher protocol [Trinity] Adds support for the "gopher:" protocol to Konqueror and other TDE applications.