DEB: Add libgpod-dev as alternate dependency

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit bedcf671340bd09af3231f07e0d4f1d8db77fdff)

12 files changed, 12 insertions, 12 deletions

diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control
index 316e5c82a..50dd293db 100644
--- a/debian/lenny/applications/amarok/debian/control
+++ b/debian/lenny/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,
+ libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev,
  ruby, ruby1.8-dev,
  automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
diff --git a/debian/lenny/applications/amarok/debian/control.in b/debian/lenny/applications/amarok/debian/control.in
index 8002fea07..1ef7aedcf 100644
--- a/debian/lenny/applications/amarok/debian/control.in
+++ b/debian/lenny/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/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
index fbc4dff11..e859463bb 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/control
+++ b/debian/lenny/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 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/debian/lenny/libraries/kipi-plugins/debian/control.in b/debian/lenny/libraries/kipi-plugins/debian/control.in
index f6fe7c2cf..6d5b73d92 100644
--- a/debian/lenny/libraries/kipi-plugins/debian/control.in
+++ b/debian/lenny/libraries/kipi-plugins/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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
diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control
index cdd7a423b..df52eb98b 100644
--- a/debian/squeeze/applications/amarok/debian/control
+++ b/debian/squeeze/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/debian/squeeze/applications/amarok/debian/control.in b/debian/squeeze/applications/amarok/debian/control.in
index 8002fea07..1ef7aedcf 100644
--- a/debian/squeeze/applications/amarok/debian/control.in
+++ b/debian/squeeze/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/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index fbc4dff11..e859463bb 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 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/debian/squeeze/libraries/kipi-plugins/debian/control.in b/debian/squeeze/libraries/kipi-plugins/debian/control.in
index f6fe7c2cf..6d5b73d92 100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control.in
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 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
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 <kb9vqf@pearsoncomputing.net>
 Uploaders: Mark Purcell <msp@debian.org>, Achim Bohnet <ach@mpe.mpg.de>, Fathi Boudra <fabo@debian.org>
 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 <kb9vqf@pearsoncomputing.net>
 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