From d18205a11d3ea0734b06ac6740179f24b060ee75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 12 Sep 2013 01:31:34 +0200 Subject: Add variant dependency libgphoto2-6-dev for kipi-plugins on Debian and Ubuntu --- debian/squeeze/libraries/kipi-plugins/debian/TODO | 0 debian/squeeze/libraries/kipi-plugins/debian/changelog | 0 debian/squeeze/libraries/kipi-plugins/debian/compat | 0 debian/squeeze/libraries/kipi-plugins/debian/control | 2 +- debian/squeeze/libraries/kipi-plugins/debian/copyright | 0 .../libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install | 0 .../squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install | 0 .../squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages | 0 debian/squeeze/libraries/kipi-plugins/debian/patches/series | 0 debian/squeeze/libraries/kipi-plugins/debian/watch | 0 10 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/TODO mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/changelog mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/compat mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/copyright mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity-doc.install mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/patches/series mode change 100755 => 100644 debian/squeeze/libraries/kipi-plugins/debian/watch (limited to 'debian/squeeze') diff --git a/debian/squeeze/libraries/kipi-plugins/debian/TODO b/debian/squeeze/libraries/kipi-plugins/debian/TODO old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/changelog b/debian/squeeze/libraries/kipi-plugins/debian/changelog old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/compat b/debian/squeeze/libraries/kipi-plugins/debian/compat old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/control b/debian/squeeze/libraries/kipi-plugins/debian/control index 00381ab9a..035184286 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 Uploaders: Mark Purcell , Achim Bohnet , Fathi Boudra 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/debian/squeeze/libraries/kipi-plugins/debian/copyright b/debian/squeeze/libraries/kipi-plugins/debian/copyright old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.install old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages b/debian/squeeze/libraries/kipi-plugins/debian/kipi-plugins-trinity.manpages old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/patches/series b/debian/squeeze/libraries/kipi-plugins/debian/patches/series old mode 100755 new mode 100644 diff --git a/debian/squeeze/libraries/kipi-plugins/debian/watch b/debian/squeeze/libraries/kipi-plugins/debian/watch old mode 100755 new mode 100644 -- cgit v1.2.1 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/squeeze/applications/digikam/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/squeeze') diff --git a/debian/squeeze/applications/digikam/debian/control b/debian/squeeze/applications/digikam/debian/control index c333d83a3..67ba409c4 100644 --- a/debian/squeeze/applications/digikam/debian/control +++ b/debian/squeeze/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 bf2e9d0b09cee4ad673e381bd6513efa05d86fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 13 Sep 2013 17:21:54 +0200 Subject: Update dependencies ttf-* to fonts-* on Debian and Ubuntu --- debian/squeeze/tdeedu/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/squeeze') diff --git a/debian/squeeze/tdeedu/debian/control b/debian/squeeze/tdeedu/debian/control index 9b00cc54f..487e5c66d 100644 --- a/debian/squeeze/tdeedu/debian/control +++ b/debian/squeeze/tdeedu/debian/control @@ -220,7 +220,7 @@ Architecture: any Section: games Replaces: khangman-trinity (<< 4:14.0.0) Breaks: khangman-trinity (<< 4:14.0.0) -Depends: ${shlibs:Depends}, ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~) +Depends: ${shlibs:Depends}, fonts-dustin | ttf-dustin, tdeedu-data-trinity (>> ${KDE-Version3}~), tdeedu-data-trinity (<< ${KDE-Next-Version3}~) Suggests: khelpcenter-trinity, tdeedu-trinity-doc-html Description: the classical hangman game for Trinity KHangMan is a game based on the well known hangman game. It is aimed -- 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/squeeze/applications/kvirc/debian/kvirc-trinity.install | 2 +- debian/squeeze/applications/kvirc/debian/overrides/kvirc | 2 -- debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/squeeze/applications/kvirc/debian/overrides/kvirc create mode 100644 debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity (limited to 'debian/squeeze') diff --git a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install b/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install index 994dd3e0e..01777294f 100644 --- a/debian/squeeze/applications/kvirc/debian/kvirc-trinity.install +++ b/debian/squeeze/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/squeeze/applications/kvirc/debian/overrides/kvirc b/debian/squeeze/applications/kvirc/debian/overrides/kvirc deleted file mode 100644 index dc125fd2e..000000000 --- a/debian/squeeze/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/squeeze/applications/kvirc/debian/overrides/kvirc-trinity b/debian/squeeze/applications/kvirc/debian/overrides/kvirc-trinity new file mode 100644 index 000000000..8fc30d2e1 --- /dev/null +++ b/debian/squeeze/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