Last commit made on 2013-01-23
Get this branch:
git clone -b ubuntu/raring-proposed 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

d5c759b... by Jamie Strandboge on 2013-01-23

Import patches-unapplied version 2.6.4-2.2ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: cd3faaa69db7f05aee5b6465fb181c9b589a767a

New changelog entries:
  * Merge from Debian. Remaining changes:
    - debian/control:
      + remove Build-Depends on libpowerman0-dev
      + remove nut-powerman-pdu
    - debian/nut-powerman-pdu.{install,manpages}: dropped for now
    - debian/{nut-cgi,nut-server}.postinst: add nut to the dialout and nut
      groups unconditonally to handle the upgrade from hardy release.
    - debian/source_nut.py, debian/{nut,nut-server,nut-client}.install,
      debian/rules: Install apport hooks for all top-level nut packages.
    - debian/rules: Use udev version for Ubuntu
    - debian/series, debian/patches/backport-fix-lp753661.patch: re-enabled
  * Dropped the following patches, no longer required:
    - debian/patches/CVE-2012-2944.patch (included upstream)

cd3faaa... by Ivo De Decker <email address hidden> on 2012-12-20

Import patches-unapplied version 2.6.4-2.2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 5bd33d52fc7fd27cb5461d8157c21eb385146dd0

New changelog entries:
  * Non-maintainer upload with fixes for wheezy.
  * Only remove /etc/init.d/nut from previous versions of nut in nut-server
    postinst if there are no local changes.
  * Also remove /etc/init.d/nut in nut-client postinst. Thanks to
    Laurent Bigonville for the hint.
  * Only fix permissions of configfiles on first install.
  * debian/control: Fix typo in package description. Thanks to Julien Cristau
    for spotting this.

5bd33d5... by Sébastien Villemot on 2012-11-26

Import patches-unapplied version 2.6.4-2.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0e3166762426ad7702928398a6daed90411e8e03

