summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/libraries/kipi-plugins
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-14 16:21:11 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-14 16:21:11 +0200
commit885ee6bd7df327175b3dd2f71a441daec3d05ebe (patch)
treea0dc6d794ff4f513da55b1eaccf9c859444d60d0 /ubuntu/precise/libraries/kipi-plugins
parenta89bfaa6c8ee648f38797165346971c15da15875 (diff)
parent6d234b4fb38f9342c6aeceb9dbb5c238b77199e7 (diff)
downloadtde-packaging-885ee6bd7df327175b3dd2f71a441daec3d05ebe.tar.gz
tde-packaging-885ee6bd7df327175b3dd2f71a441daec3d05ebe.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/libraries/kipi-plugins')
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/TODO0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/changelog0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/compat0
-rw-r--r--ubuntu/precise/libraries/kipi-plugins/debian/control2
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/copyright0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/patches/series0
-rw-r--r--[-rwxr-xr-x]ubuntu/precise/libraries/kipi-plugins/debian/watch0
10 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/TODO b/ubuntu/precise/libraries/kipi-plugins/debian/TODO
index d5025974d..d5025974d 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/TODO
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/TODO
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/changelog b/ubuntu/precise/libraries/kipi-plugins/debian/changelog
index 0ba259e3b..0ba259e3b 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/changelog
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/changelog
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/compat b/ubuntu/precise/libraries/kipi-plugins/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/compat
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/compat
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/control b/ubuntu/precise/libraries/kipi-plugins/debian/control
index 6987ef291..9201c9bf6 100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/control
+++ b/ubuntu/precise/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, tdelibs14-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, tdepim-trinity-dev,
automake, autoconf, libtool, libltdl-dev
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/copyright b/ubuntu/precise/libraries/kipi-plugins/debian/copyright
index 3df46fc7f..3df46fc7f 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/copyright
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/copyright
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
index c7200473e..c7200473e 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
index b01d3720f..b01d3720f 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.install
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
index 9d593ba97..9d593ba97 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/patches/series b/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
index e69de29bb..e69de29bb 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/patches/series
diff --git a/ubuntu/precise/libraries/kipi-plugins/debian/watch b/ubuntu/precise/libraries/kipi-plugins/debian/watch
index 8e5bdb026..8e5bdb026 100755..100644
--- a/ubuntu/precise/libraries/kipi-plugins/debian/watch
+++ b/ubuntu/precise/libraries/kipi-plugins/debian/watch