summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-06-11 16:51:46 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-06-11 16:52:04 +0200
commitab0a27439950f6ee5f49a3bfd5a15285e332e839 (patch)
treeee599b4b92cbd83b0a02e9ff7c2c66b5e587a738
parentb45a746adaf8d4f3acba409d28dd8bea711c92d1 (diff)
downloadtde-packaging-ab0a27439950f6ee5f49a3bfd5a15285e332e839.tar.gz
tde-packaging-ab0a27439950f6ee5f49a3bfd5a15285e332e839.zip
Remove version number from dependency on virtual package tde-i18n-trinity on Debian and Ubuntu
Remove kde-i18n-trinity from rename-meta - it was a virtual package Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit a21470e1e1252530dc52b0b667ae840c72caeb71)
-rw-r--r--debian/lenny/metapackages/meta-tde/debian/control6
-rw-r--r--debian/squeeze/metapackages/meta-tde/debian/control6
-rw-r--r--ubuntu/maverick/metapackages/rename-meta/debian/control6
3 files changed, 6 insertions, 12 deletions
diff --git a/debian/lenny/metapackages/meta-tde/debian/control b/debian/lenny/metapackages/meta-tde/debian/control
index 85454c57c..b0b1068db 100644
--- a/debian/lenny/metapackages/meta-tde/debian/control
+++ b/debian/lenny/metapackages/meta-tde/debian/control
@@ -15,7 +15,7 @@ Provides: kde-trinity
Replaces: kde-trinity
Breaks: kde-trinity
Depends: tde-core-trinity (>= 4:14.0.0~), tdeedu-trinity (>= 4:14.0.0~), tdegames-trinity (>= 4:14.0.0~), tdetoys-trinity (>= 4:14.0.0~), tdeaccessibility-trinity (>= 4:14.0.0~), tdeaddons-trinity (>= 4:14.0.0~), tdeadmin-trinity (>= 4:14.0.0~), tdeartwork-trinity (>= 4:14.0.0~), tdegraphics-trinity (>= 4:14.0.0~), tdemultimedia-trinity (>= 4:14.0.0~), tdenetwork-trinity (>= 4:14.0.0~), tdepim-trinity (>= 4:14.0.0~), tdeutils-trinity (>= 4:14.0.0~), tdewebdev-trinity (>= 4:14.0.0~), desktop-base-trinity
-Suggests: tde-i18n-trinity (>= 4:14.0.0~), x-window-system-core, tdesudo-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Suggests: tde-i18n-trinity, x-window-system-core, tdesudo-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
Description: Trinity Desktop Environment official modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -37,7 +37,7 @@ Provides: kde-core-trinity
Replaces: kde-core-trinity
Breaks: kde-core-trinity
Depends: arts-trinity (>= 1.5.5), tdebase-trinity (>= 4:14.0.0~), tdelibs-trinity (>= 4:14.0.0~), sudo-trinity, synaptic-trinity
-Suggests: tde-i18n-trinity (>= 4:14.0.0~)
+Suggests: tde-i18n-trinity
Description: Trinity Desktop Environment core modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -57,7 +57,7 @@ Provides: kde-devel-trinity
Replaces: kde-devel-trinity
Breaks: kde-devel-trinity
Depends: tde-core-trinity (>= 4:14.0.0~), tdesdk-trinity (>= 4:14.0.0~), libartsc0-trinity-dev (>= 1.5.5), libarts1-trinity-dev (>= 1.5.5), tdelibs14-trinity-dev (>= 4:14.0.0~), tdebase-trinity-dev (>= 4:14.0.0~), libkonq4-trinity-dev (>= 4:14.0.0~), tqt3-designer
-Suggests: tde-i18n-trinity (>= 4:14.0.0~), kdbg-trinity, tdevelop-trinity (>= 4:14.0.0~), kprof-trinity
+Suggests: tde-i18n-trinity, kdbg-trinity, tdevelop-trinity (>= 4:14.0.0~), kprof-trinity
Description: Trinity Desktop Environment development files and modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
diff --git a/debian/squeeze/metapackages/meta-tde/debian/control b/debian/squeeze/metapackages/meta-tde/debian/control
index 85454c57c..b0b1068db 100644
--- a/debian/squeeze/metapackages/meta-tde/debian/control
+++ b/debian/squeeze/metapackages/meta-tde/debian/control
@@ -15,7 +15,7 @@ Provides: kde-trinity
Replaces: kde-trinity
Breaks: kde-trinity
Depends: tde-core-trinity (>= 4:14.0.0~), tdeedu-trinity (>= 4:14.0.0~), tdegames-trinity (>= 4:14.0.0~), tdetoys-trinity (>= 4:14.0.0~), tdeaccessibility-trinity (>= 4:14.0.0~), tdeaddons-trinity (>= 4:14.0.0~), tdeadmin-trinity (>= 4:14.0.0~), tdeartwork-trinity (>= 4:14.0.0~), tdegraphics-trinity (>= 4:14.0.0~), tdemultimedia-trinity (>= 4:14.0.0~), tdenetwork-trinity (>= 4:14.0.0~), tdepim-trinity (>= 4:14.0.0~), tdeutils-trinity (>= 4:14.0.0~), tdewebdev-trinity (>= 4:14.0.0~), desktop-base-trinity
-Suggests: tde-i18n-trinity (>= 4:14.0.0~), x-window-system-core, tdesudo-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
+Suggests: tde-i18n-trinity, x-window-system-core, tdesudo-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine
Description: Trinity Desktop Environment official modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -37,7 +37,7 @@ Provides: kde-core-trinity
Replaces: kde-core-trinity
Breaks: kde-core-trinity
Depends: arts-trinity (>= 1.5.5), tdebase-trinity (>= 4:14.0.0~), tdelibs-trinity (>= 4:14.0.0~), sudo-trinity, synaptic-trinity
-Suggests: tde-i18n-trinity (>= 4:14.0.0~)
+Suggests: tde-i18n-trinity
Description: Trinity Desktop Environment core modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
@@ -57,7 +57,7 @@ Provides: kde-devel-trinity
Replaces: kde-devel-trinity
Breaks: kde-devel-trinity
Depends: tde-core-trinity (>= 4:14.0.0~), tdesdk-trinity (>= 4:14.0.0~), libartsc0-trinity-dev (>= 1.5.5), libarts1-trinity-dev (>= 1.5.5), tdelibs14-trinity-dev (>= 4:14.0.0~), tdebase-trinity-dev (>= 4:14.0.0~), libkonq4-trinity-dev (>= 4:14.0.0~), tqt3-designer
-Suggests: tde-i18n-trinity (>= 4:14.0.0~), kdbg-trinity, tdevelop-trinity (>= 4:14.0.0~), kprof-trinity
+Suggests: tde-i18n-trinity, kdbg-trinity, tdevelop-trinity (>= 4:14.0.0~), kprof-trinity
Description: Trinity Desktop Environment development files and modules [Trinity]
TDE (Trinity Desktop Environment) is a powerful Open Source graphical
desktop environment for Unix workstations. It combines ease of use,
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 7e00cd9b5..c54a119fe 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -696,12 +696,6 @@ Depends: twin-style-crystal-trinity
Conflicts: kwin-style-crystal-trinity (<< 4:13.9.9)
Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-Package: kde-i18n-trinity
-Architecture: all
-Depends: tde-i18n-trinity
-Conflicts: kde-i18n-trinity (<< 4:13.9.9)
-Description: Transitional dummy package. This can be safely removed after your TDE upgrade has completed.
-
Package: kde-i18n-af-trinity
Architecture: all
Depends: tde-i18n-af-trinity