------------------------------------------------------------ revno: 1959 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Sun 2010-04-25 19:59:47 +0200 message: merge duplicate changelog sections modified: changelog
=== modified file 'changelog' --- a/changelog 2010-04-25 17:56:28 +0000 +++ b/changelog 2010-04-25 17:59:47 +0000 @@ -18,10 +18,9 @@ * merge from Ubuntu: - add ENABLE_SDBC_POSTGRESQL variable and disable the build of the arch-dep extensions when we don't package them anyways - * merge from Ubuntu (thanks mvo): - change the way components like -evolution or -filter-binfilter are registered so that we do not need to pre-depends on - openoffice.org-core anymore + openoffice.org-core anymore (thanks Michael Vogt) -- Rene Engelhard <r...@debian.org> Thu, 22 Apr 2010 20:26:06 +0200