diffstat of debian/ for nagios-nrpe_2.12-5 nagios-nrpe_2.12-5ubuntu1

 changelog |   29 +++++++++++++++++++++++++++++
 control   |    5 +++--
 rules     |    7 ++++++-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff -u nagios-nrpe-2.12/debian/changelog nagios-nrpe-2.12/debian/changelog
--- nagios-nrpe-2.12/debian/changelog
+++ nagios-nrpe-2.12/debian/changelog
@@ -1,3 +1,12 @@
+nagios-nrpe (2.12-5ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/{rules,control}: add hardening-includes to gain PIE
+      security builds.
+  * Use dpkg-buildflags.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 18 Oct 2011 15:09:21 +0200
+
 nagios-nrpe (2.12-5) unstable; urgency=low
 
   [ Alexander Wirt ]
@@ -22,6 +31,26 @@
 
  -- Alexander Wirt <formorer@debian.org>  Sun, 25 Sep 2011 08:35:48 +0200
 
+nagios-nrpe (2.12-4ubuntu3) oneiric; urgency=low
+
+  * Configure with --with-ssl-lib=<multiarch dir>. LP: #829434.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Aug 2011 21:10:45 +0200
+
+nagios-nrpe (2.12-4ubuntu2) oneiric; urgency=low
+
+  * Rebuild for OpenSSL 1.0.0.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 17 May 2011 12:16:15 +0100
+
+nagios-nrpe (2.12-4ubuntu1) lucid; urgency=low
+
+  * debian/{rules,control}: add hardening-includes to gain PIE
+    security builds.
+  * debian/control: Update maintainer according to spec.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 07 Jan 2010 14:31:00 -0500
+
 nagios-nrpe (2.12-4) unstable; urgency=low
 
   * Build against libwrap0-dev (Closes: #412705)
diff -u nagios-nrpe-2.12/debian/rules nagios-nrpe-2.12/debian/rules
--- nagios-nrpe-2.12/debian/rules
+++ nagios-nrpe-2.12/debian/rules
@@ -6,11 +6,16 @@
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
+include /usr/share/hardening-includes/hardening.make
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(HARDENING_CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(HARDENING_CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) $(HARDENING_CFLAGS)
+
 %:
 	    dh $@ --with dpatch,autotools_dev
 
 override_dh_auto_configure:
-	./configure \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
 		--prefix=/usr \
 		--enable-ssl \
 		--with-ssl-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
diff -u nagios-nrpe-2.12/debian/control nagios-nrpe-2.12/debian/control
--- nagios-nrpe-2.12/debian/control
+++ nagios-nrpe-2.12/debian/control
@@ -1,9 +1,10 @@
 Source: nagios-nrpe
 Section: net
 Priority: optional
-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
 Uploaders: sean finney <seanius@debian.org>, Jason Thomas <jason@debian.org>, Alexander Wirt <formorer@debian.org>, Luk Claes <luk@debian.org>
-Build-Depends: debhelper (>= 8), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1)
+Build-Depends: debhelper (>= 8), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1), hardening-includes
 Standards-Version: 3.9.2
 
 Package: nagios-nrpe-server