[collectd-changes] pkg-collectd: branch "master" updated. collectd-5.4.0-3-12-g646a471

[Sebastian Harl]

The branch "master" of project "collectd Debian package"
has been updated
       via  646a4717ecd76af3a7273526c7be90ed3e444eef (commit)
       via  144d778b1074fd0f1a680b0d64a547a699c8f067 (commit)
       via  8097955751ea1aba06470ee6557ba489a46c3ddc (commit)
       via  8054f0bc2427d3e201a7b731a306ebd8b815bfa5 (commit)
       via  a852d6e6d5fb7cd1a80a7d983fc97ee20c602161 (commit)
       via  910a2ce0096d937c3265165617a7286516e25512 (commit)
       via  e50807c32e616144c25a0db392d3045857796489 (commit)
       via  8945bb90ada20b5ab2b2b54be110117b18f49220 (commit)
       via  53fb1738f6935ecbc0a3dccfcf043829053e97a9 (commit)
      from  c58bb5aa0ac65f25456ea8a5ec27a481d9cff19a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 646a4717ecd76af3a7273526c7be90ed3e444eef
Merge: c58bb5a 144d778
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 23:03:16 2014 +0100

    Merged branch 'v5.4.1'.
    
    Conflicts:
    	debian/changelog

commit 144d778b1074fd0f1a680b0d64a547a699c8f067
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 22:27:30 2014 +0100

    rules: Use -Wno-error=deprecated-declarations for now.
    
    This is to suppress libdbi deprecation warnings. They would else cause build
    failures due to -Werror.

commit 8097955751ea1aba06470ee6557ba489a46c3ddc
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:47:07 2014 +0100

    Released changelog.

commit 8054f0bc2427d3e201a7b731a306ebd8b815bfa5
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:37:27 2014 +0100

    control: Updated standards-version to 3.9.5; no changes.

commit a852d6e6d5fb7cd1a80a7d983fc97ee20c602161
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:34:25 2014 +0100

    changelog: 5.4.1 fixes #735173.

commit 910a2ce0096d937c3265165617a7286516e25512
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:30:36 2014 +0100

    changelog: 5.4.1 fixes #732701.

commit e50807c32e616144c25a0db392d3045857796489
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:30:19 2014 +0100

    Updated collectd.conf for 5.4.1.

commit 8945bb90ada20b5ab2b2b54be110117b18f49220
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:25:44 2014 +0100

    patches/: Removed amqp_0_4.dpatch; merged upstream.

commit 53fb1738f6935ecbc0a3dccfcf043829053e97a9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Jan 28 21:23:15 2014 +0100

    Updated changelog to 5.4.1-1.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |   19 ++++++-
 debian/collectd.conf           |    2 +-
 debian/control                 |    2 +-
 debian/patches/00list          |    1 -
 debian/patches/amqp_0_4.dpatch |  109 ----------------------------------------
 debian/rules                   |    2 +-
 6 files changed, 21 insertions(+), 114 deletions(-)
 delete mode 100644 debian/patches/amqp_0_4.dpatch