Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

12 files changed, 6 insertions, 12 deletions

diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control
index beb69a2c1..4269bdb6b 100644
--- a/debian/lenny/tdenetwork/debian/control
+++ b/debian/lenny/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules
index 539d5a557..b84b9ba5d 100755
--- a/debian/lenny/tdenetwork/debian/rules
+++ b/debian/lenny/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control
index beb69a2c1..4269bdb6b 100644
--- a/debian/squeeze/tdenetwork/debian/control
+++ b/debian/squeeze/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/debian/squeeze/tdenetwork/debian/rules b/debian/squeeze/tdenetwork/debian/rules
index 0547a69be..51643631e 100755
--- a/debian/squeeze/tdenetwork/debian/rules
+++ b/debian/squeeze/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/debian/wheezy/tdenetwork/debian/control b/debian/wheezy/tdenetwork/debian/control
index beb69a2c1..4269bdb6b 100644
--- a/debian/wheezy/tdenetwork/debian/control
+++ b/debian/wheezy/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/debian/wheezy/tdenetwork/debian/rules b/debian/wheezy/tdenetwork/debian/rules
index 0547a69be..51643631e 100755
--- a/debian/wheezy/tdenetwork/debian/rules
+++ b/debian/wheezy/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index 4221bcc7e..b4abe6a1b 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules
index 0547a69be..51643631e 100755
--- a/ubuntu/maverick/tdenetwork/debian/rules
+++ b/ubuntu/maverick/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/ubuntu/precise/tdenetwork/debian/control b/ubuntu/precise/tdenetwork/debian/control
index 4221bcc7e..b4abe6a1b 100644
--- a/ubuntu/precise/tdenetwork/debian/control
+++ b/ubuntu/precise/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/ubuntu/precise/tdenetwork/debian/rules b/ubuntu/precise/tdenetwork/debian/rules
index 0547a69be..51643631e 100755
--- a/ubuntu/precise/tdenetwork/debian/rules
+++ b/ubuntu/precise/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \
diff --git a/ubuntu/raring/tdenetwork/debian/control b/ubuntu/raring/tdenetwork/debian/control
index 4221bcc7e..b4abe6a1b 100644
--- a/ubuntu/raring/tdenetwork/debian/control
+++ b/ubuntu/raring/tdenetwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdenetwork-trinity
diff --git a/ubuntu/raring/tdenetwork/debian/rules b/ubuntu/raring/tdenetwork/debian/rules
index 0547a69be..51643631e 100755
--- a/ubuntu/raring/tdenetwork/debian/rules
+++ b/ubuntu/raring/tdenetwork/debian/rules
@@ -36,7 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DBUILD_ALL="ON" \
- -DWITH_WEBCAM="ON" \
  -DWITH_ARTS="ON" \
  -DWITH_SLP="ON" \
  -DBUILD_KOPETE_PROTOCOL_ALL="ON" \