diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-31 14:54:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-31 14:55:45 +0200 |
| commit | 4cfc638f83bd6cb3bf9c1d624b148d00102788e4 (patch) | |
| tree | 6402302b06af7783201cbe3a5be2b204c87c4a30 /debian | |
| parent | f85247d22fb1e8ecbedf638122392a4d958891c1 (diff) | |
| download | tde-packaging-4cfc638f83bd6cb3bf9c1d624b148d00102788e4.tar.gz tde-packaging-4cfc638f83bd6cb3bf9c1d624b148d00102788e4.zip | |
DEB tdeio-gopher: Add tdebase-tdeio-plugins-trinity << 14.1.0~ to Conflicts
to ensure smooth upgrade
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'debian')
4 files changed, 4 insertions, 2 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. |