summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-07-30 12:05:13 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-07-30 12:05:13 +0200
commit4fa13091440d347b5d67123171f49082ba130008 (patch)
tree3228a6aa3bae8252c501f92e9156845ce38ddf0f
parent8b6e22c6210f688d07133babddfbf8a2158e19ca (diff)
downloadtde-packaging-4fa13091440d347b5d67123171f49082ba130008.tar.gz
tde-packaging-4fa13091440d347b5d67123171f49082ba130008.zip
DEB tdeio-gopher: Update the conflicting version number in connection with incorporation into r14.0.x branch.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/tdeio/tdeio-gopher/debian/control2
-rw-r--r--ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/_base/applications/tdeio/tdeio-gopher/debian/control b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
index 6b5c7afd9..2752551e6 100644
--- a/debian/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/debian/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -11,7 +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~)
+Conflicts: kdebase-kio-plugins-trinity (<< 4:14.0.11~), tdebase-tdeio-plugins-trinity (<< 4:14.0.11~)
Description: tdeio-slave for the gopher protocol [Trinity]
Adds support for the "gopher:" protocol
to Konqueror and other TDE applications.
diff --git a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
index 6b5c7afd9..2752551e6 100644
--- a/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
+++ b/ubuntu/_base/applications/tdeio/tdeio-gopher/debian/control
@@ -11,7 +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~)
+Conflicts: kdebase-kio-plugins-trinity (<< 4:14.0.11~), tdebase-tdeio-plugins-trinity (<< 4:14.0.11~)
Description: tdeio-slave for the gopher protocol [Trinity]
Adds support for the "gopher:" protocol
to Konqueror and other TDE applications.