The branch, master has been updated
via f836cd4fe6925a990347766d78653859ca7f9d00 (commit)
via 608a665319ae00ea6ebf9737d3064c2ad7e337ff (commit)
via 9482bd74a984a1e3798558cd7326ba073279d5e9 (commit)
from 81b142ec721849dbb087f86139c81c6f6ff0252e (commit)
- Log -----------------------------------------------------------------
commit f836cd4fe6925a990347766d78653859ca7f9d00
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Aug 24 17:39:22 2007 +0300
Allow overriding Homepage from a package stanza in the control file
commit 608a665319ae00ea6ebf9737d3064c2ad7e337ff
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Aug 24 16:57:53 2007 +0300
Remove option description from comment header, usage has them
commit 9482bd74a984a1e3798558cd7326ba073279d5e9
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Aug 24 16:55:15 2007 +0300
Add bug closure for incorrrectly named FILES section in man page
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
debian/changelog | 2 +-
scripts/changelog/debian.pl | 4 ----
scripts/dpkg-gencontrol.pl | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dee1fda..aefeb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-24 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-gencontrol.pl: Allow a package stanza to override the
+ Homepage field from the source stanza.
+
2007-08-20 Guillem Jover <[EMAIL PROTECTED]>
* dpkg-deb/build.c (arbitrary_fields): New variable.
diff --git a/debian/changelog b/debian/changelog
index 89c2833..66096c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
- Unify ellipsis, argument separator, and remove redundant program name
preceding the options.
- Substitute 'FILES' header with 'SEE ALSO' in dpkg-buildpackage(1),
- and remove leftover string from man page split.
+ and remove leftover string from man page split. Closes: #439306
- Split option descriptions so that it gets easier to distinguish.
- Unify author and copyright information formatting.
* Move variables automatically modified at build time for the perl scripts
diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index aa53e0c..a557009 100755
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -1,8 +1,4 @@
#!/usr/bin/perl
-#
-# Options:
-# -v<version>
-# changes since <version>
use strict;
use warnings;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 98fb7c4..9a9524b 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -157,7 +157,7 @@ for $_ (keys %fi) {
else { $_ = "C $_"; &unknown(_g('general section of control info
file')); }
} elsif (s/^C$myindex //) {
#print STDERR "P key >$_< value >$v<\n";
- if (m/^(Package|Description|Essential|Optional)$/) {
+ if (m/^(Package|Description|Homepage|Essential|Optional)$/) {
$f{$_}= $v;
} elsif (exists($pkg_dep_fields{$_})) {
} elsif (m/^Section$|^Priority$/) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
