diff options
author | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
---|---|---|
committer | Francois Andriot <francois.andriot@free.fr> | 2011-12-10 00:52:28 +0100 |
commit | 0b0d138bbc895c01e392bf3fd6c4e916a86935a5 (patch) | |
tree | 3bd01a9b7276d77c891e2f1d061c121599f00a7f /ubuntu/maverick/tdebindings | |
parent | 4368359c6192aaff174d4ec6fde1a8ae0682defa (diff) | |
parent | 947e6baf2df5b3171900c9acd928f06e0da77ac9 (diff) | |
download | tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.tar.gz tde-packaging-0b0d138bbc895c01e392bf3fd6c4e916a86935a5.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/changelog | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdebindings/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/tdebindings/debian/changelog b/ubuntu/maverick/tdebindings/debian/changelog index 6d5413584..64d2d34ae 100644 --- a/ubuntu/maverick/tdebindings/debian/changelog +++ b/ubuntu/maverick/tdebindings/debian/changelog @@ -483,7 +483,7 @@ tdebindings (4:3.2.92-1) unstable; urgency=low was accepted upstream. * debian/libkjsembed1.install: install the qprocess kjsembed plugin. * debian/rules: disable the python directory, as sip, pyqt and - pykde are all packaged in Debian already. + pytde are all packaged in Debian already. * debian/control: added the libsmokekde1, libsmokekde-dev, libkorundum-ruby1.8 and libqtruby-ruby1.8 packages because of upstream additions. diff --git a/ubuntu/maverick/tdebindings/debian/control b/ubuntu/maverick/tdebindings/debian/control index aae3c4feb..f16386120 100644 --- a/ubuntu/maverick/tdebindings/debian/control +++ b/ubuntu/maverick/tdebindings/debian/control @@ -2,7 +2,7 @@ Source: tdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], - tdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), + tdelibs4-trinity-dev (>= 4:3.5.9), libtqt3-compat-headers (>= 3:3.3.5), ruby, ruby1.8-dev, flex, bison, automake, autoconf, libtool, libltdl-dev Section: devel diff --git a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..60f10d40e 100644 --- a/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/maverick/tdebindings/debian/libqt0-ruby1.8-trinity.install @@ -9,7 +9,7 @@ debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.so* debian/tmp/opt/trinity/lib/ruby/1.8/*/qtruby.la -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/qui.la +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.so* +debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 |