From 7630e9320b102582a59a1deead8ca9718e31d0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 26 Dec 2013 03:32:26 +0100 Subject: Smoothing differences on Debian and Ubuntu --- debian/squeeze/applications/amarok/debian/control | 2 +- debian/squeeze/dependencies/libart-lgpl/debian/control | 2 ++ debian/squeeze/dependencies/libart-lgpl/debian/control.in | 2 ++ .../tdebindings/debian/libkorundum0-ruby1.8-trinity.install | 8 ++++---- .../tdebindings/debian/libqt0-ruby1.8-trinity.install | 12 ++++++------ 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'debian/squeeze') diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control index d91477739..cb2097748 100644 --- a/debian/squeeze/applications/amarok/debian/control +++ b/debian/squeeze/applications/amarok/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev, - ruby, ruby1.8-dev, + ruby, ruby-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://amarok.kde.org diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control b/debian/squeeze/dependencies/libart-lgpl/debian/control index 9a8bb0e78..f4b2021c4 100644 --- a/debian/squeeze/dependencies/libart-lgpl/debian/control +++ b/debian/squeeze/dependencies/libart-lgpl/debian/control @@ -17,9 +17,11 @@ Build-Depends: debhelper (>= 5), quilt, Package: libart-2.0-2 Architecture: any +Multi-Arch: same Section: libs Replaces: libart-2.0-2 (<< 4:14.0.0~) Breaks: libart-2.0-2 (<< 4:14.0.0~) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library of functions for 2D graphics - runtime files diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/control.in b/debian/squeeze/dependencies/libart-lgpl/debian/control.in index 4dc153450..e0b3f3a97 100644 --- a/debian/squeeze/dependencies/libart-lgpl/debian/control.in +++ b/debian/squeeze/dependencies/libart-lgpl/debian/control.in @@ -12,7 +12,9 @@ Build-Depends: debhelper (>= 5), quilt, Package: libart-2.0-2 Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library of functions for 2D graphics - runtime files diff --git a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install index fba8f1a13..ebec44d37 100644 --- a/debian/squeeze/tdebindings/debian/libkorundum0-ruby1.8-trinity.install +++ b/debian/squeeze/tdebindings/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/rbtdeconfig_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/tdebindings/debian/libqt0-ruby1.8-trinity.install b/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install index 60f10d40e..2f075b24e 100644 --- a/debian/squeeze/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/debian/squeeze/tdebindings/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/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/1.8/*/tqui.la +debian/tmp/opt/trinity/lib/ruby/*/*/tqui.so* +debian/tmp/opt/trinity/lib/ruby/*/*/tqui.la qtruby/ChangeLog /opt/trinity/share/doc/libqt0-ruby1.8 -- cgit v1.2.1