The branch, master has been updated
via 0231fa0b4c6aa53b56f06eff6b8019ed26ff5312 (commit)
via dd02ee54cd9fbc1ac7f01697c62d3f1a5f3a41cc (commit)
from 7e14209afdef74f983590bd1b68a79b78bcb70fd (commit)
- Shortlog ------------------------------------------------------------
0231fa0 dpkg-checkbuilddeps: add -d and -c options to override
build-depends/conflicts
dd02ee5 dpkg-genchanges: add a new warning
Summary of changes:
ChangeLog | 10 ++++++++
debian/changelog | 6 ++++
man/dpkg-checkbuilddeps.1 | 6 ++++
scripts/dpkg-checkbuilddeps.pl | 50 +++++++++++++++++++++++----------------
scripts/dpkg-genchanges.pl | 8 +++++-
5 files changed, 58 insertions(+), 22 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 0231fa0b4c6aa53b56f06eff6b8019ed26ff5312
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Sat Jan 19 22:55:01 2008 +0100
dpkg-checkbuilddeps: add -d and -c options to override
build-depends/conflicts
* scripts/dpkg-checkbuilddeps.pl: Add support of options -d and -c to use
build dependencies/conflicts given on the command line instead of those
retrieved from debian/control.
* man/dpkg-checkbuilddeps.1: Document the new options.
diff --git a/ChangeLog b/ChangeLog
index 3f8ace6..69c26cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
* scripts/dpkg-genchanges.pl: Warn if the current version is
smaller than the previous one.
+ * scripts/dpkg-checkbuilddeps.pl: Add support of options -d and -c to
use
+ build dependencies/conflicts given on the command line instead of those
+ retrieved from debian/control.
+ * man/dpkg-checkbuilddeps.1: Document the new options.
+
2008-01-22 Guillem Jover <[EMAIL PROTECTED]>
* dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy
diff --git a/debian/changelog b/debian/changelog
index b6359fa..d554e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dpkg (1.14.17) UNRELEASED; urgency=low
[ Raphael Hertzog ]
* Add a warning displayed by dpkg-genchanges if the current version is
smaller than the previous one. Closes: #4655
+ * Add -d and -c options in dpkg-checkbuilddeps to override
+ build-depends/conflicts. Closes: #114774
[ Updated manpages translations ]
* German (Helge Kreutzmann).
diff --git a/man/dpkg-checkbuilddeps.1 b/man/dpkg-checkbuilddeps.1
index 2214ced..96c7585 100644
--- a/man/dpkg-checkbuilddeps.1
+++ b/man/dpkg-checkbuilddeps.1
@@ -25,6 +25,12 @@ Change the location of the \fBdpkg\fR database. The default
location is
Ignore \fIBuild\-Depends\-Indep\fR lines. Use when no arch-indep packages will
be built.
.TP
+.BI "\-d " build-depends-string
+.TP
+.BI "\-c " build-conflicts-string
+Use the given build dependencies/conflicts instead of those contained in the
+debian/control file.
+.TP
.B \-h
Show the usage message and exit.
.
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 49338e4..e36919f 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -21,6 +21,10 @@ sub usage {
Options:
control-file control file to process (default: debian/control).
-B binary-only, ignore -Indep.
+ -d build-deps use given string as build dependencies instead of
+ retrieving them from control file
+ -c build-conf use given string for build conflicts instead of
+ retrieving them from control file
--admindir=<directory>
change the administrative directory.
-h show this help message.
@@ -29,8 +33,11 @@ Options:
my $binary_only=0;
my $want_help=0;
+my ($bd_value, $bc_value);
if (! GetOptions('-B' => \$binary_only,
'-h' => \$want_help,
+ '-d=s' => \$bd_value,
+ '-c=s' => \$bc_value,
'--admindir=s' => \$admindir)) {
usage();
exit(2);
@@ -46,30 +53,31 @@ my $control = Dpkg::Control->new($controlfile);
my $fields = $control->get_source();
my $facts = parse_status("$admindir/status");
-my (@unmet, @conflicts);
-
-push @unmet, build_depends('Implicit-Build-Depends',
- Dpkg::Deps::parse('build-essential'), $facts);
-if (defined($fields->{"Build-Depends"})) {
- push @unmet, build_depends('Build-Depends',
-
Dpkg::Deps::parse($fields->{"Build-Depends"},
- reduce_arch => 1), $facts);
-}
-if (defined($fields->{"Build-Conflicts"})) {
- push @conflicts, build_conflicts('Build-Conflicts',
-
Dpkg::Deps::parse($fields->{"Build-Conflicts"},
- reduce_arch => 1, union => 1),
$facts);
+unless (defined($bd_value) or defined($bc_value)) {
+ $bd_value = 'build-essential';
+ $bd_value .= ", " . $fields->{"Build-Depends"} if defined
$fields->{"Build-Depends"};
+ if (not $binary_only and defined $fields->{"Build-Depends-Indep"}) {
+ $bd_value .= ", " . $fields->{"Build-Depends-Indep"};
+ }
+ $bc_value = $fields->{"Build-Conflicts"} if defined
$fields->{"Build-Conflicts"};
+ if (not $binary_only and defined $fields->{"Build-Conflicts-Indep"}) {
+ if ($bc_value) {
+ $bc_value .= ", " . $fields->{"Build-Conflicts-Indep"};
+ } else {
+ $bc_value = $fields->{"Build-Conflicts-Indep"};
+ }
+ }
}
-if (! $binary_only && defined($fields->{"Build-Depends-Indep"})) {
- push @unmet, build_depends('Build-Depends-Indep',
-
Dpkg::Deps::parse($fields->{"Build-Depends-Indep"},
- reduce_arch => 1), $facts);
+my (@unmet, @conflicts);
+
+if ($bd_value) {
+ push @unmet, build_depends('Build-Depends/Build-Depends-Indep)',
+ Dpkg::Deps::parse($bd_value, reduce_arch => 1), $facts);
}
-if (! $binary_only && defined($fields->{"Build-Conflicts-Indep"})) {
- push @conflicts, build_conflicts('Build-Conflicts-Indep',
-
Dpkg::Deps::parse($fields->{"Build-Conflicts-Indep"},
- reduce_arch => 1, union => 1),
$facts);
+if ($bc_value) {
+ push @conflicts,
build_conflicts('Build-Conflicts/Build-Conflicts-Indep',
+ Dpkg::Deps::parse($bc_value, reduce_arch => 1, union => 1),
$facts);
}
if (@unmet) {
commit dd02ee54cd9fbc1ac7f01697c62d3f1a5f3a41cc
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date: Thu Jan 24 23:06:37 2008 +0100
dpkg-genchanges: add a new warning
* scripts/dpkg-genchanges.pl: Warn if the current version is
smaller than the previous one.
diff --git a/ChangeLog b/ChangeLog
index 73e4f2e..3f8ace6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-24 Raphael Hertzog <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-genchanges.pl: Warn if the current version is
+ smaller than the previous one.
+
2008-01-22 Guillem Jover <[EMAIL PROTECTED]>
* dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy
diff --git a/debian/changelog b/debian/changelog
index 1f7e0d0..b6359fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ dpkg (1.14.17) UNRELEASED; urgency=low
whatever's currently installed. Closes: #151540
Thanks to Colin Watson.
+ [ Raphael Hertzog ]
+ * Add a warning displayed by dpkg-genchanges if the current version is
+ smaller than the previous one. Closes: #4655
+
[ Updated manpages translations ]
* German (Helge Kreutzmann).
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index a908fb5..3071d24 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -18,7 +18,7 @@ use Dpkg::Cdata;
use Dpkg::Substvars;
use Dpkg::Vars;
use Dpkg::Changelog qw(parse_changelog);
-use Dpkg::Version qw(parseversion);
+use Dpkg::Version qw(parseversion compare_versions);
textdomain("dpkg-dev");
@@ -202,6 +202,12 @@ my $fields = Dpkg::Fields::Object->new();
$substvars->set_version_substvars($changelog->{"Version"});
$substvars->parse($varlistfile) if -e $varlistfile;
+if (defined($prev_changelog) and
+ compare_versions($changelog->{"Version"}, '<',
$prev_changelog->{"Version"})) {
+ warning(_g("the current version (%s) is smaller than the previous one
(%s)"),
+ $changelog->{"Version"}, $prev_changelog->{"Version"});
+}
+
if (not is_sourceonly) {
open(FL,"<",$fileslistfile) || &syserr(_g("cannot read files list file"));
while(<FL>) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
