[Piuparts-commits] [piuparts] 11/11: Merge remote-tracking branch 'andreas/for-holger' into develop

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 97a29e7e0989bddb80fa1cd0696f732369c8256d
Merge: 3d0b8ed 7204993
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Dec 8 13:14:45 2013 +0100

    Merge remote-tracking branch 'andreas/for-holger' into develop
    
    Conflicts resolved in:
    	piuparts-report.py

 .../scripts-wheezy/pre_distupgrade_wheezy          | 113 +++++++++++++++++++++
 custom-scripts/scripts/pre_install_exceptions      |   9 +-
 .../scripts/pre_remove_50_find_bad_permissions     |  14 +--
 debian/changelog                                   |   5 +
 master-bin/detect_network_issues.in                |   2 +
 master-bin/detect_well_known_errors.py             |  15 +--
 piuparts-report.py                                 |   2 +-
 piupartslib/__init__.py                            |  71 +++++++++----
 piupartslib/packagesdb.py                          |   8 ++
 9 files changed, 198 insertions(+), 41 deletions(-)

diff --cc piuparts-report.py
index ee1ac87,04d53f2..60fcef8
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@@ -401,9 -401,10 +401,10 @@@ linktarget_by_template = 
      ("py_file_not_bytecompiled_inadequate_issue.tpl", "but adequate found a .py file that is not byte-compiled"),
      ("pyshared_file_not_bytecompiled_inadequate_issue.tpl", "but adequate found a .py file in /usr/share/pyshared that is not byte-compiled"),
      ("undefined_symbol_inadequate_issue.tpl", "but adequate found an undefined symbol"),
 -    ("symbol-size-mismatch_inadequate_issue.tpl", "but adequate tagged it 'symbol-size-mismatch'"),
 -    ("missing-symbol-version-information_inadequate_issue.tpl", "but adequate tagged it 'missing-symbol-version-information'"),
 -    ("unknown_inadequate_issue.conf", "but an unknown adequate was found"),
 +    ("symbol-size-mismatch_inadequate_issue.tpl", "but adequate found that a symbol has changed size since the package was built"),
 +    ("missing-symbol-version-information_inadequate_issue.tpl", "but adequate found that a library is missing symbol version information"),
 +    ("unknown_inadequate_issue.conf", "but an unknown adequate issue was found"),
+     ("inadequate_exit_issue.tpl", "due to adequate exiting inadequately"),
      ("packages_have_been_kept_back_issue.tpl", "but logfile contains 'packages have been kept back'"),
      ("needs_rebuild_issue.tpl", "but logfile recommends to rebuild some packages"),
      ("obsolete_conffiles_issue.tpl", "but logfile reports obsolete conffiles"),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git