The branch, master has been updated
via 317b4f1dcc46fc145ad651c1566e39422e716d9a (commit)
via f063c7ce5025c086ddfc35950e1b8f5a3b2b32a7 (commit)
via f2ce3447b10ef91b5688483421ccb5f5cb0e45fa (commit)
via c258829c1fc114a86707b7f5f24b94e559fe1efa (commit)
via 7fd5b6d604ae9b50a340664f702e85cd235ff561 (commit)
via 577eba0c5b1ba169562a97f8f57b80d5947021f0 (commit)
from 1cb3e24dc2073a5987a2d8e302cd9c4e2a2e527b (commit)
- Shortlog ------------------------------------------------------------
317b4f1 Nightly changelog police patrol
f063c7c Packages.bz2 are the preferred alternative to Packages.gz for apt
f2ce344 Fix typos in man pages
c258829 Use fakeroot by default to gain root privileges in dpkg-buildpackage
7fd5b6d Stop recognizing the obsolete Optional field when building packages
577eba0 Avoid escaped quotes by using $() instead of backticks
Summary of changes:
ChangeLog | 18 ++++++++++++++++++
debian/changelog | 11 ++++++++---
dselect/po/ChangeLog | 2 +-
man/ChangeLog | 14 ++++++++++++--
man/dpkg-deb.1 | 4 ++--
man/dpkg-scanpackages.1 | 6 ++++--
man/start-stop-daemon.8 | 4 ++--
po/ChangeLog | 18 +++++++++---------
scripts/dpkg-buildpackage.sh | 14 ++++++++++----
scripts/dpkg-genchanges.pl | 2 +-
scripts/dpkg-gencontrol.pl | 2 +-
scripts/dpkg-name.sh | 2 +-
scripts/dpkg-source.pl | 2 +-
scripts/po/ChangeLog | 4 ++--
14 files changed, 72 insertions(+), 31 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 317b4f1dcc46fc145ad651c1566e39422e716d9a
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Sep 8 06:02:35 2007 +0300
Nightly changelog police patrol
diff --git a/debian/changelog b/debian/changelog
index 829cbc4..5d10d9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,9 +12,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low
Thanks to A. Costa.
[ Updated dpkg translations ]
- * Portuguese (Miguel Figueiredo).
* German (Sven Joachim). Closes: #440537
* Nepali (Shiva Prasad Pokharel). Closes: #437825
+ * Portuguese (Miguel Figueiredo).
* Vietnamese (Clytie Siddall). Closes: #440502
[ Updated man pages translations ]
diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog
index 7a82609..b56c834 100644
--- a/dselect/po/ChangeLog
+++ b/dselect/po/ChangeLog
@@ -6,7 +6,7 @@
* ru.po: Updated to 285t.
-2007-07-29 Peter Karlsson <[EMAIL PROTECTED]>
+2007-07-29 Peter Karlsson <[EMAIL PROTECTED]>
* sv.po: Updated to 285t.
diff --git a/man/ChangeLog b/man/ChangeLog
index a91739e..71868fc 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -43,7 +43,7 @@
2007-08-14 Robert Luberda <[EMAIL PROTECTED]>
- * po/pl.po: Update to 1002t14f269u.
+ * po/pl.po: Update to 1002t14f269u.
2007-08-05 Peter Karlsson <[EMAIL PROTECTED]>
@@ -51,7 +51,7 @@
2007-08-05 Helge Kreutzmann <[EMAIL PROTECTED]>
- * po/de.po: Updated to 1111t6f165u.
+ * po/de.po: Updated to 1111t6f165u.
2007-07-31 Peter Karlsson <[EMAIL PROTECTED]>
diff --git a/po/ChangeLog b/po/ChangeLog
index b60b786..76dea22 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,22 +1,22 @@
-2007-09-06 Miguel Figueiredo <[EMAIL PROTECTED]>
+2007-09-06 Miguel Figueiredo <[EMAIL PROTECTED]>
- * pt.po: Updated to 929t
+ * pt.po: Updated to 929t.
2007-09-04 Frédéric Bothamy <[EMAIL PROTECTED]>
- * fr.po: Updated to 929t
+ * fr.po: Updated to 929t.
2007-09-02 Sven Joachim <[EMAIL PROTECTED]>
- * de.po: Updated to 929t
+ * de.po: Updated to 929t.
2007-09-02 Clytie Siddall <[EMAIL PROTECTED]>
- * vi.po: Updated to 929t
+ * vi.po: Updated to 929t.
2007-08-26 Shiva Prasad Pokharel <[EMAIL PROTECTED]>
- * ne.po: Updated to 903t23f3u.
+ * ne.po: Updated to 903t23f3u.
2007-08-25 Peter Karlsson <[EMAIL PROTECTED]>
@@ -29,7 +29,7 @@
2007-08-14 Robert Luberda <[EMAIL PROTECTED]>
- * pl.po: Updated to 921t.
+ * pl.po: Updated to 921t.
2007-08-06 Yuri Kozlov <[EMAIL PROTECTED]>
@@ -57,11 +57,11 @@
2007-06-18 Ivar Smolin <[EMAIL PROTECTED]>
- * et.po: Updated to 463t458u
+ * et.po: Updated to 463t458u.
2007-06-05 Ivar Smolin <[EMAIL PROTECTED]>
- * et.po: Updated to 441t480u
+ * et.po: Updated to 441t480u.
2007-06-01 Clytie Siddall <[EMAIL PROTECTED]>
diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index 3ff8b35..31205e6 100644
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,6 +1,6 @@
-2007-08-30 Peter Karlsson <[EMAIL PROTECTED]>
+2007-08-30 Peter Karlsson <[EMAIL PROTECTED]>
- * LINGUAS, sv.po: Added Swedish
+ * LINGUAS, sv.po: Added Swedish.
2007-08-18 Guillem Jover <[EMAIL PROTECTED]>
commit f063c7ce5025c086ddfc35950e1b8f5a3b2b32a7
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Sep 8 05:49:48 2007 +0300
Packages.bz2 are the preferred alternative to Packages.gz for apt
diff --git a/debian/changelog b/debian/changelog
index ff24d6a..829cbc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
[ Guillem Jover ]
* Add back $dpkglib into @INC, needed by the controllib.pl require in
822-date. Closes: #440962
- * Document in dpkg-scanpackages that apt now requires Packages.bz2 instead
- of Packages.gz. Closes: #440973
+ * Document in dpkg-scanpackages that apt now requires Packages.bz2 in
+ preference to Packages.gz. Closes: #440973
* Stop recognizing the obsolete Optional field when building packages.
* Use fakeroot, if present, by default to gain root privileges in
dpkg-buildpackage.
diff --git a/man/ChangeLog b/man/ChangeLog
index 81d6b58..a91739e 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08 Guillem Jover <[EMAIL PROTECTED]>
+
+ * dpkg-scanpackages.1: Document that gzipped files are also used by
+ apt.
+
2007-09-08 A. Costa <[EMAIL PROTECTED]>
* dpkg-deb.1: Fix typo ('seperated' -> 'separated').
diff --git a/man/dpkg-scanpackages.1 b/man/dpkg-scanpackages.1
index 195a79a..3f0b68b 100644
--- a/man/dpkg-scanpackages.1
+++ b/man/dpkg-scanpackages.1
@@ -13,7 +13,7 @@
.\" You should have received a copy of the GNU General Public
.\" License along with dpkg; if not, write to the Free Software
.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-.TH dpkg\-scanpackages 1 "2007-09-06" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2007-09-08" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-scanpackages \- create Packages index files
.
@@ -44,7 +44,9 @@ If you want to access the generated Packages file with
.B apt
you will probably need to compress the file with
.BR bzip2 (1)
-(generating a Packages.bz2 file). apt ignores uncompressed Packages
+(generating a Packages.bz2 file) or
+.BR gzip (1)
+(generatinc a Packages.gz file). apt ignores uncompressed Packages
files except on local access (i.e.
.B file://
sources).
commit f2ce3447b10ef91b5688483421ccb5f5cb0e45fa
Author: A. Costa <[EMAIL PROTECTED]>
Date: Sat Sep 8 05:44:10 2007 +0300
Fix typos in man pages
diff --git a/debian/changelog b/debian/changelog
index 489965c..ff24d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
* Stop recognizing the obsolete Optional field when building packages.
* Use fakeroot, if present, by default to gain root privileges in
dpkg-buildpackage.
+ * Fix typos in dpkg-deb.1 and start-stop-daemon.8. Closes: #441051
+ Thanks to A. Costa.
[ Updated dpkg translations ]
* Portuguese (Miguel Figueiredo).
diff --git a/man/ChangeLog b/man/ChangeLog
index 75d3169..81d6b58 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08 A. Costa <[EMAIL PROTECTED]>
+
+ * dpkg-deb.1: Fix typo ('seperated' -> 'separated').
+ * start-stop-daemon.8: Fix typo ('themself' -> 'themselves').
+
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
* dpkg-scanpackages.1: Replace gzip with bzip2 as the requirement for
diff --git a/man/dpkg-deb.1 b/man/dpkg-deb.1
index f8b238b..7fa1123 100644
--- a/man/dpkg-deb.1
+++ b/man/dpkg-deb.1
@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2007-07-18" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2007-09-08" "Debian Project" "dpkg suite"
.SH NAME
dpkg\-deb \- Debian package archive (.deb) manipulation tool
.
@@ -97,7 +97,7 @@ Provides information about a binary package archive in the
format
specified by the
.B \-\-showformat
argument. The default format displays the package's name and version
-on one line, seperated by a tabulator.
+on one line, separated by a tabulator.
.TP
.BR \-f ", " \-\-field " \fIarchive\fP [\fIcontrol-field-name\fP...]"
Extracts control file information from a binary package archive.
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 6bc2496..1f78ca1 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -1,4 +1,4 @@
-.TH start\-stop\-daemon 8 "2007-03-06" "Debian Project" "dpkg utilities"
+.TH start\-stop\-daemon 8 "2007-09-08" "Debian Project" "dpkg utilities"
.SH NAME
start\-stop\-daemon \- start and stop system daemon programs
.
@@ -213,7 +213,7 @@ cannot check the exit status if the process fails to
execute for
.B any
reason. This is a last resort, and is only meant for programs that either
make no sense forking on their own, or where it's not feasible to add the
-code for them to do this themself.
+code for them to do this themselves.
.TP
.BR \-N ", " \-\-nicelevel " \fIint\fP"
This alters the priority of the process before starting it.
commit c258829c1fc114a86707b7f5f24b94e559fe1efa
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Sep 8 05:35:18 2007 +0300
Use fakeroot by default to gain root privileges in dpkg-buildpackage
diff --git a/ChangeLog b/ChangeLog
index acc7c3f..598af20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08 Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-buildpackage.sh: Use fakeroot, if present, as default
+ value for the '-r' option.
+
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-genchanges.pl: Stop recognizing the obsolete Optional
diff --git a/debian/changelog b/debian/changelog
index 110b117..489965c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.14.7) UNRELEASED; urgency=low
* Document in dpkg-scanpackages that apt now requires Packages.bz2 instead
of Packages.gz. Closes: #440973
* Stop recognizing the obsolete Optional field when building packages.
+ * Use fakeroot, if present, by default to gain root privileges in
+ dpkg-buildpackage.
[ Updated dpkg translations ]
* Portuguese (Miguel Figueiredo).
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 82508c1..f5e0784 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -22,6 +22,8 @@ Usage: $progname [<options> ...]
Options:
-r<gain-root-command>
+ command to gain root privileges (default is fakeroot if it
+ exists).
-p<sign-command>
-d do not check build dependencies and conflicts.
-D check build dependencies and conflicts.
@@ -59,6 +61,10 @@ END
}
rootcommand=''
+if command -v fakeroot >/dev/null 2>&1; then
+ rootcommand=fakeroot
+fi
+
signcommand=""
if [ -e "$GNUPGHOME" ] || [ -e "$HOME/.gnupg" ] && \
command -v gpg > /dev/null 2>&1; then
commit 7fd5b6d604ae9b50a340664f702e85cd235ff561
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 05:14:11 2007 +0300
Stop recognizing the obsolete Optional field when building packages
diff --git a/ChangeLog b/ChangeLog
index cc52137..acc7c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-genchanges.pl: Stop recognizing the obsolete Optional
+ field.
+ * scripts/dpkg-gencontrol.pl: Likewise.
+ * scripts/dpkg-source.pl: Likewise.
+
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax
highlighting by using $() instead of backticks.
* scripts/dpkg-buildpackage.sh: Likewise.
diff --git a/debian/changelog b/debian/changelog
index 5455b14..110b117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dpkg (1.14.7) UNRELEASED; urgency=low
822-date. Closes: #440962
* Document in dpkg-scanpackages that apt now requires Packages.bz2 instead
of Packages.gz. Closes: #440973
+ * Stop recognizing the obsolete Optional field when building packages.
[ Updated dpkg translations ]
* Portuguese (Miguel Figueiredo).
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 7b54c47..d17700b 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -253,7 +253,7 @@ for $_ (keys %fi) {
}
push(@archvalues,$v) unless !$v || $archadded{$v}++;
} elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/ ||
-
m/^(Recommends|Suggests|Enhances|Optional|Conflicts|Breaks|Replaces)$/ ||
+
m/^(Recommends|Suggests|Enhances|Conflicts|Breaks|Replaces)$/ ||
m/^Tag$/i ||
m/^X[BS]+-/i) {
} else {
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 414d8a6..6f9ead5 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -162,7 +162,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|Homepage|Tag|Essential|Optional)$/) {
+ if (m/^(Package|Description|Homepage|Tag|Essential)$/) {
$f{$_}= $v;
} elsif (exists($pkg_dep_fields{$_})) {
# Delay the parsing until later
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5c16bc4..898ea83 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -285,7 +285,7 @@ if ($opmode eq 'build') {
} elsif (s/^X[BC]*S[BC]*-//i) {
$f{$_}= $v;
} elsif (m/^(Package|Essential|Pre-Depends|Depends|Provides)$/i ||
- m/^(Recommends|Suggests|Optional|Conflicts|Replaces)$/i ||
+ m/^(Recommends|Suggests|Conflicts|Replaces)$/i ||
m/^(Breaks|Enhances|Description|Tag|Section|Priority)$/i
||
m/^X[BC]+-/i) {
} else {
commit 577eba0c5b1ba169562a97f8f57b80d5947021f0
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Sep 6 05:09:25 2007 +0300
Avoid escaped quotes by using $() instead of backticks
The escaped quotes mess up syntax highlighting.
diff --git a/ChangeLog b/ChangeLog
index 7984467..cc52137 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/dpkg-name.sh: Avoid escaped quotes messing with syntax
+ highlighting by using $() instead of backticks.
+ * scripts/dpkg-buildpackage.sh: Likewise.
+
+2007-09-06 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-genchanges.pl ($host_arch): Do not declare as 'our'.
* scripts/dpkg-gencontrol.pl ($host_arch): Likewise.
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 7c1b645..82508c1 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -4,7 +4,7 @@ set -e
version="1.10.10"; # This line modified by Makefile
-progname="`basename \"$0\"`"
+progname="$(basename "$0")"
showversion () {
echo "Debian $progname version $version."
@@ -86,7 +86,7 @@ admindir=''
while [ $# != 0 ]
do
- value="`echo x\"$1\" | sed -e 's/x--.*=//;s/^x-.//'`"
+ value="$(echo x"$1" | sed -e 's/x--.*=//;s/^x-.//')"
case "$1" in
-h|--help)
usage; exit 0 ;;
@@ -160,7 +160,7 @@ mustsetvar () {
}
curd="`pwd`"
-dirn="`basename \"$curd\"`"
+dirn="$(basename "$curd")"
mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source
package is"
mustsetvar changesversion "`dpkg-parsechangelog | sed -n 's/^Version: //p'`"
"source version is"
if [ -n "$changedby" ]; then maintainer="$changedby";
@@ -173,7 +173,7 @@ if [ x$sourceonly = x ]; then
else
arch=source
fi
-mustsetvar sversion "`echo \"$changesversion\" | perl -pe 's/^\d+://'`"
"source version without epoch"
+mustsetvar sversion "$(echo "$changesversion" | perl -pe 's/^\d+://')" "source
version without epoch"
pv="${package}_${sversion}"
pva="${package}_${sversion}_${arch}"
diff --git a/scripts/dpkg-name.sh b/scripts/dpkg-name.sh
index e762417..7628693 100755
--- a/scripts/dpkg-name.sh
+++ b/scripts/dpkg-name.sh
@@ -3,7 +3,7 @@
set -e
# Time-stamp: <96/05/03 13:59:41 root>
-prog="`basename \"${0}\"`"
+prog="$(basename "${0}")"
version="1.2.3"; # This line modified by Makefile
purpose="rename Debian packages to full package names"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
