[SCM] Debian packaging of libhtml-wikiconverter-dokuwiki-perl branch, master, updated. 8df7053f156d69a522eabf1279a6e9a5c8a3c9b5

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 3d63a9e2f4330e5c2989d248c9dfcee9b62e8fbc
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jan 8 16:20:14 2012 +0100

    Modernize CDBS usage: Declare binary dpendency in rules file. Recursively expand variables. Stop cleaning build-dependencies (done in cdbs now).

diff --git a/debian/control.in b/debian/control.in
index 13002bb..56f2340 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Package: libhtml-wikiconverter-dokuwiki-perl
 Architecture: all
 Depends: ${perl:Depends},
  ${misc:Depends},
- libhtml-wikiconverter-perl (>= 0.53)
+ ${cdbs:Depends}
 Provides: libhtml-wikiconverter-dialect
 Breaks: libhtml-wikiconverter-perl (<< 0.50)
 Replaces: libhtml-wikiconverter-perl (<< 0.50)
diff --git a/debian/rules b/debian/rules
index 8463824..76dd6f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,10 @@ DEB_UPSTREAM_URL = http://www.cpan.org/modules/by-module/HTML
 DEB_UPSTREAM_TARBALL_MD5 = 74f5cd1382962ca5d24a39dd6b15059d
 
 # Needed both by upstream build process and at runtime
-#TODO: Automatically include these as dependencies to debian/control
-dependencies = libhtml-wikiconverter-perl (>= 0.53)
+depends = libhtml-wikiconverter-perl (>= 0.53)
 
-# Needed by upstream build process
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), $(dependencies), libtest-simple-perl
-# Additional undocumented upstream needs
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
+CDBS_BUILD_DEPENDS += , $(depends), libtest-simple-perl
+# TODO: suggest upstream to document below needs
+CDBS_BUILD_DEPENDS += , libfile-spec-perl, libhtml-parser-perl, libtest-pod-perl (>= 1.14), libtest-pod-coverage-perl (>= 1.04)
 
-# Fix double cdbs 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/ *, *$$//')
+CDBS_DEPENDS_DEFAULT = $(depends)

-- 
Debian packaging of libhtml-wikiconverter-dokuwiki-perl