summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-11-20 17:23:59 +0100
committeralbator <albator@arcadia.vtf>2011-11-20 17:23:59 +0100
commit71fdcae08b6dbdb8137fa487ba850ce3d3e5f1e3 (patch)
tree5e80a48c312787a2b3578248a71b10ad13a39dcc /ubuntu/maverick
parent7d1695925f047c17da905d5f3f4dad9e4f0b26d0 (diff)
parent54fccaba6594ee33bfa574e9c47e992e38a5e472 (diff)
downloadtde-packaging-71fdcae08b6dbdb8137fa487ba850ce3d3e5f1e3.tar.gz
tde-packaging-71fdcae08b6dbdb8137fa487ba850ce3d3e5f1e3.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdeutils/debian/control2
-rw-r--r--ubuntu/maverick/twin-trinity.install (renamed from ubuntu/maverick/tdebase/debian/kwin-trinity.install)0
2 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdeutils/debian/control b/ubuntu/maverick/tdeutils/debian/control
index c33bf1354..a74b5d942 100644
--- a/ubuntu/maverick/tdeutils/debian/control
+++ b/ubuntu/maverick/tdeutils/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
Build-Depends: libasound2-dev, ia32-libs [amd64], cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev (>= 4:3.5.10), tdebase-trinity-dev (>= 4:3.5.10), libkonq4-trinity-dev (>= 4:3.5.10), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
-Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
+Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
Standards-Version: 3.8.4
Package: tdeutils-trinity
diff --git a/ubuntu/maverick/tdebase/debian/kwin-trinity.install b/ubuntu/maverick/twin-trinity.install
index 62d42f166..62d42f166 100644
--- a/ubuntu/maverick/tdebase/debian/kwin-trinity.install
+++ b/ubuntu/maverick/twin-trinity.install