summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:47 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:47 +0200
commita0e2d0cf3fcbc04c9221ca968273cbe61038da5d (patch)
treef23abe48c2574d5969ddb19b6a84cb1ab98d06f0 /ubuntu
parent693e9a10c0362708a18799f301e8e68752e3b376 (diff)
parentc526db419dbbe13ce103f6cf4dab723664e54dbf (diff)
downloadtde-packaging-a0e2d0cf3fcbc04c9221ca968273cbe61038da5d.tar.gz
tde-packaging-a0e2d0cf3fcbc04c9221ca968273cbe61038da5d.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdenetwork/debian/control2
-rwxr-xr-xubuntu/maverick/tdenetwork/debian/rules1
-rw-r--r--ubuntu/precise/tdenetwork/debian/control2
-rwxr-xr-xubuntu/precise/tdenetwork/debian/rules1
-rw-r--r--ubuntu/raring/tdenetwork/debian/control2
-rwxr-xr-xubuntu/raring/tdenetwork/debian/rules1
6 files changed, 3 insertions, 6 deletions
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" \