Fix unintended rename in Conflicts for tde-guidance on Debian and Ubuntu

6 files changed, 18 insertions, 18 deletions

diff --git a/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control
index 0722d4beb..3c6e31fe6 100644
--- a/debian/lenny/applications/tde-guidance/debian/control
+++ b/debian/lenny/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/debian/squeeze/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control
index 0722d4beb..3c6e31fe6 100644
--- a/debian/squeeze/applications/tde-guidance/debian/control
+++ b/debian/squeeze/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/debian/wheezy/applications/tde-guidance/debian/control b/debian/wheezy/applications/tde-guidance/debian/control
index 0722d4beb..3c6e31fe6 100644
--- a/debian/wheezy/applications/tde-guidance/debian/control
+++ b/debian/wheezy/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index fdbdb54a3..54b562996 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/ubuntu/precise/applications/tde-guidance/debian/control b/ubuntu/precise/applications/tde-guidance/debian/control
index fdbdb54a3..54b562996 100644
--- a/ubuntu/precise/applications/tde-guidance/debian/control
+++ b/ubuntu/precise/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or
diff --git a/ubuntu/raring/applications/tde-guidance/debian/control b/ubuntu/raring/applications/tde-guidance/debian/control
index fdbdb54a3..54b562996 100644
--- a/ubuntu/raring/applications/tde-guidance/debian/control
+++ b/ubuntu/raring/applications/tde-guidance/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pytdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-kde3 (<< 4:14.0.0), kde-guidance-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of KDE system administration tools for GNU/Linux [Trinity]
  Guidance currently consists of four programs designed to help you
@@ -36,7 +36,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
 Replaces: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
 Breaks: guidance-backends-kde3 (<< 4:14.0.0), guidance-backends-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: collection of system administration tools for GNU/Linux [Trinity]
  This package contains the platform neutral backends used in the
@@ -49,7 +49,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, tde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
 Replaces: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
 Breaks: kde-guidance-powermanager-kde3 (<< 4:14.0.0), kde-guidance-powermanager-trinity (<< 4:14.0.0)
-Conflicts: guidance-power-manager, tde-guidance-powermanager
+Conflicts: guidance-power-manager, kde-guidance-powermanager
 Provides: ${python:Provides}
 Description: HAL based power manager applet [Trinity]
  A power management applet to indicate battery levels and perform hibernate or