Package: devscripts
Version: 2.10.18.1
Severity: minor
Tags: patch
Hi,
Linda has recently been removed from unstable (#469039). The attached
patch cleans up the references to linda in devscripts, most notably in
debuild.
cheers,
Thijs
Index: debian/control
===================================================================
--- debian/control (revision 1121)
+++ debian/control (working copy)
@@ -23,7 +23,7 @@
debian-keyring, debian-maintainers, dupload (>=2.1) | dput,
gnupg (>= 1.0.7), gnuplot, libcrypt-ssleay-perl, libdigest-md5-perl,
libfile-desktopentry-perl, libsoap-lite-perl, libterm-size-perl,
- libtimedate-perl, liburi-perl, libwww-perl, lintian | linda, lsb-release,
+ libtimedate-perl, liburi-perl, libwww-perl, lintian, lsb-release,
mailx | mailutils, man-db, mutt, patch, patchutils, ssh, strace,
unzip, wdiff, www-browser
Description: scripts to make the life of a Debian Package maintainer easier
@@ -46,8 +46,7 @@
after running cvs-debuild or cvs-buildpackage [cvs-buildpackage,
dupload | dput, ssh]
- cvs-debuild: run cvs-buildpackage using debuild (see below) as the
- package building program [cvs-buildpackage, fakeroot, lintian | linda,
- gnupg]
+ package building program [cvs-buildpackage, fakeroot, lintian, gnupg]
- dd-list: given a list of packages, pretty-print it ordered by maintainer
- debc: display the contents of just-built .debs
- debchange/dch: automagically add entries to debian/changelog files
@@ -69,7 +68,7 @@
- debuild: wrapper to build a package without having to su or worry
about how to invoke dpkg to build using fakeroot. Also deals
with common environment problems, umask etc. [fakeroot,
- lintian | linda, gnupg]
+ lintian, gnupg]
- deb-reversion: increases a binary package version number and repacks the
archive
- desktop2menu: produce a skeleton menu file from a freedesktop.org
Index: debian/postinst
===================================================================
--- debian/postinst (revision 1121)
+++ debian/postinst (working copy)
@@ -40,15 +40,6 @@
# Added in devscripts 2.7.93:
cat >> /etc/devscripts.conf <<EOF
-# debuild options added in version 2.7.93:
-#
-# Do we run linda at the end of a full run?
-# DEBUILD_LINDA=no
-#
-# Extra options given to linda before any command-line options
-# specified.
-# DEBUILD_LINDA_OPTS=""
-
##### Package-wide variables first introduced in version 2.7.93:
#
# Lists of which scripts are affected by these package-wide variables
Index: scripts/debuild.pl
===================================================================
--- scripts/debuild.pl (revision 1121)
+++ scripts/debuild.pl (working copy)
@@ -26,16 +26,16 @@
# debuild [<debuild options>] binary|binary-arch|binary-indep|clean ...
# or
# debuild [<debuild options>] [<dpkg-buildpackage options>]
-# [--lintian-opts <lintian options>] [--linda-opts <linda options>]
+# [--lintian-opts <lintian options>]
#
# In the first case, debuild will simply run debian/rules with the
# given parameter. Available options are listed in usage() below.
#
# In the second case, the behaviour is to run dpkg-buildpackage and
-# then to run lintian and/or linda on the resulting .changes file.
-# (Running lintian only is the default.) Lintian and linda options
-# may be specified after --lintian-opts and --linda-opts respectively;
-# all following options will be passed only to lintian/linda.
+# then to run lintian on the resulting .changes file.
+# (Running lintian only is the default.) Lintian options may be
+# specified after --lintian-opts; all following options will be passed
+# only to lintian.
#
# As this may be running setuid, we make sure to clean out the
# environment before we perform the build, subject to any -e etc.
@@ -109,16 +109,14 @@
Second usage method:
$progname [<debuild options>] [<dpkg-buildpackage options>]
- [--lintian-opts <lintian options>] [--linda-opts <linda options>]
- to run dpkg-buildpackage and then run lintian and/or linda on the
- resulting .changes file.
+ [--lintian-opts <lintian options>]
+ to run dpkg-buildpackage and then run lintian on the resulting
+ .changes file.
Additional debuild options available in this case are:
--lintian Run lintian (default)
- --linda Run linda
--no-lintian Do not run lintian
- --no-linda Do not run linda (default)
--[no-]tgz-check Do [not] check for an .orig.tar.gz before running
dpkg-buildpackage if we have a Debian revision
(Default: check)
@@ -138,7 +136,7 @@
can be reset to nothing with --foo-hook=''
--clear-hooks Clear all hooks
- For available dpkg-buildpackage and lintian/linda options, see their
+ For available dpkg-buildpackage and lintian options, see their
respective manpages.
Default settings modified by devscripts configuration files:
@@ -172,14 +170,10 @@
my %save_vars;
my $root_command='';
my $run_lintian=1;
-my $run_linda=0;
my $lintian_exists=0;
-my $linda_exists=0;
my @dpkg_extra_opts=();
my @lintian_extra_opts=();
my @lintian_opts=();
-my @linda_extra_opts=();
-my @linda_opts;
my $checkbuilddep=1;
my $check_dirname_level = 1;
my $check_dirname_regex = 'PACKAGE(-.*)?';
@@ -240,7 +234,6 @@
'DEBUILD_PRESERVE_ENV' => 'no',
'DEBUILD_PRESERVE_ENVVARS' => '',
'DEBUILD_LINTIAN' => 'yes',
- 'DEBUILD_LINDA' => 'no',
'DEBUILD_ROOTCMD' => 'fakeroot',
'DEBUILD_TGZ_CHECK' => 'yes',
'DEBUILD_DPKG_BUILDPACKAGE_HOOK' => '',
@@ -258,7 +251,6 @@
my %config_default = %config_vars;
my $dpkg_opts_var = 'DEBUILD_DPKG_BUILDPACKAGE_OPTS';
my $lintian_opts_var = 'DEBUILD_LINTIAN_OPTS';
- my $linda_opts_var = 'DEBUILD_LINDA_OPTS';
my $shell_cmd;
# Set defaults
@@ -266,14 +258,14 @@
foreach my $var (keys %config_vars) {
$shell_cmd .= qq[$var="$config_vars{$var}";\n];
}
- foreach my $var ($dpkg_opts_var, $lintian_opts_var, $linda_opts_var) {
+ foreach my $var ($dpkg_opts_var, $lintian_opts_var) {
$shell_cmd .= "$var='';\n";
}
$shell_cmd .= 'for file in ' . join(" ",@config_files) . "; do\n";
$shell_cmd .= '[ -f $file ] && . $file; done;' . "\n";
# Read back values
foreach my $var (keys %config_vars) { $shell_cmd .= "echo \$$var;\n" }
- foreach my $var ($dpkg_opts_var, $lintian_opts_var, $linda_opts_var) {
+ foreach my $var ($dpkg_opts_var, $lintian_opts_var) {
$shell_cmd .= "eval set -- \$$var;\n";
$shell_cmd .= "echo \">>> $var BEGIN <<<\";\n";
$shell_cmd .= 'while [ $# -gt 0 ]; do echo $1; shift; done;' . "\n";
@@ -293,8 +285,6 @@
or $config_vars{'DEBUILD_PRESERVE_ENV'}='no';
$config_vars{'DEBUILD_LINTIAN'} =~ /^(yes|no)$/
or $config_vars{'DEBUILD_LINTIAN'}='yes';
- $config_vars{'DEBUILD_LINDA'} =~ /^(yes|no)$/
- or $config_vars{'DEBUILD_LINDA'}='no';
$config_vars{'DEVSCRIPTS_CHECK_DIRNAME_LEVEL'} =~ /^[012]$/
or $config_vars{'DEVSCRIPTS_CHECK_DIRNAME_LEVEL'}=1;
$config_vars{'DEBUILD_TGZ_CHECK'} =~ /^(yes|no)$/
@@ -324,7 +314,6 @@
@[EMAIL PROTECTED] = (1) x scalar @preserve_vars;
}
$run_lintian = $config_vars{'DEBUILD_LINTIAN'} eq 'no' ? 0 : 1;
- $run_linda = $config_vars{'DEBUILD_LINDA'} eq 'yes' ? 1 : 0;
$root_command = $config_vars{'DEBUILD_ROOTCMD'};
$tgz_check = $config_vars{'DEBUILD_TGZ_CHECK'} eq 'yes' ? 1 : 0;
$check_dirname_level = $config_vars{'DEVSCRIPTS_CHECK_DIRNAME_LEVEL'};
@@ -364,20 +353,6 @@
$modified_conf_msg .= " $lintian_opts_var='" . join(" ",
@lintian_extra_opts) . "'\n";
}
- if (shift @othervars ne ">>> $linda_opts_var BEGIN <<<") {
- fatal "internal error: linda opts list missing proper header";
- }
- while (($_ = shift @othervars) ne ">>> $linda_opts_var END <<<"
- and @othervars) {
- push @linda_extra_opts, $_;
- }
- if (! @othervars) {
- fatal "internal error: linda opts list missing proper trailer";
- }
- if (@linda_extra_opts) {
- $modified_conf_msg .= " $linda_opts_var='" . join(" ",
@linda_extra_opts) . "'\n";
- }
-
# And what is left should be any ENV settings
foreach my $envvar (@othervars) {
$envvar =~ /^DEBUILD_SET_ENVVAR_([^=]*)=(.*)$/ or next;
@@ -496,8 +471,6 @@
}
$arg eq '--no-lintian' and $run_lintian=0, next;
$arg eq '--lintian' and $run_lintian=1, next;
- $arg eq '--no-linda' and $run_linda=0, next;
- $arg eq '--linda' and $run_linda=1, next;
if ($arg eq '--rootcmd') {
unless (defined ($root_command = shift)) {
fatal "--rootcmd requires an argument,\nrun $progname --help
for usage information";
@@ -708,7 +681,7 @@
}
if ($command_version eq 'dpkg') {
- # We're going to emulate dpkg-buildpackage and possibly lintian/linda.
+ # We're going to emulate dpkg-buildpackage and possibly lintian.
# This will allow us to run hooks.
# However, if dpkg-cross is installed (as evidenced by the presence
# of /usr/bin/dpkg-cross), then we call the "real" dpkg-buildpackage,
@@ -733,15 +706,11 @@
# Our first task is to parse the command line options.
- # And before we get too excited, does lintian/linda even exist?
+ # And before we get too excited, does lintian even exist?
if ($run_lintian) {
system("command -v lintian >/dev/null 2>&1") == 0
and $lintian_exists=1;
}
- if ($run_linda) {
- system("command -v linda >/dev/null 2>&1") == 0
- and $linda_exists=1;
- }
# dpkg-buildpackage variables explicitly initialised in dpkg-buildpackage
my $signsource=1;
@@ -860,7 +829,7 @@
if (/^-M/ and $dpkg_cross) { push(@dpkg_opts, $_), next; }
# these non-dpkg-buildpackage options make us stop
- if ($_ eq '-L' or $_ eq '--lintian' or /^--(lintian|linda)-opts$/) {
+ if ($_ eq '-L' or $_ eq '--lintian' or /^--lintian-opts$/) {
unshift @ARGV, $_;
last;
}
@@ -871,8 +840,8 @@
fatal "cannot combine dpkg-buildpackage options $sourceonly and
$binaryonly";
}
- # Pick up lintian/linda options if necessary
- if (($run_lintian || $run_linda) && @ARGV) {
+ # Pick up lintian options if necessary
+ if ($run_lintian && @ARGV) {
# Check that option is sensible
LIN_OPTS:
while (@ARGV) {
@@ -888,26 +857,13 @@
"$whichlin option given but not running lintian!";
}
while ($_=shift) {
- if (/^--(lintian|linda)-opts$/) {
+ if (/^--lintian-opts$/) {
unshift @ARGV, $_;
next LIN_OPTS;
}
push @lintian_opts, $_;
}
}
- elsif ($whichlin eq '--linda-opts') {
- if (! $run_linda) {
- push @warnings,
- "$whichlin option given but not running linda!";
- }
- while ($_=shift) {
- if (/^--(lintian|linda)-opts$/) {
- unshift @ARGV, $_;
- next LIN_OPTS;
- }
- push @linda_opts, $_;
- }
- }
}
}
@@ -1163,8 +1119,7 @@
chdir '..' or fatal "can't chdir: $!";
} # end of debuild dpkg-buildpackage emulation
- run_hook('lintian', (($run_lintian && $lintian_exists) ||
- ($run_linda && $linda_exists)) );
+ run_hook('lintian', $run_lintian && $lintian_exists);
if ($run_lintian && $lintian_exists) {
$<=$>=$uid; # Give up on root privileges if we can
@@ -1174,14 +1129,6 @@
system('lintian', @lintian_extra_opts, @lintian_opts, $changes);
print "Finished running lintian.\n";
}
- if ($run_linda && $linda_exists) {
- $<=$>=$uid; # Give up on root privileges if we can
- $(=$)=$gid;
- print "Now running linda...\n";
- # The remaining items in @ARGV, if any, are linda options
- system('linda', @linda_extra_opts, @linda_opts, $changes);
- print "Finished running linda.\n";
- }
# They've insisted. Who knows why?!
if (($signchanges or $signsource) and $usepause) {
Index: scripts/cvs-debuild.1
===================================================================
--- scripts/cvs-debuild.1 (revision 1121)
+++ scripts/cvs-debuild.1 (working copy)
@@ -4,7 +4,6 @@
.SH SYNOPSIS
\fBcvs-debuild\fR [\fIdebuild options\fR] [\fIcvs-buildpackage options\fR]
[\fB\-\-lintian-opts\fR \fIlintian options\fR]
-[\fB\-\-linda-opts\fR \fIlinda options\fR]
.SH DESCRIPTION
\fBcvs-debuild\fR is a wrapper around \fBcvs-buildpackage\fR to run it
with \fBdebuild\fR as the package-building program. (This cannot
@@ -12,8 +11,8 @@
\fBcvs-buildpackage\fR, as it does not know how to handle all of the
special \fBdebuild\fR options.)
.PP
-The program simply stashes the \fBdebuild\fR, \fBlintian\fR and
-\fBlinda\fR options, and passes them to \fBdebuild\fR when it is
+The program simply stashes the \fBdebuild\fR and \fBlintian\fR
+options, and passes them to \fBdebuild\fR when it is
called by \fBcvs-buildpackage\fR. All of the standard \fBdebuild\fR
options may be used (as listed below), but note that the root command
specified by any \fB\-\-rootcmd\fR or \fB\-r\fR command-line option
@@ -32,8 +31,8 @@
more information about the behaviour of each.
.SH "OPTIONS"
The following are the \fBdebuild\fR options recognised by
-\fBcvs-debuild\fR. All \fBcvs-buildpackage\fR, \fBlintian\fR and
-\fBlinda\fR options are simply passed to the appropriate program. For
+\fBcvs-debuild\fR. All \fBcvs-buildpackage\fR and \fBlintian\fR
+options are simply passed to the appropriate program. For
explanations of the meanings of these variables, see
\fBdebuild\fR(1).
.TP
@@ -49,16 +48,13 @@
.TP
.B \-\-lintian, \-\-no\-lintian
.TP
-.B \-\-linda, \-\-no\-linda
-.TP
\fB\-\-ignore-dirname\fR, \fB\-\-check-dirname\fR
These should not be needed, but it is provided nevertheless.
.SH "SEE ALSO"
.BR cvs-buildpackage (1),
.BR debuild (1),
-.BR dpkg-buildpackage (1),
-.BR lintian (1)
+.BR dpkg-buildpackage (1)
and
-.BR linda (1).
+.BR lintian (1).
.SH AUTHOR
This program was written by Julian Gilbey <[EMAIL PROTECTED]>.
Index: scripts/cvs-debuild.pl
===================================================================
--- scripts/cvs-debuild.pl (revision 1121)
+++ scripts/cvs-debuild.pl (working copy)
@@ -24,7 +24,7 @@
# program is:
#
# cvs-debuild [<debuild options>] [<cvs-buildpackage options>]
-# [--lintian-opts <lintian options>] [--linda-opts <linda options>]
+# [--lintian-opts <lintian options>]
#
# cvs-debuild will run cvs-buildpackage, using debuild as the
# package-building program, passing the debuild and lintian options to
@@ -47,13 +47,12 @@
{
print <<"EOF";
$progname [<debuild options>] [<cvs-buildpackage options>]
- [--lintian-opts <lintian options>] [--linda-opts <linda options>]
+ [--lintian-opts <lintian options>]
to run cvs-buildpackage using debuild as the package building program
Accepted debuild options, see debuild(1) or debuild --help for more info:
--no-conf, --noconf
--lintian, --no-lintian
- --linda, --no-linda
--rootcmd=<gain-root-command>, -r<gain-root-command>
--preserve-envvar=<envvar>, -e<envvar>
--set-envvar=<envvar>=<value>, -e<envvar>=<value>
@@ -63,7 +62,7 @@
--help display this message
--version show version and copyright information
- All cvs-buildpackage options are accepted, as are all lintian/linda options
+ All cvs-buildpackage options are accepted, as are all lintian options.
Note that any cvs-buildpackage options (command line or configuration file)
for setting a root command will override any debuild configuration file
@@ -94,7 +93,7 @@
}
# We start by parsing the command line to collect debuild and
-# {lintian,linda} options. We stash them away in temporary files,
+# lintian options. We stash them away in temporary files,
# which we will pass to debuild.
my (@debuild_opts, @cvs_opts, @lin_opts);
@@ -117,7 +116,7 @@
}
# other debuild options are stashed
- if ($arg =~ /^--(no-?conf|(no-?)?(lintian|linda))$/) {
+ if ($arg =~ /^--(no-?conf|(no-?)?lintian)$/) {
push @debuild_opts, $arg;
next;
}
Index: scripts/debuild.1
===================================================================
--- scripts/debuild.1 (revision 1121)
+++ scripts/debuild.1 (working copy)
@@ -4,26 +4,24 @@
.SH SYNOPSIS
\fBdebuild\fR [\fIdebuild options\fR] [\fIdpkg-buildpackage options\fR]
[\fB\-\-lintian-opts\fR \fIlintian options\fR]
-[\fB\-\-linda-opts\fR \fIlinda options\fR]
.br
\fBdebuild\fR [\fIdebuild options\fR]
\fBbinary\fR|\fBbinary-arch\fR|\fBbinary-indep\fR|\fBclean\fR ...
.SH DESCRIPTION
\fBdebuild\fR creates all the files necessary for uploading a Debian
package. It first runs \fBdpkg-buildpackage\fR, then runs
-\fBlintian\fR and/or \fBlinda\fR on the \fI.changes\fR file created
-(assuming that \fBlintian\fR and/or \fBlinda\fR is installed), and
+\fBlintian\fR on the \fI.changes\fR file created
+(assuming that \fBlintian\fR is installed), and
finally signs the \fI.changes\fR and/or \fI.dsc\fR files as
appropriate (using \fBdebsign\fR(1) to do this instead of
\fBdpkg-buildpackage\fR(1) itself; all relevant key-signing options
are passed on). Parameters can be passed to \fBdpkg-buildpackage\fR,
-\fBlintian\fR and \fBlinda\fR, where the parameters to the latter are
-indicated with the \fB\-\-lintian-opts\fR and \fB\-\-linda-opts\fR
-options respectively. The allowable options in this case are
+and \fBlintian\fR, where the parameters to the latter are
+indicated with the \fB\-\-lintian-opts\fR options.
+The allowable options in this case are
\fB\-\-lintian\fR and \fB\-\-no-lintian\fR to force or skip the
-\fBlintian\fR step, respectively, and similarly \fB\-\-linda\fR and
-\fB\-\-no-linda\fR for \fBlinda\fR. The default is to run
-\fBlintian\fR but not \fBlinda\fR. There are also various options
+\fBlintian\fR step, respectively. The default is to run
+\fBlintian\fR. There are also various options
available for setting and preserving environment variables, as
described below in the Environment Variables section. In this method
of running \fBdebuild\fR, we also save a build log to the
@@ -175,11 +173,11 @@
default.)
.TP
lintian-hook
-Run (once) before calling lintian and/or linda. (Run even if we are
+Run (once) before calling lintian. (Run even if we are
not calling either.)
.TP
signing-hook
-Run after calling lintian and/or linda before any signing takes place.
+Run after calling lintian before any signing takes place.
(Run even if we are not signing anything.)
.TP
post-dpkg-buildpackage-hook
@@ -239,13 +237,6 @@
.B \-\-no\-lintian
Do not run \fBlintian\fR after \fBdpkg-buildpackage\fR.
.TP
-.B \-\-linda
-Run \fBlinda\fR after \fBdpkg-buildpackage\fR.
-.TP
-.B \-\-no\-linda
-Do not run \fBlinda\fR after \fBdpkg-buildpackage\fR. This is the
-default behaviour.
-.TP
.B \-\-no\-tgz\-check
Even if we're running \fBdpkg-buildpackage\fR and the version number
has a Debian revision, do not check that the .orig.tar.gz file or .orig
@@ -341,16 +332,6 @@
the usage of this variable is as described for the
\fBDEBUILD_DPKG_BUILDPACKAGE_OPTS\fR variable.
.TP
-.B DEBUILD_LINDA
-Should we run \fBlinda\fR? If this is set to \fIyes\fR, then
-\fBlinda\fR will be run.
-.TP
-.B DEBUILD_LINDA_OPTS
-These are options which should be passed to the invocation of
-\fBlinda\fR. They are given before any command-line options, and
-the usage of this variable is as described for the
-\fBDEBUILD_DPKG_BUILDPACKAGE_OPTS\fR variable.
-.TP
.BR DEVSCRIPTS_CHECK_DIRNAME_LEVEL ", " DEVSCRIPTS_CHECK_DIRNAME_REGEX
See the above section "Directory name checking" for an explanation of
these variables. Note that these are package-wide configuration
@@ -371,11 +352,11 @@
.PP
Change the "\-b" to "\-S" to build only a source package.
.PP
-An example using both \fBlintian\fR and \fBlinda\fR to check the
-resulting packages, and also passing options to them both:
+An example using \fBlintian\fR to check the
+resulting packages and passing options to it:
.IP
.nf
-debuild \-\-linda \-i \-tc \-\-lintian-opts \-i \-\-linda-opts \-i
+debuild \-\-lintian-opts \-i
.fi
.PP
Note the order of options here: the \fBdebuild\fR options come first,
@@ -406,7 +387,6 @@
.BR debsign (1),
.BR fakeroot (1),
.BR lintian (1),
-.BR linda (1),
.BR chmod (1),
.BR dpkg-statoverride (8),
.BR su (1),
Index: README
===================================================================
--- README (revision 1121)
+++ README (working copy)
@@ -44,7 +44,7 @@
around debrelease which allows it to be called from the CVS working
directory.
-- cvs-debuild [cvs-buildpackage, fakeroot, lintian | linda, gnupg]: A
+- cvs-debuild [cvs-buildpackage, fakeroot, lintian, gnupg]: A
wrapper for cvs-buildpackage to use debuild as its package building
program.
@@ -111,7 +111,7 @@
This script is capable of automatically downloading the .changes and
.dsc files from a remote machine.
-- debuild [fakeroot, lintian | linda, gnupg]: A wrapper for building a
+- debuild [fakeroot, lintian, gnupg]: A wrapper for building a
package (i.e., dpkg-buildpackage) to avoid problems with
insufficient permissions and wrong paths etc. Debuild will set up
the proper environment for building a package. Debuild will use the
Index: conf.default.in
===================================================================
--- conf.default.in (revision 1121)
+++ conf.default.in (working copy)
@@ -271,17 +271,10 @@
# Do we run lintian at the end of a full run?
# DEBUILD_LINTIAN=yes
#
-# Do we run linda at the end of a full run?
-# DEBUILD_LINDA=no
-#
# Extra options given to lintian before any command-line options
# specified.
# DEBUILD_LINTIAN_OPTS=""
#
-# Extra options given to linda before any command-line options
-# specified.
-# DEBUILD_LINDA_OPTS=""
-#
# Hooks; see the manpage for details of these
# DEBUILD_DPKG_BUILDPACKAGE_HOOK=""
# DEBUILD_CLEAN_HOOK=""
