The branch, master has been updated
       via  2ce6cb89b93247fcd8b844dcc2c19d3e7a745737 (commit)
       via  3ee9927c327f1822b3be3c4cc3a2e1065d3f0a3b (commit)
       via  ba6b3750a8324af1a7b311337d8e5ff42611e141 (commit)
      from  23857e8a4490d052543937092a73e180637f4917 (commit)


- Shortlog ------------------------------------------------------------
2ce6cb8 Merge branch 'stable'

Summary of changes:
 ChangeLog             |    8 ++++++++
 debian/changelog      |    6 ++++++
 scripts/Dpkg/Cdata.pm |    2 +-
 3 files changed, 15 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 2ce6cb89b93247fcd8b844dcc2c19d3e7a745737
Merge: 23857e8a4490d052543937092a73e180637f4917 
3ee9927c327f1822b3be3c4cc3a2e1065d3f0a3b
Author: Guillem Jover <[EMAIL PROTECTED]>
Date:   Wed Jan 23 09:02:06 2008 +0200

    Merge branch 'stable'
    
    Conflicts:
    
        configure.ac
        debian/changelog

diff --combined ChangeLog
index 4b34536,11b7ee0..9d54902
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,73 -1,13 +1,81 @@@
+ 2008-01-23  Guillem Jover  <[EMAIL PROTECTED]>
+ 
+       * configure.ac: Release 1.14.16.4.
+ 
+ 2008-01-23  Guillem Jover  <[EMAIL PROTECTED]>
+ 
+       * scripts/Dpkg/Cdata.pm: Import capit from Dpkg::Fields.
+ 
  2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
  
 +      * dpkg-deb/extract.c (extracthalf): Refactor fflush and its buggy
 +      fpos handling to ...
 +      (safe_fflush): ... here. New function.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * lib/vercmp.c [0] (verrevcmp): Remove dead code.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * lib/dpkg.h [!offsetof] (offsetof): New compatibilty macro.
 +      * lib/parsedump.h (PKGIFPOFF): Use offsetof instead of ad-hoc
 +      calculation.
 +      (FILEFOFF): Likewise.
 +      (struct fieldinfo): Change integer member type to size_t.
 +      * lib/tarfn.c (TarChecksumOffset): Use offsetof instead of ad-hoc
 +      calculation.
 +
 +2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
 +      * configure.ac (AC_CHECK_HEADERS): Check for 'stddef.h'.
 +
 +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-22  Guillem Jover  <[EMAIL PROTECTED]>
 +
        * configure.ac: Release 1.14.16.3.
  
  2008-01-22  Guillem Jover  <[EMAIL PROTECTED]>
@@@ -126,7 -66,6 +134,7 @@@
        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 b6d5725,b84e2da..1e45980
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,27 @@@
 +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.
 +
 +  [ Updated manpages translations ]
 +  * German (Helge Kreutzmann).
 +
 +  [ Updated scripts translations ]
 +  * German (Helge Kreutzmann).
 +  * Swedish (Peter Karlsson).
 +
 + -- Guillem Jover <[EMAIL PROTECTED]>  Mon, 21 Jan 2008 10:11:55 +0200
 +
+ dpkg (1.14.16.4) unstable; urgency=low
+ 
+   * Import capit in Dpkg::Cdata from Dpkg::Fields. Closes: #462172
+ 
+  -- Guillem Jover <[EMAIL PROTECTED]>  Wed, 23 Jan 2008 08:44:32 +0200
+ 
  dpkg (1.14.16.3) unstable; urgency=low
  
    [ Raphael Hertzog ]

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to