From a7c23fdb6173baa6d4a9a29896cc46e6cd5f6eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 17 Oct 2017 16:25:51 +0200 Subject: DEB: Add libgpod-dev as alternate dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit bedcf671340bd09af3231f07e0d4f1d8db77fdff) --- ubuntu/maverick/applications/amarok/debian/control | 2 +- ubuntu/maverick/applications/amarok/debian/control.in | 2 +- ubuntu/maverick/libraries/kipi-plugins/debian/control | 2 +- ubuntu/maverick/libraries/kipi-plugins/debian/control.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index b18800126..82cbff77b 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, bzip2, libtag1-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-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, + libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, libmp4v2-dev, ruby, ruby-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in index 8002fea07..1ef7aedcf 100644 --- a/ubuntu/maverick/applications/amarok/debian/control.in +++ b/ubuntu/maverick/applications/amarok/debian/control.in @@ -10,7 +10,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, lib libtag1-dev, libsqlite3-dev, libtunepimp-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, - libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, + libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev Standards-Version: 3.8.3 Homepage: http://amarok.kde.org diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control index 72e3d7504..44eafdba5 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/control +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, pkg-config, tdelibs14-trinity-dev, - libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev, + libexiv2-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev | libgpod-dev (>> 0.8.3-8), libtdepim1-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev, libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev, automake, autoconf, libtool, libltdl-dev diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in index f6fe7c2cf..6d5b73d92 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-config, tdelibs14-trinity-dev, - libexiv2-trinity-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev, + libexiv2-trinity-dev (>= 0.16), libgphoto2-2-dev, libgpod-nogtk-dev | libgpod-dev (>> 0.8.3-8), libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev, libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, tdepim-trinity-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev -- cgit v1.2.1