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

7 files changed, 2 insertions, 14 deletions

diff --git a/ubuntu/precise/metapackages/rename-meta/Makefile b/ubuntu/precise/metapackages/rename-meta/Makefile
index a36e6a1c9..a36e6a1c9 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/Makefile
+++ b/ubuntu/precise/metapackages/rename-meta/Makefile
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/changelog b/ubuntu/precise/metapackages/rename-meta/debian/changelog
index adf2ec8c1..adf2ec8c1 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/changelog
+++ b/ubuntu/precise/metapackages/rename-meta/debian/changelog
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/compat b/ubuntu/precise/metapackages/rename-meta/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/compat
+++ b/ubuntu/precise/metapackages/rename-meta/debian/compat
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/control b/ubuntu/precise/metapackages/rename-meta/debian/control
index 0647d30f3..8a3c151cb 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/control
+++ b/ubuntu/precise/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/precise/metapackages/rename-meta/debian/dirs b/ubuntu/precise/metapackages/rename-meta/debian/dirs
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/dirs
+++ b/ubuntu/precise/metapackages/rename-meta/debian/dirs
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst b/ubuntu/precise/metapackages/rename-meta/debian/kdm-trinity.postinst
index 8db089c93..e026f2bfe 100644
--- a/ubuntu/precise/metapackages/rename-meta/debian/kdm-kde3.postinst
+++ b/ubuntu/precise/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)
 
diff --git a/ubuntu/precise/metapackages/trinity-livecd/debian/control b/ubuntu/precise/metapackages/trinity-livecd/debian/control
index a6e95b5b5..6adca2f1e 100644
--- a/ubuntu/precise/metapackages/trinity-livecd/debian/control
+++ b/ubuntu/precise/metapackages/trinity-livecd/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cdbs, debhelper (>= 5)
 
 Package: trinity-livecd
 Architecture: all
-Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, kdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
+Depends: akregator-trinity, amarok-trinity, ark-trinity, basket-trinity, eyesapplet-trinity, juk-trinity, k3b-trinity, kaffeine-trinity, karm-trinity, kbstate-trinity, kcalc-trinity, kcharselect-trinity, tdeaddons-tdefile-plugins-trinity, tdeadmin-tdefile-plugins-trinity, tdegames-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdenetwork-tdefile-plugins-trinity, tdepim-tdefile-plugins-trinity, tdesdk-tdefile-plugins-trinity, tdessh-trinity, tdesudo-trinity, tdewallpapers-trinity, kdf-trinity, kedit-trinity, kfloppy-trinity, kget-trinity, kgpg-trinity, kicker-applets-trinity, kleopatra-trinity, kmailcvt-trinity, kmix-trinity, kmoon-trinity, kompare-trinity, kontact-trinity, konversation-trinity, kopete-trinity, korn-trinity, kpdf-trinity, kpowersave-nohal-trinity | kpowersave-trinity, kppp-trinity, krdc-trinity, tdescreensaver-trinity, ksmserver-trinity, ksnapshot-trinity, kteatime-trinity, ktnef-trinity, ktorrent-trinity, kuickshow-trinity, tdewalletmanager-trinity, kweather-trinity, kworldclock-trinity, libarts1-akode-trinity, sudo-trinity, superkaramba-trinity, trinity-keyring
 Recommends:
  kpresenter-trinity, kspread-trinity, kword-trinity,
  tde-i18n-cs-trinity, tde-i18n-de-trinity, tde-i18n-es-trinity, tde-i18n-fr-trinity, tde-i18n-it-trinity, tde-i18n-ru-trinity,