The branch, master has been updated
via 088b8e9a2930a2af0011d7e60d816f75158b3d14 (commit)
via 6585256b0f1040d5656ac4c9dce045de6c1d6323 (commit)
via 6f073e61995bbf4dd29c2b3a7654d4eaade19e41 (commit)
via ed6d970d2afb126b14c7face07fc77bbd7416036 (commit)
from 48b0b1e23c86beec6199bbe06e46a5a43c2d1cb5 (commit)
- Shortlog ------------------------------------------------------------
088b8e9 Merge branch 'stable'
6585256 dpkg-source: Fix "uninitialized value" warning
6f073e6 Release 1.14.16.1
ed6d970 Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends
Summary of changes:
ChangeLog | 15 +++++++++++++++
debian/changelog | 7 +++++++
debian/control | 4 ++--
scripts/dpkg-source.pl | 2 +-
4 files changed, 25 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 088b8e9a2930a2af0011d7e60d816f75158b3d14
Merge: 48b0b1e23c86beec6199bbe06e46a5a43c2d1cb5
6585256b0f1040d5656ac4c9dce045de6c1d6323
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Mon Jan 21 13:40:31 2008 +0100
Merge branch 'stable'
Conflicts:
ChangeLog
configure.ac
debian/changelog
diff --combined ChangeLog
index bc921b2,1cb5c8a..b9f03a1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,47 -1,17 +1,62 @@@
+2008-01-21 Colin Watson <[EMAIL PROTECTED]>
+
+ * dselect/pkgkeys.cc (packagelist_korgbindings): Add 'C'.
+ (packagelist_kinterps): Add 'revertinstalled'.
+ * dselect/bindings.cc (keybindings::descriptions): Likewise.
+ * dselect/pkglist.h (class packagelist): Add kd_revertinstalled.
+ * dselect/pkgcmds.cc (packagelist::kd_revertinstalled): New method.
+ * man/dselect.1: Document new 'C' keybinding.
+
+2008-01-21 Guillem Jover <[EMAIL PROTECTED]>
+
+ * dpkg-deb/build.c (getfi): Use m_malloc instead of malloc.
+ (do_build): Likewise.
+ * dpkg-deb/extract.c (extracthalf): Likewise.
+ * lib/mlib.c (buffer_write): Likewise.
+ (buffer_copy): Likewise.
+ * lib/myopt.c (loadcfgfile): Likewise.
+ * lib/parse.c (parsedb): Likewise.
+ * lib/showpkg.c (alloclstitem): Likewise.
+ (parsefield): Likewise.
+ (parsestring): Likewise.
+ * lib/tarfn.c (StoC): Likewise.
+ (TarExtractor): Likewise.
+ * src/archives.c (try_deconfigure_can): Likewise.
+ * src/main.c (execbackend): Likewise.
+
+2008-01-21 Guillem Jover <[EMAIL PROTECTED]>
+
+ * lib/mlib.c (m_strdup): New function.
+ * lib/dpkg.h (m_strdup): New declaration.
+ * lib/tarfn.c: Include <dpkg.h>.
+ (TarExtractor): Use m_strdup instead of strdup.
+ * lib/database.c (findpackage): Likewise.
+ * lib/myopt.c (myfileopt): Likewise.
+ * dpkg-deb/build.c (getfi): Likewise.
+ * src/configure.c (md5hash): Likewise.
+ * src/help.c (vbuildarglist): Likewis.
+ * src/main.c (execbackend): Likewise.
+ (commandfd): Likewise.
+
+2008-01-21 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac: Bump version to 1.14.17~.
+
+ 2008-01-21 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * configure.ac: Release 1.14.16.1
+
+ * scripts/dpkg-source.pl: Fix "uninitialized value"
+ warning.
+
+ * debian/control: Add libtimedate-perl to
+ dpkg-dev's Depends and to Build-Depends (for
+ build-time tests). This introduces our first
+ run-time dependency on a perl module not shipped
+ with Perl itself. But to me it seems not worth
+ trying to replace that code.
+
++
2008-01-21 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.16.
diff --combined debian/changelog
index c5d895f,f4145a7..5b2408b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,21 @@@
+dpkg (1.14.17) UNRELEASED; urgency=low
+
+ [ Guillem Jover ]
+ * Replace strdup plus error checking usage with a new m_strdup function.
+ Closes: #379028
+ * Add new keybinding in dselect to restore all selections back to
+ whatever's currently installed. Closes: #151540
+ Thanks to Colin Watson.
+
+ -- Guillem Jover <[EMAIL PROTECTED]> Mon, 21 Jan 2008 10:11:55 +0200
+
+ dpkg (1.14.16.1) unstable; urgency=low
+
+ * Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends.
+ Reported by Aurelien Jarno. Closes: #461875
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Mon, 21 Jan 2008 12:48:51 +0100
+
dpkg (1.14.16) unstable; urgency=low
[ Guillem Jover ]
commit 6585256b0f1040d5656ac4c9dce045de6c1d6323
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Mon Jan 21 13:20:54 2008 +0100
dpkg-source: Fix "uninitialized value" warning
diff --git a/ChangeLog b/ChangeLog
index b967a56..1cb5c8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* configure.ac: Release 1.14.16.1
+ * scripts/dpkg-source.pl: Fix "uninitialized value"
+ warning.
+
* debian/control: Add libtimedate-perl to
dpkg-dev's Depends and to Build-Depends (for
build-time tests). This introduces our first
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 12355e1..cbab570 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -771,7 +771,7 @@ if ($opmode eq 'build') {
open(DSC, ">:utf8", "$basenamerev.dsc") ||
syserr(_g("create %s"), "$basenamerev.dsc");
- $substvars->parse($varlistfile) if -e $varlistfile;
+ $substvars->parse($varlistfile) if $varlistfile && -e $varlistfile;
tied(%{$fields})->set_field_importance(@dsc_fields);
tied(%{$fields})->output(\*DSC, $substvars);
close(DSC);
commit 6f073e61995bbf4dd29c2b3a7654d4eaade19e41
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Mon Jan 21 12:55:46 2008 +0100
Release 1.14.16.1
diff --git a/ChangeLog b/ChangeLog
index 71c6e6d..b967a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2008-01-21 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * configure.ac: Release 1.14.16.1
+
* debian/control: Add libtimedate-perl to
dpkg-dev's Depends and to Build-Depends (for
build-time tests). This introduces our first
diff --git a/configure.ac b/configure.ac
index 25d9d1e..b1a096f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dpkg], [1.14.16], [EMAIL PROTECTED])
+AC_INIT([dpkg], [1.14.16.1], [EMAIL PROTECTED])
AC_CONFIG_SRCDIR([lib/dpkg.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
commit ed6d970d2afb126b14c7face07fc77bbd7416036
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Mon Jan 21 12:51:56 2008 +0100
Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends
* debian/control: Add libtimedate-perl to
dpkg-dev's Depends and to Build-Depends (for
build-time tests). This introduces our first
run-time dependency on a perl module not shipped
with Perl itself. But to me it seems not worth
trying to replace that code.
diff --git a/ChangeLog b/ChangeLog
index 9310256..71c6e6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-21 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * debian/control: Add libtimedate-perl to
+ dpkg-dev's Depends and to Build-Depends (for
+ build-time tests). This introduces our first
+ run-time dependency on a perl module not shipped
+ with Perl itself. But to me it seems not worth
+ trying to replace that code.
+
2008-01-21 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Release 1.14.16.
diff --git a/debian/changelog b/debian/changelog
index 27dae46..f4145a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.14.16.1) unstable; urgency=low
+
+ * Add libtimedate-perl to dpkg-dev's Depends and to Build-Depends.
+ Reported by Aurelien Jarno. Closes: #461875
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Mon, 21 Jan 2008 12:48:51 +0100
+
dpkg (1.14.16) unstable; urgency=low
[ Guillem Jover ]
diff --git a/debian/control b/debian/control
index 97b3603..fbe7e68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.7.3
Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.23),
libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libio-string-perl
+ libtimedate-perl, libio-string-perl
Package: dpkg
Architecture: any
@@ -36,7 +36,7 @@ Section: utils
Priority: optional
Architecture: all
Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2, lzma,
- patch (>= 2.2-1), make, binutils
+ patch (>= 2.2-1), make, binutils, libtimedate-perl
Recommends: gcc | c-compiler, build-essential
Suggests: gnupg, debian-keyring
Conflicts: dpkgname, dpkg-cross (<< 2.0.0)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
