From 7b6b0006d01cde7dd093752a9aad1154b5eaf4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 12 Sep 2013 03:01:45 +0200 Subject: Add variant dependency libgphoto2-6-dev for digikam on Debian and Ubuntu --- debian/wheezy/applications/digikam/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/wheezy/applications') diff --git a/debian/wheezy/applications/digikam/debian/control b/debian/wheezy/applications/digikam/debian/control index c333d83a3..67ba409c4 100644 --- a/debian/wheezy/applications/digikam/debian/control +++ b/debian/wheezy/applications/digikam/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra 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), -- cgit v1.2.1 From 6d234b4fb38f9342c6aeceb9dbb5c238b77199e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 14 Sep 2013 15:57:37 +0200 Subject: Fix kvirc lintian overrides on Debian and Ubuntu --- debian/wheezy/applications/kvirc/debian/kvirc-trinity.install | 2 +- debian/wheezy/applications/kvirc/debian/overrides/kvirc | 2 -- debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/wheezy/applications/kvirc/debian/overrides/kvirc create mode 100644 debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity (limited to 'debian/wheezy/applications') diff --git a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install b/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install index 994dd3e0e..01777294f 100644 --- a/debian/wheezy/applications/kvirc/debian/kvirc-trinity.install +++ b/debian/wheezy/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/debian/wheezy/applications/kvirc/debian/overrides/kvirc b/debian/wheezy/applications/kvirc/debian/overrides/kvirc deleted file mode 100644 index dc125fd2e..000000000 --- a/debian/wheezy/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/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity b/debian/wheezy/applications/kvirc/debian/overrides/kvirc-trinity new file mode 100644 index 000000000..8fc30d2e1 --- /dev/null +++ b/debian/wheezy/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 -- cgit v1.2.1