diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-04-21 16:47:59 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-21 16:47:59 +0200 |
| commit | 37be718b877afd3122923d2815206232d638360f (patch) | |
| tree | c686f306bb60f3bdab42fa82a1831e49386b05f5 | |
| parent | 0a00eb4d4e528ae05f0f37154eb1b7ebb4bbff38 (diff) | |
| download | tde-packaging-37be718b877afd3122923d2815206232d638360f.tar.gz tde-packaging-37be718b877afd3122923d2815206232d638360f.zip | |
Fix unintended rename in Conflicts for pytdeextensions on Debian and Ubuntu
6 files changed, 6 insertions, 6 deletions
diff --git a/debian/lenny/libraries/pytdeextensions/debian/control b/debian/lenny/libraries/pytdeextensions/debian/control index 626311320..0ae116d4b 100644 --- a/debian/lenny/libraries/pytdeextensions/debian/control +++ b/debian/lenny/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control index 626311320..0ae116d4b 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/control +++ b/debian/squeeze/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages diff --git a/debian/wheezy/libraries/pytdeextensions/debian/control b/debian/wheezy/libraries/pytdeextensions/debian/control index 626311320..0ae116d4b 100644 --- a/debian/wheezy/libraries/pytdeextensions/debian/control +++ b/debian/wheezy/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index 5abe5e3b7..e2657b279 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/control +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages diff --git a/ubuntu/precise/libraries/pytdeextensions/debian/control b/ubuntu/precise/libraries/pytdeextensions/debian/control index 5abe5e3b7..e2657b279 100644 --- a/ubuntu/precise/libraries/pytdeextensions/debian/control +++ b/ubuntu/precise/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages diff --git a/ubuntu/raring/libraries/pytdeextensions/debian/control b/ubuntu/raring/libraries/pytdeextensions/debian/control index 5abe5e3b7..e2657b279 100644 --- a/ubuntu/raring/libraries/pytdeextensions/debian/control +++ b/ubuntu/raring/libraries/pytdeextensions/debian/control @@ -13,7 +13,7 @@ Architecture: all Depends: ${python:Depends} Replaces: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) Breaks: pykdeextensions-kde3 (<< 4:14.0.0), pykdeextensions-trinity (<< 4:14.0.0) -Conflicts: pytdeextensions +Conflicts: pykdeextensions Provides: ${python:Provides} Description: Python packages to support KDE applications (scripts) [Trinity] PyKDE Extensions is a collection of software and Python packages |