From 8a9e63a85db67e805906f5c176360aae0e998c0f Mon Sep 17 00:00:00 2001 From: Jakob Haufe Date: Thu, 29 Dec 2016 17:31:01 +0100 Subject: [PATCH] Prepare 3.4.0 - Drop now unneeded hardening-no-fortify-functions override - Convert ldconfig call in postrm to trigger - Bump Standards-Version (no changes needed) - New patch: glabels/debian/patches/gnome-common-cleanup (Closes: #830033) --- debian/changelog | 10 ++++++++++ debian/control | 3 ++- debian/glabels.lintian-overrides | 2 -- debian/glabels.postrm | 10 ---------- debian/glabels.triggers | 1 + debian/patches/gnome-common-cleanup | 19 +++++++++++++++++++ debian/patches/series | 1 + 7 files changed, 33 insertions(+), 13 deletions(-) delete mode 100644 debian/glabels.postrm create mode 100644 debian/glabels.triggers create mode 100644 debian/patches/gnome-common-cleanup diff --git a/debian/changelog b/debian/changelog index 2962ebd7..95ed6d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +glabels (3.4.0-1) UNRELEASED; urgency=medium + + * New upstream version + * Drop now unneeded hardening-no-fortify-functions override + * Convert ldconfig call in postrm to trigger + * Bump Standards-Version (no changes needed) + * New patch: glabels/debian/patches/gnome-common-cleanup (Closes: #830033) + + -- Jakob Haufe Fri, 09 Dec 2016 00:27:06 +0100 + glabels (3.2.1-2) unstable; urgency=medium * Call ldconfig in postrm to make lintian happy diff --git a/debian/control b/debian/control index b44589b8..35247437 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: gnome Priority: optional Maintainer: Jakob Haufe Build-Depends: autotools-dev, + autoconf-archive, cdbs, dpkg-dev (>= 1.16.1~), debhelper (>= 9.0), @@ -20,7 +21,7 @@ Build-Depends: autotools-dev, barcode (>= 0.98), libqrencode-dev (>= 3.1.0), libiec16022-dev (>= 0.2.4) -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://glabels.org/ Package: glabels diff --git a/debian/glabels.lintian-overrides b/debian/glabels.lintian-overrides index c9f9e4a7..ae2622c8 100644 --- a/debian/glabels.lintian-overrides +++ b/debian/glabels.lintian-overrides @@ -1,6 +1,4 @@ # We have no external users of those libraries yet glabels: package-name-doesnt-match-sonames libglabels-3.0-8 libglbarcode-3.0-0 -# All hardening flags are present, unsolvable ATM -glabels: hardening-no-fortify-functions usr/bin/glabels-3 # No reasonable keywords to be added here glabels: desktop-entry-lacks-keywords-entry usr/share/applications/glabels-3.0.desktop diff --git a/debian/glabels.postrm b/debian/glabels.postrm deleted file mode 100644 index c8d5e40e..00000000 --- a/debian/glabels.postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e - -if [ "$1" = "remove" ]; then - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/glabels.triggers b/debian/glabels.triggers new file mode 100644 index 00000000..dd866036 --- /dev/null +++ b/debian/glabels.triggers @@ -0,0 +1 @@ +activate-noawait ldconfig diff --git a/debian/patches/gnome-common-cleanup b/debian/patches/gnome-common-cleanup new file mode 100644 index 00000000..23cd9c02 --- /dev/null +++ b/debian/patches/gnome-common-cleanup @@ -0,0 +1,19 @@ +Description: Replace deprecated gnome-common macro + GNOME_COMPILER_WARNINGS has been deprecated. Replace it by call to + AX_COMPILER_FLAGS. +Author: Jakob Haufe +Bug-Debian: https://bugs.debian.org/830033 +Forwarded: https://github.com/jimevins/glabels/pull/18 +Last-Update: 2016-12-15 + +--- glabels-3.4.0.orig/configure.ac ++++ glabels-3.4.0/configure.ac +@@ -43,7 +43,7 @@ AC_SEARCH_LIBS([strerror],[cposix]) + AC_PROG_CC + AC_PROG_INSTALL + +-GNOME_COMPILE_WARNINGS ++AX_COMPILER_FLAGS + + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) diff --git a/debian/patches/series b/debian/patches/series index 1712b23f..b180712a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0002-manpage.patch 0003-Ignore-license.page.patch +gnome-common-cleanup -- 2.39.5