Branch: master

733db02e 2014-11-12 14:23:36 Timothy Pearson
Fix rename-meta FTBFS on platforms where network-manager-kde-trinity is still available
M debian/squeeze/metapackages/rename-meta/debian/control
M ubuntu/maverick/metapackages/rename-meta/debian/control
diff --git a/debian/squeeze/metapackages/rename-meta/debian/control b/debian/squeeze/metapackages/rename-meta/debian/control
index cbb9570..d5232eb 100644
--- a/debian/squeeze/metapackages/rename-meta/debian/control
+++ b/debian/squeeze/metapackages/rename-meta/debian/control
@@ -228,12 +228,6 @@
 Conflicts: kdevelop-trinity-dev (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: network-manager-kde-trinity
-Architecture: all
-Depends: network-manager-tde
-Conflicts: network-manager-kde-trinity (<< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kdegraphics-trinity
 Architecture: all
 Depends: tdegraphics-trinity
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index cbb9570..d5232eb 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -228,12 +228,6 @@
 Conflicts: kdevelop-trinity-dev (<< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: network-manager-kde-trinity
-Architecture: all
-Depends: network-manager-tde
-Conflicts: network-manager-kde-trinity (<< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kdegraphics-trinity
 Architecture: all
 Depends: tdegraphics-trinity