diff options
| author | François Andriot <[email protected]> | 2013-09-14 16:21:11 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2013-09-14 16:21:11 +0200 |
| commit | 885ee6bd7df327175b3dd2f71a441daec3d05ebe (patch) | |
| tree | a0dc6d794ff4f513da55b1eaccf9c859444d60d0 /ubuntu/maverick/applications | |
| 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/applications')
4 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control index ba871927f..e851cfee2 100644 --- a/ubuntu/maverick/applications/digikam/debian/control +++ b/ubuntu/maverick/applications/digikam/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <[email protected]> XSBC-Original-Maintainer: Debian KDE Extras Team <[email protected]> Uploaders: Achim Bohnet <[email protected]>, Mark Purcell <[email protected]>, Fathi Boudra <[email protected]> Build-Depends: cdbs, debhelper (>= 5), tdelibs14-trinity-dev, - libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev, + libtiff-dev, libgphoto2-6-dev | libgphoto2-2-dev, libkipi0-trinity-dev, libsqlite3-dev, liblcms1-dev, libkexiv2-3-trinity-dev (>= 0.1.6), libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev, libkdcraw3-trinity-dev (>= 0.1.4), diff --git a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install index 994dd3e0e..01777294f 100644 --- a/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install +++ b/ubuntu/maverick/applications/kvirc/debian/kvirc-trinity.install @@ -1,4 +1,4 @@ -debian/overrides/kvirc usr/share/lintian/overrides +debian/overrides/kvirc-trinity usr/share/lintian/overrides debian/tmp/opt/trinity/bin/kvirc debian/tmp/opt/trinity/lib/*.so.* debian/tmp/opt/trinity/lib/kvirc/*/modules/*.so diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc deleted file mode 100644 index dc125fd2e..000000000 --- a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc +++ /dev/null @@ -1,2 +0,0 @@ -kvirc: binary-without-manpage kvirc -kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm diff --git a/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity new file mode 100644 index 000000000..8fc30d2e1 --- /dev/null +++ b/ubuntu/maverick/applications/kvirc/debian/overrides/kvirc-trinity @@ -0,0 +1,2 @@ +kvirc-trinity: binary-without-manpage kvirc +kvirc-trinity: menu-icon-missing /opt/trinity/share/icons/hicolor/32x32/apps/kvirc.xpm |