[Merge] lp:~mfisch/ubuntu/saucy/lm-sensors/merge-to-3.3.4 into lp:ubuntu/saucy/lm-sensors

[Matt Fischer]

Here's a diff of the debian dirs of this vs the debian I merged from since the one below is long due to a new upstream.

mfisch at virgon:~/tmp/lm-sensors/debian$ diff -r . ../../lm-sensors.debian/debian
diff -r ./changelog ../../lm-sensors.debian/debian/changelog
1,8d0
< lm-sensors (1:3.3.4-2ubuntu1) trusty; urgency=low
< 
<   * Merge from Debian unstable (LP: #1256671). Remaining changes:
<     - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
<       than init-script.
< 
<  -- Matt Fischer <mfisch at ubuntu.com>  Mon, 02 Dec 2013 21:07:32 -0700
< 
24,31d15
< lm-sensors (1:3.3.3-1ubuntu1) saucy; urgency=low
< 
<   * Merge from Debian unstable (LP: #1178520). Remaining changes:
<     - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
<       than init-script.
< 
<  -- Matthew Fischer <matthew.fischer at canonical.com>  Thu, 09 May 2013 21:55:15 -0600
< 
45,53d28
< lm-sensors (1:3.3.2-2ubuntu1) raring-proposed; urgency=low
< 
<   * Merge from Debian unstable (LP: #1075010). Remaining changes:
<     - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
<       than init-script.
<   * Update 100_recommend_using_upstart.patch to reflect kmod transition.
< 
<  -- Logan Rosen <logatronico at gmail.com>  Mon, 05 Nov 2012 13:18:21 -0500
< 
71,84d45
< lm-sensors (1:3.3.1-2ubuntu2) quantal; urgency=low
< 
<   * Rebuild for new armel compiler default of ARMv5t.
< 
<  -- Colin Watson <cjwatson at ubuntu.com>  Fri, 05 Oct 2012 11:37:42 +0100
< 
< lm-sensors (1:3.3.1-2ubuntu1) precise; urgency=low
< 
<   * Merge from debian testing, remaining changes are:
<     - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
<       than init-script. 
< 
<  -- Chuck Short <zulcss at ubuntu.com>  Tue, 21 Feb 2012 08:53:20 -0500
< 
1779a1741,1743
> Local variables:
> mode: debian-changelog
> End:
diff -r ./control ../../lm-sensors.debian/debian/control
5,6c5
< Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
< XSBC-Original-Maintainer: Aurelien Jarno <aurel32 at debian.org>
---
> Maintainer: Aurelien Jarno <aurel32 at debian.org>
Only in ./patches: 100_recommend_using_upstart.patch
diff -r ./patches/series ../../lm-sensors.debian/debian/patches/series
13d12
< 100_recommend_using_upstart.patch

-- 
https://code.launchpad.net/~mfisch/ubuntu/saucy/lm-sensors/merge-to-3.3.4/+merge/197632
Your team Ubuntu branches is requested to review the proposed merge of lp:~mfisch/ubuntu/saucy/lm-sensors/merge-to-3.3.4 into lp:ubuntu/saucy/lm-sensors.