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 --- ubuntu/precise/metapackages/kubuntu-meta/debian/control | 2 +- ubuntu/precise/metapackages/kubuntu-meta/desktop | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc | 1 - ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc | 1 - .../tdebindings/debian/libkorundum0-ruby1.8-trinity.install | 8 ++++---- .../tdebindings/debian/libqt0-ruby1.8-trinity.install | 12 ++++++------ 11 files changed, 11 insertions(+), 19 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/control b/ubuntu/precise/metapackages/kubuntu-meta/debian/control index 36eab07c5..add6683b2 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, x-ttcidfont-conf, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine Recommends: tdeio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/desktop index 5e6b2bcac..b1016a157 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop @@ -94,7 +94,6 @@ Packages used for X preconfiguration are just Recommends; removing them after in Fonts: - * x-ttcidfont-conf * ttf-bitstream-vera * ttf-dejavu # includes characters missing in Vera * ttf-freefont diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 index cdd7cceea..3e5fba0d9 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 @@ -76,7 +76,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa index e28c15bc0..030d93618 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa @@ -73,7 +73,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 index 0aa597238..52cd6a70e 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 @@ -77,7 +77,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 index 8b7c1e151..f24d7e4cf 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 @@ -77,7 +77,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia index 9795087f8..7c8954570 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia @@ -75,7 +75,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc index c33ba4840..1314826f1 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc @@ -75,7 +75,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc index e28c15bc0..030d93618 100644 --- a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc +++ b/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc @@ -73,7 +73,6 @@ ttf-freefont unzip usplash vorbis-tools -x-ttcidfont-conf xdg-user-dirs xkb-data xorg diff --git a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install b/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install index c250f2beb..ebec44d37 100644 --- a/ubuntu/precise/tdebindings/debian/libkorundum0-ruby1.8-trinity.install +++ b/ubuntu/precise/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.9.1/Korundum.rb -debian/tmp/opt/trinity/lib/ruby/1.9.1/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.9.1/*/korundum.so* -debian/tmp/opt/trinity/lib/ruby/1.9.1/*/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/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install b/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install index dc71eead5..2f075b24e 100644 --- a/ubuntu/precise/tdebindings/debian/libqt0-ruby1.8-trinity.install +++ b/ubuntu/precise/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.9.1/Qt/qtruby.rb -debian/tmp/opt/trinity/lib/ruby/1.9.1/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.9.1/*/qtruby.so* -debian/tmp/opt/trinity/lib/ruby/1.9.1/*/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.9.1/*/tqui.so* -debian/tmp/opt/trinity/lib/ruby/1.9.1/*/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 From 4de18bf3203e02dfd63013f8b89c64a5c0071cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 26 Dec 2013 16:08:33 +0100 Subject: Add libav-tools as alternate dependency on Debian and Ubuntu --- ubuntu/precise/applications/kmplayer/debian/control | 2 +- ubuntu/precise/applications/soundkonverter/debian/control | 2 +- ubuntu/precise/libraries/mlt/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/applications/kmplayer/debian/control b/ubuntu/precise/applications/kmplayer/debian/control index 7b87b17e9..f09dd1f1e 100644 --- a/ubuntu/precise/applications/kmplayer/debian/control +++ b/ubuntu/precise/applications/kmplayer/debian/control @@ -17,7 +17,7 @@ Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), libxine Replaces: kmplayer-kde3 (<< 4:14.0.0~), kmplayer-trinity (<< 4:14.0.0~) Breaks: kmplayer-kde3 (<< 4:14.0.0~), kmplayer-trinity (<< 4:14.0.0~) Recommends: kmplayer-plugin-trinity (= ${binary:Version}) -Suggests: ffmpeg, vdr, xawtv, mplayer +Suggests: libav-tools | ffmpeg, vdr, xawtv, mplayer Description: media player for Trinity A basic audio/video viewer application for Trinity. . diff --git a/ubuntu/precise/applications/soundkonverter/debian/control b/ubuntu/precise/applications/soundkonverter/debian/control index d52f20570..f322727a3 100644 --- a/ubuntu/precise/applications/soundkonverter/debian/control +++ b/ubuntu/precise/applications/soundkonverter/debian/control @@ -12,7 +12,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: soundkonverter-kde3 (<< 4:14.0.0~), soundkonverter-trinity (<< 4:14.0.0~) Breaks: soundkonverter-kde3 (<< 4:14.0.0~), soundkonverter-trinity (<< 4:14.0.0~) -Recommends: cdda2wav, cdparanoia, faad, ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack +Recommends: cdda2wav, cdparanoia, faad, libav-tools | ffmpeg, flac, tdemultimedia-tdeio-plugins-trinity, mp3gain, mplayer, mppenc, speex, timidity, vorbis-tools, vorbisgain, wavpack Suggests: soundkonverter-amarok-trinity Description: audio converter frontend for Trinity soundKonverter is a frontend to various audio converters. diff --git a/ubuntu/precise/libraries/mlt/debian/control b/ubuntu/precise/libraries/mlt/debian/control index 9df702f3a..6b29f3cf8 100644 --- a/ubuntu/precise/libraries/mlt/debian/control +++ b/ubuntu/precise/libraries/mlt/debian/control @@ -7,7 +7,7 @@ Homepage: http://mlt.sourceforge.net/ Standards-Version: 3.8.3 Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt, - libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev, + libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, libav-tools | ffmpeg, libflac-dev, libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev, libxinerama-dev, libxrandr-dev, libxrender-dev, libavformat-dev, libswscale-dev, libasound2-dev, libsox-dev -- cgit v1.2.1