Merge branch 'jessie'

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index 01f048c,9cab981..753b3cc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,19 @@@
 -os-prober (1.58) UNRELEASED; urgency=low
++os-prober (1.59) UNRELEASED; urgency=low
+ 
+   * Fix cross-building and use dpkg-buildflags.
+ 
 - -- Colin Watson <cjwatson@debian.org>  Wed, 09 Jan 2013 12:44:26 +0000
++ -- Colin Watson <cjwatson@debian.org>  Tue, 14 May 2013 21:06:35 +0100
++
 +os-prober (1.58) unstable; urgency=low
 +
 +  [ Steve McIntyre ]
 +  * add UEFI support, patch from Andrey Borzenkov:
 +    + skip legacy MS loader detection on UEFI platform
 +    + add framework for searching EFI System Partition
 +    + add scripts that detect Microsoft bootloader and ELILO.
 +  * Add myself to uploaders.
 +
 + -- Steve McIntyre <93sam@debian.org>  Sun, 28 Apr 2013 16:01:50 +0100
  
  os-prober (1.57) unstable; urgency=low
  

diff --cc debian/control
index c95f4fe,c8adad4..a25d15b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,8 -2,8 +2,8 @@@ Source: os-probe
  Section: debian-installer
  Priority: optional
  Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 -Uploaders: Colin Watson <cjwatson@debian.org>, Joey Hess <joeyh@debian.org>, Christian Perrier <bubulle@debian.org>
 +Uploaders: Colin Watson <cjwatson@debian.org>, Joey Hess <joeyh@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org>
- Build-Depends: debhelper (>= 7.0.50)
+ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7)
  Standards-Version: 3.9.3
  Vcs-Browser: http://git.debian.org/?p=d-i/os-prober.git
  Vcs-Git: git://git.debian.org/d-i/os-prober.git