Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 1 insertions, 13 deletions

diff --git a/ubuntu/maverick/metapackages/rename-meta/Makefile b/ubuntu/maverick/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/Makefile
+++ b/ubuntu/maverick/metapackages/rename-meta/Makefile
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/changelog b/ubuntu/maverick/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/compat b/ubuntu/maverick/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/compat
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/control b/ubuntu/maverick/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/control
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/control
@@ -102,12 +102,6 @@ Depends: tdeprint-trinity
 Conflicts: kdeprint-trinity (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: kdesktop-trinity
-Architecture: all
-Depends: tdesktop-trinity
-Conflicts: kdesktop-trinity (< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kwin-trinity
 Architecture: all
 Depends: twin-trinity
@@ -516,12 +510,6 @@ Depends: tdeaddons-trinity-doc-html
 Conflicts: kdeaddons-trinity-doc-html (< 4:13.9.9)
 Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
 
-Package: atlantikdesigner-trinity
-Architecture: all
-Depends: atlantitdesigner-trinity
-Conflicts: atlantikdesigner-trinity (< 4:13.9.9)
-Description: Transitional dummy package.  This can be safely removed after your TDE upgrade has completed.
-
 Package: kdeaddons-kfile-plugins-trinity
 Architecture: all
 Depends: tdeaddons-kfile-plugins-trinity
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/dirs b/ubuntu/maverick/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/ubuntu/maverick/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/kdm-trinity.postinst
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for kdm-kde3
+# postinst script for kdm-trinity
 #
 # see: dh_installdeb(1)