diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2009-01-20 02:51:03 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2009-01-20 02:51:03 (GMT) |
| commit | 7bf3a300b0967e0ada4c6db52cf6c5a790726398 (patch) | |
| tree | 8ae5c687e8c1cb0d4876318d0ef84872696bc5d7 | |
| parent | 89cff57ec1ea061379cd12dea1f0d9f42198953b (diff) | |
Declare dependencies in debian/rules (not debian/control{,in}), and drop old superfluous build-dependency cleanup.
| -rw-r--r-- | debian/control.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control.in b/debian/control.in index 6d35af6..0c72b58 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,7 @@ Homepage: http://wiki.laptop.org/go/Sugar Package: sugar-artwork Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core +Depends: ${shlibs:Depends}, ${misc:Depends}, ${cdbs:Depends} Recommends: sugar, ttf-dejavu-extra Description: Sugar graphical shell - artwork Sugar is a graphical user interface aimed at children. diff --git a/debian/rules b/debian/rules index 88f93ae..8f47190 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,8 @@ DEB_UPSTREAM_TARBALL_MD5 = cb0083f640835d34e07000c32819752e # xbase-clients is needed for xcursorgen for etch backport CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, python-empy, x11-apps | xbase-clients, icon-naming-utils (>= 0.8.2) -# Merge duplicate build-dependencies -CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//') +# Needed at runtime +CDBS_DEPENDS_sugar-artwork := ttf-dejavu-core # Merge duplicate build-dependencies include debian/cdbs/1/rules/package-relations.mk |