]> err.no Git - dpkg/log
dpkg
17 years agoMerge branch 'master' into dpkg-shlibdeps-buxy
Frank Lichtenheld [Sat, 22 Sep 2007 16:36:11 +0000 (18:36 +0200)]
Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

scripts/dpkg-shlibdeps.pl

17 years agodpkg-source: Use print instead of printf if printf is not needed
Frank Lichtenheld [Thu, 20 Sep 2007 01:35:32 +0000 (03:35 +0200)]
dpkg-source: Use print instead of printf if printf is not needed

17 years agodpkg-buildpackage: Fix typo in usage
Frank Lichtenheld [Thu, 20 Sep 2007 01:32:20 +0000 (03:32 +0200)]
dpkg-buildpackage: Fix typo in usage

s/dpkg-genchangs/dpkg-genchanges/

17 years agoDpkg.pm: Make regex for $progname more robust
Frank Lichtenheld [Thu, 20 Sep 2007 01:30:00 +0000 (03:30 +0200)]
Dpkg.pm: Make regex for $progname more robust

While it is not very common to have $0 contain no
'/', it may happen on occasion (after all it happened to
me ;).

17 years agoKorean translation updates
Christian Perrier [Wed, 19 Sep 2007 16:27:34 +0000 (18:27 +0200)]
Korean translation updates

17 years agoAdd Vcs-Browser and Vcs-Git fields to debian/control
Guillem Jover [Tue, 18 Sep 2007 09:07:32 +0000 (12:07 +0300)]
Add Vcs-Browser and Vcs-Git fields to debian/control

17 years agoProperly warn when the child process received a signal
Guillem Jover [Tue, 18 Sep 2007 08:50:26 +0000 (11:50 +0300)]
Properly warn when the child process received a signal

17 years agoRemove duplicate nested conditional and move its cotents to the outer one
Guillem Jover [Tue, 18 Sep 2007 08:34:23 +0000 (11:34 +0300)]
Remove duplicate nested conditional and move its cotents to the outer one

17 years agoCleanup merge detritus and changelog formatting
Guillem Jover [Sat, 15 Sep 2007 04:50:12 +0000 (07:50 +0300)]
Cleanup merge detritus and changelog formatting

17 years agoRegenerate dpkg-man.pot and marge with all .po files
Guillem Jover [Sat, 15 Sep 2007 03:33:13 +0000 (06:33 +0300)]
Regenerate dpkg-man.pot and marge with all .po files

17 years agoFix failed install followed by failed remove resulting in installed state
Brian M. Carlson [Fri, 14 Sep 2007 05:24:56 +0000 (08:24 +0300)]
Fix failed install followed by failed remove resulting in installed state

After '<prerm> remove' fails and while doing the error unwinding, if
the '<postinst> abort-remove' call succeeds, preserve the old status
instead of unconditionally setting it to 'Installed'.

17 years agoUpdated Romanian translation of dpkg
Eddy Petrișor [Mon, 10 Sep 2007 22:15:23 +0000 (01:15 +0300)]
Updated Romanian translation of dpkg

17 years agoUpdate German man page translation to 1254t135f
Helge Kreutzmann [Sun, 9 Sep 2007 11:15:15 +0000 (13:15 +0200)]
Update German man page translation to 1254t135f

