diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-04-21 18:23:46 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-21 18:23:46 +0200 |
| commit | 731c5feadab8d86e307b00e3b408b5d5b80b4422 (patch) | |
| tree | 7cfc1ecc2e773942b49fb907f4450304820b86ce /debian/squeeze | |
| parent | 37be718b877afd3122923d2815206232d638360f (diff) | |
| download | tde-packaging-731c5feadab8d86e307b00e3b408b5d5b80b4422.tar.gz tde-packaging-731c5feadab8d86e307b00e3b408b5d5b80b4422.zip | |
Fix unintended rename in Conflicts for tde-guidance on Debian and Ubuntu
Diffstat (limited to 'debian/squeeze')
| -rw-r--r-- | debian/squeeze/applications/tde-guidance/debian/control | 6 |
1 files changed, 3 insertions, 3 deletions
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 |