From 79d255da7daea2dd8aafcf8185d4d336d3b6ed1f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 21 Sep 2012 17:04:10 -0500 Subject: [PATCH] Fix tdebindings FTBFS on Debian and Ubuntu with Ruby 1.9.x (cherry picked from commit b69c33307acf825aa014b4ccf6b32a4df844badf) --- .../debian/libkorundum0-ruby1.8-trinity.install | 8 ++++---- .../debian/libqt0-ruby1.8-trinity.install | 12 ++++++------ .../debian/libkorundum0-ruby1.8-trinity.install | 8 ++++---- .../debian/libqt0-ruby1.8-trinity.install | 12 ++++++------ .../debian/libkorundum0-ruby1.8-trinity.install | 8 ++++---- .../debian/libqt0-ruby1.8-trinity.install | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/debian/lenny/kdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/lenny/kdebindings/debian/libkorundum0-ruby1.8-trinity.install index 0571e4c10..d34b2b006 100644 --- a/debian/lenny/kdebindings/debian/libkorundum0-ruby1.8-trinity.install +++ b/debian/lenny/kdebindings/debian/libkorundum0-ruby1.8-trinity.install @@ -3,10 +3,10 @@ debian/tmp/opt/trinity/bin/rbkdeapi debian/tmp/opt/trinity/bin/krubyinit debian/tmp/opt/trinity/bin/rbkconfig_compiler -debian/tmp/opt/trinity/lib/ruby/1.8/Korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/KDE/korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.la +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8 diff --git a/debian/lenny/kdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/lenny/kdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..91bc7c692 100644 --- a/debian/lenny/kdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/debian/lenny/kdebindings/debian/libqt0-ruby1.8-trinity.install @@ -3,13 +3,13 @@ debian/tmp/opt/trinity/bin/rbqtapi debian/tmp/opt/trinity/bin/rbuic debian/tmp/opt/trinity/bin/qtrubyinit -debian/tmp/opt/trinity/lib/ruby/1.8/Qt/qtruby.rb -debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb +debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb +debian/tmp/opt/trinity/lib/ruby/*/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/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/ruby/*/*/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/*/*/qui.so* +debian/tmp/opt/trinity/lib/ruby/*/*/qui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 diff --git a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install index 0571e4c10..d34b2b006 100644 --- a/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install +++ b/debian/squeeze/kdebindings/debian/libkorundum0-ruby1.8-trinity.install @@ -3,10 +3,10 @@ debian/tmp/opt/trinity/bin/rbkdeapi debian/tmp/opt/trinity/bin/krubyinit debian/tmp/opt/trinity/bin/rbkconfig_compiler -debian/tmp/opt/trinity/lib/ruby/1.8/Korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/KDE/korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.la +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8 diff --git a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..91bc7c692 100644 --- a/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/debian/squeeze/kdebindings/debian/libqt0-ruby1.8-trinity.install @@ -3,13 +3,13 @@ debian/tmp/opt/trinity/bin/rbqtapi debian/tmp/opt/trinity/bin/rbuic debian/tmp/opt/trinity/bin/qtrubyinit -debian/tmp/opt/trinity/lib/ruby/1.8/Qt/qtruby.rb -debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb +debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb +debian/tmp/opt/trinity/lib/ruby/*/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/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/ruby/*/*/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/*/*/qui.so* +debian/tmp/opt/trinity/lib/ruby/*/*/qui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 diff --git a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install index 0571e4c10..d34b2b006 100644 --- a/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install +++ b/ubuntu/maverick/kdebindings/debian/libkorundum0-ruby1.8-trinity.install @@ -3,10 +3,10 @@ debian/tmp/opt/trinity/bin/rbkdeapi debian/tmp/opt/trinity/bin/krubyinit debian/tmp/opt/trinity/bin/rbkconfig_compiler -debian/tmp/opt/trinity/lib/ruby/1.8/Korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/KDE/korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/Korundum.rb +debian/tmp/opt/trinity/lib/ruby/*/KDE/korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/korundum.la +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.so* +debian/tmp/opt/trinity/lib/ruby/*/*/korundum.la korundum/ChangeLog /opt/trinity/share/doc/libkorundum0-ruby1.8 diff --git a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install index a1b654969..91bc7c692 100644 --- a/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/maverick/kdebindings/debian/libqt0-ruby1.8-trinity.install @@ -3,13 +3,13 @@ debian/tmp/opt/trinity/bin/rbqtapi debian/tmp/opt/trinity/bin/rbuic debian/tmp/opt/trinity/bin/qtrubyinit -debian/tmp/opt/trinity/lib/ruby/1.8/Qt/qtruby.rb -debian/tmp/opt/trinity/lib/ruby/1.8/Qt.rb +debian/tmp/opt/trinity/lib/ruby/*/Qt/qtruby.rb +debian/tmp/opt/trinity/lib/ruby/*/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/*/*/qtruby.so* +debian/tmp/opt/trinity/lib/ruby/*/*/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/*/*/qui.so* +debian/tmp/opt/trinity/lib/ruby/*/*/qui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8