New changelog entries:
  * Non-maintainer upload.
  * debian/nut-client.preinst: revert /etc/nut/nut.conf mangling done by older
    versions of the postinst (Closes: #677054)

0e31667... by Laurent Bigonville on 2012-08-12

Import patches-unapplied version 2.6.4-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c244f2f60448b069231a6cba1f36c7491bc11a60

New changelog entries:
  * debian/rules: Stop the nut-client before nut-server on systems using static
    boot ordering (Closes: #679451)
  * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
    (Closes: #677822)
  * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
    adjust overrides now that ups-monitor is shipped in nut-client package
    (Closes: #677947)
  * Add debian/patches/0001-fix-upsmon-regression.patch: Fix upsmon/upssched
    regression (Taken from upstream) (Closes: #679513)
  * Move nut metapackage to Section: metapackages
  * Also create nut user when installing nut-client package and do not delete
    it on purge anymore (Closes: #682000)
  * Drop /etc/default/nut → /etc/nut/nut.conf migration code, migration
    happends before squeeze release and this was against policy to have a
    maintainer script modifying a conffile in the first place (Closes: #684392)
  * Add dependency against adduser and lsb-base on nut-client package
  * Be sure that client is stopped before the server also when using
    dependencies based boot
  * Fix package descriptions (Closes: #678068)
  * Also install /bin/upssched-cmd in nut-client package as this script is
    referenced in default upssched.conf config file
  * debian/watch: Update watch file
  * Be sure that all maintainer scripts are returning 0 at their end

c244f2f... by Arnaud Quette on 2012-06-06

Import patches-unapplied version 2.6.4-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b4337bcc21c4fbc907a2216fa657b77f71333bca

New changelog entries:
  * New upstream release (Closes: #671444)
  * acknowledges NMU (Closes: #613643)
  * debian/nut-client.init: fix action "start" and use of log_*_*msg
    LSB log functions (Closes: #675619)
  * debian/nut-server.preinst: remove obsolete file(s) left in
    /etc/udev/rules.d and related processing: udev files are now located
    in /lib/udev/rules, and there is no reason to modify the dedicated
    USB UPS rules (52-nut-usbups.rules) (Closes: #660072)

b4337bc... by Arnaud Quette on 2012-01-24

Import patches-unapplied version 2.6.3-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c30145e704cfc3180ebc0669b59698a583200718

New changelog entries:
  * debian/nut-server.init: rewrite to match upsd / drivers startup scope
  * debian/nut-client.init: created to match upsmon startup scope
    (Closes: #634858)
  * debian/nut.TODO.Debian, debian/Makefile.am: updated to reflect the above
  * debian/rules: install nut-client.init, and update to reflect the above
  * debian/control, debian/Makefile.am: updated to reflect the above
  * debian/control:
    - add Breaks on nut-server (<< 2.6.3-1~)
    - bump Standards-Version to 3.9.3
  * debian/nut-client.links: renamed from debian/nut-server.links, since
    ups-monitor is now provided by nut-client initscript
  * debian/nut.README.Debian: renamed from nut-server.README.Debian,
    to provide it with both client and server packages
  * debian/nut-server.install: add missing drivers (clone-outlet,
    liebert-esp2 and microdowell)
  * debian/nut-server.manpages: add missing manual pages (apcsmart-old,
    ivtscd, liebert-esp2 and microdowell)

c30145e... by Arnaud Quette on 2012-01-24

Import patches-unapplied version 2.6.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ecf6d991f32895a6cf89ff14ad3a2c6e502abede

New changelog entries:
  * New upstream release (Closes: #635186, #598741, #633756, #638221)
  * debian/nut-server.{install,manpages}: add richcomm_usb
  * debian/nut-server.install, debian/rules: install Avahi service file
  * debian/rules, nut-client.install: install Augeas lenses
  * debian/nut-server.README.Debian: clarify udev explanation (Closes: #529664)
  * debian/patches/0001-fix_spelling_and_typo.patch,
    debian/patches/0003-libupsclient-version.patch: removed since these are now
    fixed upstream
  * debian/patches/series: updated

ecf6d99... by Arnaud Quette on 2011-09-29

Import patches-unapplied version 2.6.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d76c1b70594c88f0090113ab8deb768af14072d2

New changelog entries:
  * New upstream release (Closes: #594989)
  * debian/control:
    - remove legacy Build-Depends for nut-hal-drivers on libdbus and libglib
    - Build-Depends-Indep on docbook-xsl for offline document
      generation (Closes: #635347)
  * debian/nut-server.install: add apcsmart-old
  * debian/nut-server.init:
    - add udev as Required-Start/Stop (Closes: #642412)
    - remove legacy support for /etc/default/nut (Closes: #638021)
  * debian/patches/0003-libupsclient-version.patch: added to fix the missing
    libupsclient version info bump
  * debian/libupsclient1-dev.links: update link name
  * debian/libupsclient1.symbols: add with upscli_tryconnect
  * debian/nut.TODO.Debian: update and complete the TODO list

d76c1b7... by Laurent Bigonville on 2011-07-17

Import patches-unapplied version 2.6.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 098d17f81db1c6fed34e0b9cccc47e68659609f7

New changelog entries:
  * debian/nut.README.Debian: Adjust udev rules naming for permissions override
    (Closes: #529664)
  * Re-add and refresh debian/patches/0001-fix_spelling_and_typo.patch:
    Some typos and spelling errors remain.
  * Split nut package into nut-client and nut-server, keep nut package as
  * Generate PDF and html doc and install it in nut-doc package
  * debian/rules:
    - List non-installed files
    - Includes python-module.mk
    - Add flags to build documentation and install it
  * debian/control:
    - Add python-nut package and add python build-dependency
    - Set nut-powerman-pdu priority to extras
    - Add nut-monitor package
    - Add nut-doc package and add required C/R/P
    - Add libups-nut-perl package
  * debian/nut-server.prerm: Remove /var/run/nut during removal

098d17f... by Arnaud Quette on 2011-06-01

Import patches-unapplied version 2.6.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 9581a83331cbb8c6b31c6d1d764753ab0d05d992

New changelog entries:
  * New upstream release (Closes: #595953, #614842, #595773)
  * debian/patches/*.patch: removed since these are now fixed upstream
  [Laurent Bigonville]
  * Drop HAL package and build-dependencies (Closes: #613197)
  * debian/control:
    - Bump Standards-Version to 3.9.2 (no further changes)
    - Drop autotools build-dependencies (not needed anymore)
    - Drop non-existing build-dependencies
  * debian/rules:
    - Correctly pass flags to configure