diff -Nru cups-pk-helper-0.2.5/debian/changelog cups-pk-helper-0.2.5/debian/changelog --- cups-pk-helper-0.2.5/debian/changelog 2013-06-11 10:37:40.000000000 +0000 +++ cups-pk-helper-0.2.5/debian/changelog 2016-01-08 17:10:14.000000000 +0000 @@ -1,9 +1,35 @@ +cups-pk-helper (0.2.5-2ubuntu2) xenial; urgency=medium + + * Merge with Debian; remaining changes: + - Build using dh-autoreconf. + - Bump the standards version. + - Build with pie. + + -- Matthias Klose Fri, 08 Jan 2016 17:50:49 +0100 + +cups-pk-helper (0.2.5-2) unstable; urgency=medium + + * [ba6e475] Bump debhelper dependency to 9 to enable hardened build-flags + Thanks to Moritz Muehlenhoff (Closes: #734803) + + -- Guido Günther Sun, 12 Jan 2014 12:55:09 +0100 + +cups-pk-helper (0.2.5-1) unstable; urgency=low + + * [4ec8dbf] New upstream version 0.2.5 + (Closes: #713591) + * [1781960] Update patches: + 0003-Revert-Be-stricter-when-validating-printer-names.patch - fixed + upstream + + -- Guido Günther Mon, 24 Jun 2013 19:55:21 +0200 + cups-pk-helper (0.2.5-0ubuntu1) saucy; urgency=low * New upstream version: - Revert "Be stricter when validating printer names" - New/updated translations - * debian/control: + * debian/control: - updated debhelper requirement to match compat, updated standards-version * debian/patches/git_revert_stricter_validating.patch: - dropped, the fix is in the new version @@ -52,6 +78,13 @@ -- Sebastien Bacher Thu, 08 Nov 2012 11:36:02 +0100 +cups-pk-helper (0.2.3-3) unstable; urgency=low + + * [0e08076] Revert "Be stricter when validating printer names" + Thanks to Kjö Hansi Glaz + + -- Guido Günther Fri, 11 Jan 2013 22:20:14 +0100 + cups-pk-helper (0.2.3-2) unstable; urgency=low * [a4c337b] Make sure O_NOFOLLOW can be used. Fixes FTBS on diff -Nru cups-pk-helper-0.2.5/debian/control cups-pk-helper-0.2.5/debian/control --- cups-pk-helper-0.2.5/debian/control 2013-06-11 10:36:23.000000000 +0000 +++ cups-pk-helper-0.2.5/debian/control 2016-01-08 17:11:27.000000000 +0000 @@ -3,10 +3,7 @@ Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Guido Günther -Build-Depends: debhelper (>= 9), - autotools-dev, - autoconf, - automake, +Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, gnome-common, intltool, diff -Nru cups-pk-helper-0.2.5/debian/patches/0001-Make-sure-O_NOFOLLOW-can-be-used.patch cups-pk-helper-0.2.5/debian/patches/0001-Make-sure-O_NOFOLLOW-can-be-used.patch --- cups-pk-helper-0.2.5/debian/patches/0001-Make-sure-O_NOFOLLOW-can-be-used.patch 1970-01-01 00:00:00.000000000 +0000 +++ cups-pk-helper-0.2.5/debian/patches/0001-Make-sure-O_NOFOLLOW-can-be-used.patch 2013-06-24 17:29:56.000000000 +0000 @@ -0,0 +1,51 @@ +From: =?UTF-8?q?Guido=20G=C3=BCnther?= +Date: Tue, 16 Oct 2012 19:54:45 +0200 +Subject: Make sure O_NOFOLLOW can be used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks Moritz Mühlenhoff +--- + configure.ac | 3 +++ + src/cups.c | 6 ++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c3accc8..e865318 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5,6 +5,9 @@ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) + ++# Make sure _GNU_SOURCE is defined for O_NOFOLLOW ++AC_USE_SYSTEM_EXTENSIONS ++ + # Standard C stuff + AC_PROG_CC + +diff --git a/src/cups.c b/src/cups.c +index 92425eb..2f7ff22 100644 +--- a/src/cups.c ++++ b/src/cups.c +@@ -22,6 +22,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #include + #include + #include +@@ -35,8 +39,6 @@ + #include + #include + +-#include +- + #include + #include + #include diff -Nru cups-pk-helper-0.2.5/debian/patches/configure.patch cups-pk-helper-0.2.5/debian/patches/configure.patch --- cups-pk-helper-0.2.5/debian/patches/configure.patch 2013-06-11 10:31:52.000000000 +0000 +++ cups-pk-helper-0.2.5/debian/patches/configure.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - [https://bugs.freedesktop.org/enter_bug.cgi?product=cups-pk-helper]) - AC_CONFIG_SRCDIR(src/cups-pk-helper-mechanism.c) - AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) --m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) - AM_CONFIG_HEADER(config.h) - - # Standard C stuff -@@ -77,6 +77,7 @@ - source code location: ${srcdir} - compiler: ${CC} - cflags: ${CFLAGS} -+ ldflags: ${LDFLAGS} - Maintainer mode: ${USE_MAINTAINER_MODE} - Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} - diff -Nru cups-pk-helper-0.2.5/debian/patches/series cups-pk-helper-0.2.5/debian/patches/series --- cups-pk-helper-0.2.5/debian/patches/series 2013-06-11 10:34:37.000000000 +0000 +++ cups-pk-helper-0.2.5/debian/patches/series 2016-01-08 17:10:03.000000000 +0000 @@ -1 +1 @@ -configure.patch +0001-Make-sure-O_NOFOLLOW-can-be-used.patch