Author: jamessan
Date: 2008-05-04 14:36:53 +0000 (Sun, 04 May 2008)
New Revision: 1428
Modified:
trunk/debian/changelog
trunk/scripts/mk-build-deps.pl
Log:
* mk-build-deps:
+ Fix Depends generation when both Build-Depends and Build-Depends-Indep
exist so that the last package of the former and the first package of
the latter are not listed as one concatenated string.
+ Use the Source package name instead of the first listed Binary package
when parsing a control file.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-03 19:44:24 UTC (rev 1427)
+++ trunk/debian/changelog 2008-05-04 14:36:53 UTC (rev 1428)
@@ -1,9 +1,18 @@
devscripts (2.10.28) UNRELEASED; urgency=low
+ [ Adam D. Barratt ]
* checkbashisms:
+ Also match use of "SHELL=/bin/bash -e" when checking whether a makefile
explicitly uses bash
+ [ James Vega ]
+ * mk-build-deps:
+ + Fix Depends generation when both Build-Depends and Build-Depends-Indep
+ exist so that the last package of the former and the first package of
+ the latter are not listed as one concatenated string.
+ + Use the Source package name instead of the first listed Binary package
+ when parsing a control file.
+
-- Adam D. Barratt <[EMAIL PROTECTED]> Sat, 03 May 2008 19:59:06 +0100
devscripts (2.10.27) unstable; urgency=low
Modified: trunk/scripts/mk-build-deps.pl
===================================================================
--- trunk/scripts/mk-build-deps.pl 2008-05-03 19:44:24 UTC (rev 1427)
+++ trunk/scripts/mk-build-deps.pl 2008-05-04 14:36:53 UTC (rev 1428)
@@ -100,14 +100,14 @@
}
while (<CONTROL>) {
- if (/^Package:\s*(\S+)/ && !$name) {
+ if (/^(?:Package|Source):\s*(\S+)/ && !$name) {
$name = $1;
}
if (/^Version:\s*(\S+)/) {
$version = $1;
}
if (/^Build-Depends(?:-Indep)?:\s*(.*)/) {
- $build_deps .= $1;
+ $build_deps .= $build_deps ? ", $1" : $1;
$last_line_build_deps = 1;
}
elsif (/^(\S+):/) {
--
To unsubscribe, send mail to [EMAIL PROTECTED]
