+Wed Jan 19 16:41:04 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+ * scripts/controllib.pl: add comment with description of global variables
+ * scripts/dpkg-genchanges.pl:
+ + add comment with description of global variables
+ + Change Format number to 1.7
+ + `Maintainer' is now the actual maintainer as listed in control
+ + add `Changed-By' field with maintainer as listed in changelog. Add -e
+ flag to override this value
+ * scripts/dpkg-buildpackage.sh: pass -e on to dpkg-genchanges
+ * scripts/dpkg-source.1: document new -e option, update copyright
+
Mon Jan 17 21:20:35 CET 2000 Wichert Akkerman <wakkerma@debian.org>
* dselect/Makefile.in: not all shells support == for strings comparisons
+ use objdump instead of ldd
+ correct checks on shlibs.local
+Sun Jan 16 22:07:12 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+ * main/dpkg.8: note that --force-overwrite is off by default
+ * po/.cvsignore: add all the .gmo files
+
Sat Jan 15 03:48:47 CET 2000 Wichert Akkerman <wakkerma@debian.org>
* doc/ja/dpkg-deb.5: updated with patch from Hiroshi KISE <fuyuneko@ryukyu.ne.jp>
always default. If there is no default then we use the old or new
version, depending on the option given.
-\fBoverwrite\fP(*):
+\fBoverwrite\fP:
Overwrite one package's file with another's file.
-\fBoverwrite-dir\fP
+\fBoverwrite-dir\fP:
Overwrite one package's directory with another's file.
\fBoverwrite-diverted\fP:
dpkg.pot
stamp-cat-id
POTFILES
-sv.gmo
-ru.gmo
-pl.gmo
-ja.gmo
-es.gmo
-en.gmo
cs.gmo
+en.gmo
+es.gmo
fr.gmo
+ja.gmo
+pl.gmo
+ru.gmo
+sv.gmo
+# Global variables:
+# $v - value parameter to function
+# $sourcepackage - name of sourcepackage
+# %capit - map to get properly capitilized version of fields
+# %fi - map of fields values. keys are of the form "S# key"
+# where S is source (L is changelog, C is control)
+# and # is an index
+# %p2i - map from datafile+packagename to index in controlfile
+# (used if multiple packages can be listed). Key is
+# "S key" where S is the source and key is the packagename
+# %substvar - map with substitution variables
+
$parsechangelog= 'dpkg-parsechangelog';
grep($capit{lc $_}=$_, qw(Pre-Depends Standards-Version Installed-Size
Build-Conflicts Build-Conflicts-Indep));
-$substvar{'Format'}= 1.6;
+$substvar{'Format'}= 1.7;
$substvar{'Newline'}= "\n";
$substvar{'Space'}= " ";
$substvar{'Tab'}= "\t";
-b binary-only, do not build source } also passed to
-B binary-only, no arch-indep files } dpkg-genchanges
-v<version> changes since version <version> }
- -m<maint> maintainer for release is <maint> } only passed
+ -m<maint> maintainer for package is <maint> }
+ -e<maint> maintainer for release is <maint> } only passed
-C<descfile> changes are described in <descfile> } to dpkg-
-si (default) src includes orig for rev. 0 or 1 } genchanges
-sa uploaded src always includes orig }
-B) binaryonly=-B; binarytarget=binary-arch ;;
-v*) since="$value" ;;
-m*) maint="$value" ;;
+ -e*) changedby="$value" ;;
-C*) descfile="$value" ;;
*) echo >&2 "$progname: unknown option or argument $1"
usageversion; exit 2 ;;
set -- $binaryonly $sourcestyle
if [ -n "$maint" ]; then set -- "$@" "-m$maint" ; fi
+if [ -n "$changedby" ]; then set -- "$@" "-e$changedby" ; fi
if [ -n "$since" ]; then set -- "$@" "-v$since" ; fi
if [ -n "$desc" ]; then set -- "$@" "-C$desc" ; fi
$sourcestyle= 'i';
$quiet= 0;
+# Other global variables used:
+# %f2p - file to package map
+# %p2f - package to file map
+# has entries for both "packagename" and "packagename architecture"
+# %p2ver - package to version map
+# %f2sec - file to section map
+# %f2pri - file to priority map
+# %sourcedefault - default values as taken from source (used for Section,
+# Priority and Maintainer)
+# $changedby - person who created this package (as listed in changelog)
+
use POSIX;
use POSIX qw(:errno_h :signal_h);
sub usageversion {
print STDERR
-"Debian GNU/Linux dpkg-genchanges $version. Copyright (C) 1996
-Ian Jackson. This is free software; see the GNU General Public Licence
-version 2 or later for copying conditions. There is NO warranty.
+"Debian GNU/Linux dpkg-genchanges $version.
+Copyright (C) 1996 Ian Jackson.
+Copyright (C) 2000 Wichert Akkerman.
+This is free software; see the GNU General Public Licence version 2 or later
+for copying conditions. There is NO warranty.
Usage: dpkg-genchanges [options ...]
-f<fileslistfile> get .deb files list from this file
-v<sinceversion> include all changes later than version
-C<changesdescription> use change description from this file
- -m<maintainer> override changelog's maintainer value
+ -m<maintainer> override control's maintainer value
+ -e<maintainer> override changelog's maintainer value
-u<uploadfilesdir> directory with files (default is \`..')
-si (default) src includes orig for debian-revision 0 or 1
-sa source includes orig src
$varlistfile= $';
} elsif (m/^-m/) {
$forcemaint= $';
+ } elsif (m/^-e/) {
+ $forcechangedby= $';
} elsif (m/^-F([0-9a-z]+)$/) {
$changelogformat=$1;
} elsif (m/^-D([^\=:]+)[=:]/) {
for $_ (keys %fi) {
$v= $fi{$_};
if (s/^C //) {
-#print STDERR "G key >$_< value >$v<\n";
if (m/^Source$/) { &setsourcepackage; }
- elsif (m/^Section$|^Priority$/) { $sourcedefault{$_}= $v; }
+ elsif (m/^Section$|^Priority$/i) { $sourcedefault{$_}= $v; }
+ elsif (m/^Maintainer$/i) { $f{$_}= $v; }
elsif (s/^X[BS]*C[BS]*-//i) { $f{$_}= $v; }
- elsif (m/|^X[BS]+-|^Standards-Version$|^Maintainer$/i) { }
+ elsif (m/|^X[BS]+-|^Standards-Version$/i) { }
else { &unknown('general section of control info file'); }
} elsif (s/^C(\d+) //) {
-#print STDERR "P key >$_< value >$v<\n";
$i=$1; $p=$fi{"C$i Package"}; $a=$fi{"C$i Architecture"};
if (!defined($p2f{$p})) {
if ($a eq 'any' || ($a eq 'all' && !$archspecific) ||
}
}
} elsif (s/^L //) {
-#print STDERR "L key >$_< value >$v<\n";
- if (m/^Source$/) {
+ if (m/^Source$/i) {
&setsourcepackage;
- } elsif (m/^(Version|Maintainer|Changes|Urgency|Distribution|Date|Closes)$/) {
+ } elsif (m/^Maintainer$/i) {
+ $f{"Changed-By"}=$v;
+ } elsif (m/^(Version|Changes|Urgency|Distribution|Date|Closes)$/i) {
$f{$_}= $v;
} elsif (s/^X[BS]*C[BS]*-//i) {
$f{$_}= $v;
$f{'Source'}= $sourcepackage;
$f{'Maintainer'}= $forcemaint if length($forcemaint);
+$f{'Changed-By'}= $forcechangedby if length($forcechangedby);
for $f (qw(Version Distribution Maintainer Changes)) {
defined($f{$f}) || &error("missing information for critical output field $f");
}
$i=100;grep($fieldimps{$_}=$i--,
- qw(Package Version Section Priority Architecture Essential
+ qw(Package Source-Version Section Priority Architecture Essential
Pre-Depends Depends Recommends Suggests Enhances Optional
Conflicts Replaces Provides Installed-Size Maintainer Source
Description Build-Depends Build-Depends-Indep Build-Conflicts
&setsourcepackage;
} elsif (m/^Version$/) {
$sourceversion= $v;
- $f{$_}= $v unless length($forceversion);
+ $f{"Source-Version"}= $v unless length($forceversion);
} elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/) {
} elsif (s/^X[CS]*B[CS]*-//i) {
$f{$_}= $v;
}
}
-$f{'Version'}= $forceversion if length($forceversion);
+$f{'Source-Version'}= $forceversion if length($forceversion);
for $f (qw(Section Priority)) {
$spvalue{$f}= $spdefault{$f} unless length($spvalue{$f});
$f{$f}= $spvalue{$f} if $spinclude{$f} && length($spvalue{$f});
}
-for $f (qw(Package Version)) {
+for $f (qw(Package Source-Version)) {
defined($f{$f}) || &error("missing information for output field $f");
}
for $f (qw(Maintainer Description Architecture)) {
}
$oppackage= $f{'Package'};
-$verdiff= $f{'Version'} ne $sourceversion;
+$verdiff= $f{'Source-Version'} ne $sourceversion;
if ($oppackage ne $sourcepackage || $verdiff) {
$f{'Source'}= $sourcepackage;
$f{'Source'}.= " ($sourceversion)" if $verdiff;
} elsif ($! != ENOENT) {
&syserr("read old files list file");
}
-$sversion=$f{'Version'};
+$sversion=$f{'Source-Version'};
$sversion =~ s/^\d+://;
print(Y &substvars(sprintf("%s_%s_%s.deb %s %s\n",
$oppackage,$sversion,$f{'Architecture'},
.\" Hey, Emacs! This is an -*- nroff -*- source file.
.\" Authors: Ian Jackson
-.TH DPKG\-SOURCE 1 "7th August" "Debian Project" "Debian GNU/Linux manual"
+.TH DPKG\-SOURCE 1 "Januari 2000" "Debian Project" "Debian GNU/Linux manual"
.SH NAME
dpkg\-source, dpkg\-gencontrol, dpkg\-shlibdeps, dpkg\-genchanges,
dpkg\-buildpackage, dpkg\-distaddfile, dpkg\-parsechangelog
.BI -m maintaineraddress
Use
.I maintaineraddress
+as the name and email address of the maintainer for this package,
+rather than using the information from the source tree's control.
+This is understood by
+.BR dpkg-buildpackage " and " dpkg-genchanges .
+.TP
+.BI -e maintaineraddress
+Use
+.I maintaineraddress
as the name and email address of the maintainer for this upload,
rather than using the information from the source tree's changelog.
This is understood by
.RB ( debian/substvars
by default).
.SH DPKG-GENCHANGES OPTIONS
-.B dpkg-gencontrol
+.B dpkg-genchanges
does not take any non-option arguments.
.TP
.BI -u uploadfilesdir
.BR gpg (1),
.BR pgp (1).
.SH AUTHOR
-The utilities and this manpage were written by Ian Jackson. They are
-Copyright (C)1995-1996 by him and released under the GNU General
-Public Licence; there is NO WARRANTY. See
+The utilities and this manpage were written by Ian Jackson.
+.SH COPYRIGHT
+Copyright (C) 1995-1996 Ian Jackson
+Copyright (C) 2000 Wichert Akkerman
+This is free software; see the GNU General Public Licence version 2 or later
+for copying conditions. There is NO WARRANTY. See
.B /usr/share/doc/dpkg/copyright
and
.B /usr/share/common-licenses/GPL
projects / dpkg / commitdiff