Add variant dependency libgphoto2-6-dev for kipi-plugins on Debian and Ubuntu

(cherry picked from commit d18205a11d3ea0734b06ac6740179f24b060ee75)

33 files changed, 3 insertions, 3 deletions

diff --git a/debian/lenny/libraries/kipi-plugins/debian/TODO b/debian/lenny/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/TODO
+++ b/debian/lenny/libraries/kipi-plugins/debian/TODO
diff --git a/debian/lenny/libraries/kipi-plugins/debian/changelog b/debian/lenny/libraries/kipi-plugins/debian/changelog
index 20dc96c92..20dc96c92 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/changelog
+++ b/debian/lenny/libraries/kipi-plugins/debian/changelog
diff --git a/debian/lenny/libraries/kipi-plugins/debian/compat b/debian/lenny/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/compat
+++ b/debian/lenny/libraries/kipi-plugins/debian/compat
diff --git a/debian/lenny/libraries/kipi-plugins/debian/control b/debian/lenny/libraries/kipi-plugins/debian/control
index 5293d737c..e7c74cef9 100755..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 (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, kdepim-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 2593bb2d6..2593bb2d6 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/control.in
+++ b/debian/lenny/libraries/kipi-plugins/debian/control.in
diff --git a/debian/lenny/libraries/kipi-plugins/debian/copyright b/debian/lenny/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/copyright
+++ b/debian/lenny/libraries/kipi-plugins/debian/copyright
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/lenny/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/lenny/libraries/kipi-plugins/debian/patches/series b/debian/lenny/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/patches/series
+++ b/debian/lenny/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/lenny/libraries/kipi-plugins/debian/watch b/debian/lenny/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/debian/lenny/libraries/kipi-plugins/debian/watch
+++ b/debian/lenny/libraries/kipi-plugins/debian/watch
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/TODO b/debian/squeeze/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/TODO
+++ b/debian/squeeze/libraries/kipi-plugins/debian/TODO
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/squeeze/libraries/kipi-plugins/debian/changelog
index 20dc96c92..20dc96c92 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/changelog
+++ b/debian/squeeze/libraries/kipi-plugins/debian/changelog
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/compat b/debian/squeeze/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/compat
+++ b/debian/squeeze/libraries/kipi-plugins/debian/compat
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control
index 5293d737c..e7c74cef9 100755..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 (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, kdepim-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 2593bb2d6..2593bb2d6 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/control.in
+++ b/debian/squeeze/libraries/kipi-plugins/debian/control.in
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/copyright b/debian/squeeze/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/copyright
+++ b/debian/squeeze/libraries/kipi-plugins/debian/copyright
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/patches/series b/debian/squeeze/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/patches/series
+++ b/debian/squeeze/libraries/kipi-plugins/debian/patches/series
diff --git a/debian/squeeze/libraries/kipi-plugins/debian/watch b/debian/squeeze/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/debian/squeeze/libraries/kipi-plugins/debian/watch
+++ b/debian/squeeze/libraries/kipi-plugins/debian/watch
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/TODO b/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
index 20dc96c92..20dc96c92 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/compat b/ubuntu/maverick/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index 32191bb7f..82f978bc7 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 (>= 5), quilt, pkg-config, kdelibs4-trinity-dev,
- libexiv2-dev, libgphoto2-2-dev, libgpod-nogtk-dev,
+ libexiv2-dev, libgphoto2-6-dev | libgphoto2-2-dev, libgpod-nogtk-dev,
  libkcal2-trinity-dev, libkdcraw3-trinity-dev, libkexiv2-3-trinity-dev,
  libkipi0-trinity-dev, libtiff-dev, libxslt1-dev, kdepim-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 2593bb2d6..2593bb2d6 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright b/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series b/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/watch b/ubuntu/maverick/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/watch