diff options
author | François Andriot <albator78@libertysurf.fr> | 2013-09-14 16:21:11 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2013-09-14 16:21:11 +0200 |
commit | 885ee6bd7df327175b3dd2f71a441daec3d05ebe (patch) | |
tree | a0dc6d794ff4f513da55b1eaccf9c859444d60d0 /ubuntu/maverick/libraries | |
parent | a89bfaa6c8ee648f38797165346971c15da15875 (diff) | |
parent | 6d234b4fb38f9342c6aeceb9dbb5c238b77199e7 (diff) | |
download | tde-packaging-885ee6bd7df327175b3dd2f71a441daec3d05ebe.tar.gz tde-packaging-885ee6bd7df327175b3dd2f71a441daec3d05ebe.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/libraries')
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/TODO | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/changelog | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/compat | 0 | ||||
-rw-r--r-- | ubuntu/maverick/libraries/kipi-plugins/debian/control | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/copyright | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.install | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/patches/series | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/libraries/kipi-plugins/debian/watch | 0 |
10 files changed, 1 insertions, 1 deletions
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 0ba259e3b..0ba259e3b 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 6987ef291..9201c9bf6 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, 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/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 |