diff options
author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:34:34 +0200 |
---|---|---|
committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:34:34 +0200 |
commit | f1065956438b52a10eacdedce863b1add3ea0261 (patch) | |
tree | 1c596a215f03e7d8df9a0bd41359559f7f7394ee /ubuntu/maverick/tdewebdev/debian | |
parent | dcfb68136c0561ba4bcbef1336ff6f02b49c8900 (diff) | |
parent | ef580fce6c65aad3c25ee7023f2047d865933281 (diff) | |
download | tde-packaging-f1065956438b52a10eacdedce863b1add3ea0261.tar.gz tde-packaging-f1065956438b52a10eacdedce863b1add3ea0261.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdewebdev/debian')
-rw-r--r-- | ubuntu/maverick/tdewebdev/debian/control | 2 | ||||
-rw-r--r-- | ubuntu/maverick/tdewebdev/debian/control.in | 4 | ||||
-rwxr-xr-x | ubuntu/maverick/tdewebdev/debian/rules | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdewebdev/debian/control b/ubuntu/maverick/tdewebdev/debian/control index b306cdb69..542f7f514 100644 --- a/ubuntu/maverick/tdewebdev/debian/control +++ b/ubuntu/maverick/tdewebdev/debian/control @@ -171,7 +171,7 @@ Architecture: any Section: libdevel Replaces: kommander-trinity-dev (<< 4:14.0.0) Breaks: kommander-trinity-dev (<< 4:14.0.0) -Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev (>= 4:3.5.8) +Depends: kommander-trinity (= ${binary:Version}), tdelibs4-dev Description: development files for Kommander [Trinity] This package contains the headers and other development files for building plugins or otherwise extending Kommander. diff --git a/ubuntu/maverick/tdewebdev/debian/control.in b/ubuntu/maverick/tdewebdev/debian/control.in index cbc4129c9..aa1dcb562 100644 --- a/ubuntu/maverick/tdewebdev/debian/control.in +++ b/ubuntu/maverick/tdewebdev/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: @@@MAINTAINER@@@ Uploaders: @@@UPLOADERS@@@ -Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev (>= 4:3.5.8), libcvsservice-dev (>= 4:3.5.8), libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-dev, libcvsservice-dev, libreadline5-dev, libxml2-dev, libxslt1-dev, sharutils, texinfo Standards-Version: 3.7.2 Package: tdewebdev @@ -157,7 +157,7 @@ Description: visual dialog builder and executor tool Package: kommander-dev Architecture: any Section: libdevel -Depends: kommander (= ${Source-Version}), tdelibs4-dev (>= 4:3.5.8) +Depends: kommander (= ${Source-Version}), tdelibs4-dev Replaces: kommander (<< 1:3.3.0) Description: development files for Kommander This package contains the headers and other development files for diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules index 888f66bcf..5a5ea2fd9 100755 --- a/ubuntu/maverick/tdewebdev/debian/rules +++ b/ubuntu/maverick/tdewebdev/debian/rules @@ -30,7 +30,5 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdewebdev-trinity-dbg PACKAGES_WITH_LIBS := kommander-trinity -DEB_DH_MAKESHLIBS_ARGS_kommander-trinity := -V'kommander-trinity (>= 4:3.5.8-1)' - #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))')) |