diff options
author | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2011-12-18 19:09:26 +0100 |
---|---|---|
committer | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2011-12-18 19:09:26 +0100 |
commit | 17bd64a4f5045bff950e8725a66ee1800e0254e1 (patch) | |
tree | ff25e74f8237046702df34d68563a9052d82acdd /ubuntu/maverick/tdebindings | |
parent | 620523010a822e93be02bdb3e375c11fe51ebae4 (diff) | |
parent | aecd88c6bb977677b41b95e89395f673ce8bdb4a (diff) | |
download | tde-packaging-17bd64a4f5045bff950e8725a66ee1800e0254e1.tar.gz tde-packaging-17bd64a4f5045bff950e8725a66ee1800e0254e1.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdebindings')
-rw-r--r-- | ubuntu/maverick/tdebindings/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdebindings/debian/control.in | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index f16386120..89d7fda52 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/tdebindings/debian/control @@ -130,7 +130,6 @@ Section: libs Replaces: libsmokeqt1-kde3 (<< 4:3.5.13) Breaks: libsmokeqt1-kde3 (<< 4:3.5.13) Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the @@ -144,7 +143,6 @@ Section: libdevel Replaces: libsmokeqt-kde3-dev (<< 4:3.5.13) Breaks: libsmokeqt-kde3-dev (<< 4:3.5.13) Depends: libsmokeqt1-trinity (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various TDE language bindings packages to provide interfaces to the diff --git a/ubuntu/maverick/tdebindings/debian/control.in b/ubuntu/maverick/tdebindings/debian/control.in index b9f3e717a..998cde21d 100644 --- a/ubuntu/maverick/tdebindings/debian/control.in +++ b/ubuntu/maverick/tdebindings/debian/control.in @@ -112,7 +112,6 @@ Package: libsmokeqt1 Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the @@ -124,7 +123,6 @@ Package: libsmokeqt-dev Architecture: any Section: libdevel Depends: libsmokeqt1 (= ${binary:Version}) -Conflicts: libqt-perl (<= 3.008-1) Description: SMOKE Binding Library to Qt - Development Files The "Scripting Meta Object Kompiler Engine" library is used by various KDE language bindings packages to provide interfaces to the |