Last commit made on 2017-02-17
Get this branch:
git clone -b ubuntu/zesty https://git.launchpad.net/ubuntu/+source/nut
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d91feed... by Adam Conrad on 2017-02-17

Import patches-unapplied version 2.7.4-5ubuntu2 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: f9e8a51edb4f20cdd35a881c8e87e9cda417675b

New changelog entries:
  * debian/libnutclient0.symbols: Correct symbols file for ppc64el.

f9e8a51... by Louis Bouchard on 2016-12-15

Import patches-unapplied version 2.7.4-5ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 9673ec4aef76add240bd41aa527192c85d3359a6
Upload parent: 45bdc714e64877f678f85ebd8fe7ad4a4c1029b9

New changelog entries:
  * Merge with Debian; remaining changes (LP: #1643618)
    - debian/control:
      + remove Build-Depends on libpowerman0-dev
      + remove nut-powerman-pdu
    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
    - debian/nut-{cgi,server}.postinst: fix 'adduser' logic to be
      unconditional, since adduser is guaranteed to be idempotent.
    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
      debian/rules: Install apport hooks for all top-level nut packages.
    - Disable systemd unit; it does not check nut.conf whether nut is
      configured, and thus fails to start (and the package install). The
      init.d script works well enough for the time being.
    - debian/tests/test-nut.py:
      + In the CVE_2012_2944 test, give nut at most 5 seconds to shut down,
        instead of expecting it to be shut down immediately after sending the
      + Additional indication on how to run tests for oneiric, precise to
        vivid and wily+
    - debian/tests/control : Fix dep8 test failures:
      + Drop python-unit from dep8 dependencies since the python-test
        package has now been removed. The unittest module has shipped with
        Python since 2.1.
      + Add dep8 test dependency on python, since Python 2 is required and
        is not necessarily installed by default any more.
  * Dropped changes:
    - Patch libtool.m4 and configure to support ppc64le. (Fixed upstream)
    - Remove unnecessary chmod 755 on files introduced by previous merge,
      assumed to be an error
    - debian/patches/0006-ups-conf-maxretry.patch: documentation tweaks
      (unnecessary Ubuntu delta). This was formerly listed as "Move maxretry
      setting above Examples section" but no longer did this at all.
  * Replace outdated indictions on how to run tests (Oneric, Precise, Vivid,
    Wily+) with proper indications for current version (Xenial+)

45bdc71... by Robie Basak on 2017-02-16

Bump version following rebase

1a00015... by Robie Basak on 2017-02-16

Fix changelog bullet formatting

9d919dd... by Robie Basak on 2017-02-16

Release to Zesty

51aa106... by Robie Basak on 2017-02-16

Fix transfer of systemd disablement delta

0915324... by Robie Basak on 2017-02-16

Document reason for drop of chmod 755 delta

2926530... by Robie Basak on 2017-02-16

Document dropping of tweak to 0006-ups-conf-maxretry.patch

8012abf... by Robie Basak on 2017-02-16

Revert " - debian/patches/0006-ups-conf-maxretry.patch: Move maxretry setting"

This reverts commit 13d656dc156ae9f4eb35d2840344d0e7b3f2e7c5.

This doesn't do anything useful any more, so is unnecessary Ubuntu
delta that we can drop.

f6beb19... by Robie Basak on 2017-02-16

Fix changelog formatting