17 years agoSove the conflicts I probably created myself by ignorance
Christian Perrier [Sat, 8 Sep 2007 09:02:41 +0000 (11:02 +0200)]
Sove the conflicts I probably created myself by ignorance

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Christian Perrier [Sat, 8 Sep 2007 09:01:05 +0000 (11:01 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

debian/changelog
po/ChangeLog

17 years agoNightly changelog police patrol
Guillem Jover [Sat, 8 Sep 2007 03:02:35 +0000 (06:02 +0300)]
Nightly changelog police patrol

17 years agoPackages.bz2 are the preferred alternative to Packages.gz for apt
Guillem Jover [Sat, 8 Sep 2007 02:49:48 +0000 (05:49 +0300)]
Packages.bz2 are the preferred alternative to Packages.gz for apt

17 years agoFix typos in man pages
A. Costa [Sat, 8 Sep 2007 02:44:10 +0000 (05:44 +0300)]
Fix typos in man pages

17 years agoUse fakeroot by default to gain root privileges in dpkg-buildpackage
Guillem Jover [Sat, 8 Sep 2007 02:35:18 +0000 (05:35 +0300)]
Use fakeroot by default to gain root privileges in dpkg-buildpackage

17 years agoStop recognizing the obsolete Optional field when building packages
Guillem Jover [Thu, 6 Sep 2007 02:14:11 +0000 (05:14 +0300)]
Stop recognizing the obsolete Optional field when building packages

17 years agoAvoid escaped quotes by using $() instead of backticks
Guillem Jover [Thu, 6 Sep 2007 02:09:25 +0000 (05:09 +0300)]
Avoid escaped quotes by using $() instead of backticks

The escaped quotes mess up syntax highlighting.

17 years agoDanish translation update
Christian Perrier [Fri, 7 Sep 2007 05:25:08 +0000 (07:25 +0200)]
Danish translation update

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Christian Perrier [Fri, 7 Sep 2007 05:23:17 +0000 (07:23 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Portuguese translation update

17 years ago929t
Miguel Figueiredo [Thu, 6 Sep 2007 20:06:36 +0000 (21:06 +0100)]
929t

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Christian Perrier [Thu, 6 Sep 2007 18:13:25 +0000 (20:13 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoFixed incorrect date.
Peter Karlsson [Thu, 6 Sep 2007 07:34:40 +0000 (08:34 +0100)]
Fixed incorrect date.

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Christian Perrier [Thu, 6 Sep 2007 04:37:17 +0000 (06:37 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

Conflicts:

debian/changelog

17 years agoDo not declare $host_arch as an 'our' variable
Guillem Jover [Thu, 6 Sep 2007 01:50:38 +0000 (04:50 +0300)]
Do not declare $host_arch as an 'our' variable

17 years agoMake %fieldimps private to controllib.pl
Guillem Jover [Thu, 6 Sep 2007 01:47:02 +0000 (04:47 +0300)]
Make %fieldimps private to controllib.pl

17 years agoDocument that apt now requires Packages.bz2 instead of Packages.gz
Guillem Jover [Thu, 6 Sep 2007 01:38:40 +0000 (04:38 +0300)]
Document that apt now requires Packages.bz2 instead of Packages.gz

17 years agoAdd back $dpkglib into @INC, needed by the controllib.pl require in 822-date
Guillem Jover [Thu, 6 Sep 2007 01:33:50 +0000 (04:33 +0300)]
Add back $dpkglib into @INC, needed by the controllib.pl require in 822-date

17 years agoTry to match history with reality
Guillem Jover [Thu, 6 Sep 2007 00:48:42 +0000 (03:48 +0300)]
Try to match history with reality

Few translation commits did not make into the release although they had
been already committed to the repository.

Add a changelog entry for Swedish man page translation.

17 years agoBump version to 1.14.7~.
Guillem Jover [Thu, 6 Sep 2007 00:43:44 +0000 (03:43 +0300)]
Bump version to 1.14.7~.

17 years agoUpdated Swedish man page translation to 1289t.
Peter Karlsson [Wed, 5 Sep 2007 12:06:09 +0000 (13:06 +0100)]
Updated Swedish man page translation to 1289t.

17 years agoRelease 1.14.6.
Guillem Jover [Wed, 5 Sep 2007 04:37:40 +0000 (07:37 +0300)]
Release 1.14.6.

17 years agoBasqqque translation update
Christian Perrier [Wed, 5 Sep 2007 05:31:01 +0000 (07:31 +0200)]
Basqqque translation update

17 years agoRegenerate dpkg-man.pot and marge with all .po files
Guillem Jover [Wed, 5 Sep 2007 04:33:05 +0000 (07:33 +0300)]
Regenerate dpkg-man.pot and marge with all .po files

17 years agoProperly override Homepage field from binary package stanzas
Guillem Jover [Wed, 5 Sep 2007 04:24:52 +0000 (07:24 +0300)]
Properly override Homepage field from binary package stanzas

17 years agoFrench translation update
Frédéric Bothamy [Tue, 4 Sep 2007 01:13:37 +0000 (03:13 +0200)]
French translation update

17 years agoGerman translation update
Christian Perrier [Sun, 2 Sep 2007 18:08:50 +0000 (20:08 +0200)]
German translation update

17 years agoVietnamese translation update
Christian Perrier [Sun, 2 Sep 2007 06:54:31 +0000 (08:54 +0200)]
Vietnamese translation update

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Christian Perrier [Fri, 31 Aug 2007 06:25:19 +0000 (08:25 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoNepali translation update
Christian Perrier [Fri, 31 Aug 2007 06:23:55 +0000 (08:23 +0200)]
Nepali translation update

17 years agoImplement support for Tag field
Guillem Jover [Fri, 31 Aug 2007 02:31:26 +0000 (05:31 +0300)]
Implement support for Tag field

17 years agoSupport Vcs-* fields in control file source package stanza
Guillem Jover [Fri, 31 Aug 2007 02:01:00 +0000 (05:01 +0300)]
Support Vcs-* fields in control file source package stanza

The supported fields are Vcs-Browser, Vcs-Arch, Vcs-Bzr, Vcs-Cvs,
Vcs-Darcs, Vcs-Git, Vcs-Hg, Vcs-Mtn and Vcs-Svn.

17 years agoProperly warn on unknown fields in dpkg-genchanges
Guillem Jover [Fri, 31 Aug 2007 01:35:41 +0000 (04:35 +0300)]
Properly warn on unknown fields in dpkg-genchanges

Explicitely ignore all known fields from the control file source package
stanza in dpkg-genchanges, instead of leaving unknown fields unwarned.

17 years agoIgnore XB- instead of XC- fields from control file binary package stanzas
Guillem Jover [Fri, 31 Aug 2007 01:06:02 +0000 (04:06 +0300)]
Ignore XB- instead of XC- fields from control file binary package stanzas

dpkg-genchanges was wrongly trying to ignore XC- fields (which was a no-op,
those being handled already) when it should have been ignoring XB-.

17 years agoFixed some inconsistencies.
Peter Karlsson [Thu, 30 Aug 2007 19:01:58 +0000 (20:01 +0100)]
Fixed some inconsistencies.

17 years agoRan spelling checker.
Peter Karlsson [Thu, 30 Aug 2007 18:57:10 +0000 (19:57 +0100)]
Ran spelling checker.

17 years agoUpdated to 438t0f0u.
Peter Karlsson [Thu, 30 Aug 2007 18:51:01 +0000 (19:51 +0100)]
Updated to 438t0f0u.

17 years agoUpdated sv to 363t75u.
Peter Karlsson [Thu, 30 Aug 2007 14:04:44 +0000 (15:04 +0100)]
Updated sv to 363t75u.

17 years agoFurther translations.
Peter Karlsson [Thu, 30 Aug 2007 05:58:09 +0000 (06:58 +0100)]
Further translations.

17 years agoStarted translating the scripts PO file.
Peter Karlsson [Wed, 29 Aug 2007 21:12:20 +0000 (22:12 +0100)]
Started translating the scripts PO file.

Committed partial translation to Git to avoid losing strings again the next
time gtranslator refuses to save the file.

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Peter Karlsson [Tue, 28 Aug 2007 15:39:10 +0000 (16:39 +0100)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoFix regression producing perl warnings on update-alternatives
Guillem Jover [Tue, 28 Aug 2007 02:09:22 +0000 (05:09 +0300)]
Fix regression producing perl warnings on update-alternatives

Commit 0fafaf6a2f43c487167a9bfa3f7abc55dcde582c reverted a fix for usage
of uninitialized variables.

17 years agoCleanup second pass parsing of dependency fields
Guillem Jover [Tue, 28 Aug 2007 01:24:06 +0000 (04:24 +0300)]
Cleanup second pass parsing of dependency fields

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Peter Karlsson [Sat, 25 Aug 2007 22:00:10 +0000 (00:00 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Peter Karlsson [Sat, 25 Aug 2007 15:13:02 +0000 (17:13 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoFixed broken date.
Peter Karlsson [Sat, 25 Aug 2007 15:12:25 +0000 (17:12 +0200)]
Fixed broken date.

17 years agoUpdated translation of manual page.
Peter Karlsson [Sat, 25 Aug 2007 15:11:54 +0000 (17:11 +0200)]
Updated translation of manual page.

Updated Swedish translation to 1285t.

17 years agoUpdated Swedish translation.
Peter Karlsson [Sat, 25 Aug 2007 15:06:56 +0000 (17:06 +0200)]
Updated Swedish translation.

Added translations of new strings, all strings translated.

17 years agoAllow overriding Homepage from a package stanza in the control file
Guillem Jover [Fri, 24 Aug 2007 14:39:22 +0000 (17:39 +0300)]
Allow overriding Homepage from a package stanza in the control file

17 years agoRemove option description from comment header, usage has them
Guillem Jover [Fri, 24 Aug 2007 13:57:53 +0000 (16:57 +0300)]
Remove option description from comment header, usage has them

17 years agoAdd bug closure for incorrrectly named FILES section in man page
Guillem Jover [Fri, 24 Aug 2007 13:55:15 +0000 (16:55 +0300)]
Add bug closure for incorrrectly named FILES section in man page

17 years agoAdd more symbols to Dpkg::Shlibs::SymbolFile's blacklist
Raphael Hertzog [Wed, 22 Aug 2007 13:58:31 +0000 (15:58 +0200)]
Add more symbols to Dpkg::Shlibs::SymbolFile's blacklist

Apparently I missed some internal symbols including
_DYNAMIC, _PROCEDURE_LINKAGE_TABLE_, _SDA_BASE_ and
_SDA2_BASE_.

17 years agoImport warning and syserr functions in Dpkg::Shlibs::Objdump::Object
Raphael Hertzog [Wed, 22 Aug 2007 08:06:31 +0000 (10:06 +0200)]
Import warning and syserr functions in Dpkg::Shlibs::Objdump::Object

They were used in that module but not defined. It lead to problems
only when something else failed, so was difficult to detect.

17 years agoUpdate e-mail address of Colin Watson in THANKS file.
Raphael Hertzog [Tue, 21 Aug 2007 12:24:55 +0000 (14:24 +0200)]
Update e-mail address of Colin Watson in THANKS file.

17 years agoImplement support for Homepage field.
Guillem Jover [Sun, 19 Aug 2007 21:10:08 +0000 (00:10 +0300)]
Implement support for Homepage field.

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg
Peter Karlsson [Sat, 18 Aug 2007 22:00:17 +0000 (00:00 +0200)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

17 years agoRegenerate .pot files and merge .po files with them.
Guillem Jover [Sat, 18 Aug 2007 01:29:49 +0000 (04:29 +0300)]
Regenerate .pot files and merge .po files with them.

17 years agoFix perl warning when removing a non diverted file with dpkg-divert
Guillem Jover [Sat, 18 Aug 2007 00:52:08 +0000 (03:52 +0300)]
Fix perl warning when removing a non diverted file with dpkg-divert

17 years agoBegan translating dpkg scripts to Swedish.
Peter Karlsson [Tue, 14 Aug 2007 22:02:20 +0000 (23:02 +0100)]
Began translating dpkg scripts to Swedish.

17 years agoBugfix: add missing "use Dpkg::Gettext" to import the "_g" function
Raphael Hertzog [Tue, 14 Aug 2007 13:40:57 +0000 (15:40 +0200)]
Bugfix: add missing "use Dpkg::Gettext" to import the "_g" function

17 years agoDeperecate a symbol only when the history of version matches.
Raphael Hertzog [Tue, 14 Aug 2007 13:22:23 +0000 (15:22 +0200)]
Deperecate a symbol only when the history of version matches.

When merging symbols in a SymbolFile, a symbol is deprecated when it has
disappeared from the new set of symbols. However when the new set of
symbols dates back to before the current one, deprecating doesn't make
sense. This patch corrects this behaviour. Also add a test to verify that
symbols got correctly marked as deprecated.

17 years agoDon't consider local symbols when merging symbols in SymbolFile
Raphael Hertzog [Tue, 14 Aug 2007 13:09:58 +0000 (15:09 +0200)]
Don't consider local symbols when merging symbols in SymbolFile

Local symbols can only be used by the object defining them so they
can't be used by applications linked against the library. Hence they
are not needed in the "symbols" files that we used to track dependencies
on shared libraries. Use the get_exported_dynamic_symbols function to
ensure that we use the right set of symbols.

17 years agoAdd new attributes (local, global, visibility) to Dpkg::Shlibs::Objdump's symbols
Raphael Hertzog [Tue, 14 Aug 2007 12:38:16 +0000 (14:38 +0200)]
Add new attributes (local, global, visibility) to Dpkg::Shlibs::Objdump's symbols

Those new attributes are needed for further changes in dpkg-gensymbols
behaviour. Update the test suite to include the new attributes.

17 years agoDo not compose strings from translated substrings.
Guillem Jover [Tue, 14 Aug 2007 02:19:57 +0000 (05:19 +0300)]
Do not compose strings from translated substrings.

Make the life easier for translators by not composing strings from tiny
translated parts.

17 years agoAdjust string to get it merged with a similar one.
Guillem Jover [Tue, 14 Aug 2007 02:08:21 +0000 (05:08 +0300)]
Adjust string to get it merged with a similar one.

17 years agoMark strings for translation.
Guillem Jover [Tue, 14 Aug 2007 01:41:48 +0000 (04:41 +0300)]
Mark strings for translation.

17 years agoUpdate TODO list.
Guillem Jover [Tue, 14 Aug 2007 01:36:31 +0000 (04:36 +0300)]
Update TODO list.

Remove obsolete and finished entries.

17 years agoFix year in the latest changelog entry
Robert Luberda [Mon, 13 Aug 2007 23:05:48 +0000 (01:05 +0200)]
Fix year in the latest changelog entry

17 years agoUpdate Polish translations
Robert Luberda [Mon, 13 Aug 2007 22:48:55 +0000 (00:48 +0200)]
Update Polish translations

17 years agoFixed parsing of objdump's output on ia64
Raphael Hertzog [Mon, 13 Aug 2007 21:08:27 +0000 (23:08 +0200)]
Fixed parsing of objdump's output on ia64

ia64 libraries tend to have more entries listed by objdump
with visibility attributes and no versions. This was unexpected
and ended up with the visibility being mistakenly used as symbol
version. This fixes that case and adds a corresponding
non-regression test.

17 years agoBlacklist useless internal symbols in SymbolFile
Raphael Hertzog [Mon, 13 Aug 2007 19:44:15 +0000 (21:44 +0200)]
Blacklist useless internal symbols in SymbolFile

Some external symbols are never used by the applications. They are only
used by the "internal machinery" and create spurious architecture-specific
differences in the symbols files. Thus it's best if we explicitely ignore
them.

17 years agoUpdated dpkg-gensymbols's man page with lots of information
Raphael Hertzog [Mon, 13 Aug 2007 16:33:47 +0000 (18:33 +0200)]
Updated dpkg-gensymbols's man page with lots of information

Explain the new include mechanism and in which cases it can be useful.
Also explain the need to keep the symbols file up-to-date. Include
recommendations to verify that upstream changes the library in sane ways.
This probably needs to be expanded, but probably in an external non-dpkg
related document that we could point to.

17 years agoAdd include mechanism for symbols files.
Raphael Hertzog [Mon, 13 Aug 2007 13:29:44 +0000 (15:29 +0200)]
Add include mechanism for symbols files.

It's now possible to include external files in a "symbols" file
using a cpp-like syntax (#include "filetoinclude"). Provisions
for recursive includes are done. Also add some regression tests.
This is meant to be used by complex packages which have differences
between various architectures and which still want to factorize
some common list of symbols.

17 years agoDo not treat two symlinks to the same directory as a file conflict.
Ian Jackson [Sat, 11 Aug 2007 03:53:55 +0000 (06:53 +0300)]
Do not treat two symlinks to the same directory as a file conflict.

If the package contains a symlink to a directory where the existing
symlink on-disk points to the same place, do not consider it a file
conflict.

17 years agoAdd *.o to .gitignore.
Guillem Jover [Fri, 10 Aug 2007 12:00:35 +0000 (15:00 +0300)]
Add *.o to .gitignore.

17 years agoFix update-alternatives messing with spurious slave link spuriously.
Ian Jackson [Wed, 8 Aug 2007 03:05:17 +0000 (06:05 +0300)]
Fix update-alternatives messing with spurious slave link spuriously.

When a slave alternative is inapplicable do not attempt to create the
slave link before removing it again.

17 years agoDo not print empty lines after 'Setting up ...' output.
Guillem Jover [Wed, 8 Aug 2007 02:43:35 +0000 (05:43 +0300)]
Do not print empty lines after 'Setting up ...' output.

17 years agoUse NULL instead of '(char *)0'.
Guillem Jover [Wed, 8 Aug 2007 02:25:06 +0000 (05:25 +0300)]
Use NULL instead of '(char *)0'.

17 years agoFix Breaks commit.
Guillem Jover [Wed, 8 Aug 2007 01:57:16 +0000 (04:57 +0300)]
Fix Breaks commit.

Enable depisok for the Breaks case. Remove comments stating Breaks needs to
be implemented. And split functions calls which had different arguments
depending on a variable.

17 years agoTighten dependencies between dpkg and dpkg-dev due to the modularization.
Guillem Jover [Tue, 7 Aug 2007 03:29:39 +0000 (06:29 +0300)]
Tighten dependencies between dpkg and dpkg-dev due to the modularization.

17 years agoFix pattern matching in dpkg-query -l and -W.
Guillem Jover [Tue, 7 Aug 2007 03:22:19 +0000 (06:22 +0300)]
Fix pattern matching in dpkg-query -l and -W.

Do not segfault when the result from a 'dpkg-query -l' is bigger than
the total number of current packages, and do not produce repeated
results with overlapping patterns on 'dpkg-query -W'.

17 years agoImplement support for Breaks field.
Ian Jackson [Tue, 7 Aug 2007 02:52:46 +0000 (05:52 +0300)]
Implement support for Breaks field.

As a side effect, run the deconfiguration of each package to be
deconfigured once, instead of once per each conflicting package being
removed.

17 years agoChange formatting to match the rest of the file.
Ian Jackson [Tue, 31 Jul 2007 01:17:02 +0000 (04:17 +0300)]
Change formatting to match the rest of the file.

17 years agoUpdated Russian translation for dselect
Christian Perrier [Mon, 6 Aug 2007 07:06:00 +0000 (09:06 +0200)]
Updated Russian translation for dselect

17 years agoRussian translation update.
Christian Perrier [Mon, 6 Aug 2007 07:04:38 +0000 (09:04 +0200)]
Russian translation update.

17 years agoRan spelling checker on translation.
Peter Karlsson [Sun, 5 Aug 2007 20:55:18 +0000 (21:55 +0100)]
Ran spelling checker on translation.

17 years agoMerge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731
Peter Karlsson [Sun, 5 Aug 2007 20:29:21 +0000 (21:29 +0100)]
Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731

Conflicts:

man/ChangeLog