debian/bamfdaemon.install

-usr/lib/*/bamf
+usr/libexec/bamf
 usr/share/dbus-1/services/
 usr/lib/systemd/user/bamfdaemon.service
 usr/share/upstart/sessions/bamfdaemon.conf

debian/changelog

+bamf (0.5.4-2) unstable; urgency=medium
+
+  [ handsome_feng ]
+  * debian/patches:
+    + Add 1003_add-compile-warning-flags.patch. Add enable-compile-warnings
+      to configure.ac. (Closes: #940164)
+
+  [ Mike Gabriel ]
+  * debian/{compat,control}:
+    + Use debhelper-compat notation. Bump to DH compat level version 12.
+  * debian/rules:
+    + Use dh_missing override instead of dh_install --fail-missing.
+    + Set --without autoreconf, handled by autogen.sh.
+  * debian/control:
+    + Bump Standards-Version: to 4.4.1. No changes needed.
+    + Add Rules-Requires-Root: field and set it to no.
+    + Update B-D python-libxslt1 -> python3-lxml. (Closes: #942913).
+  * debian/patches:
+    + Fix typo in 1003_add-compile-warning-flags.patch
+    + Add 1004_py2to3_gtester2xunit.patch. Use python3 for gtester2xunit.py.
+      Port libxml2/libxslt module usage to lxml module usage.
+  * debian/bamfdaemon.install:
+    + New file location for bamfdaemon and bamfdaemon-dbus-runner (libexec
+      dir).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 05 Nov 2019 10:33:50 +0100
+
 bamf (0.5.4-1) unstable; urgency=medium
 
   * New upstream release.

debian/control

@@ -14,7 +14,7 @@ Build-Depends: dbus (>= 1.8),
                libgtop2-dev,
                libwnck-3-dev (>= 3.4.7),
                mate-common,
-               python-libxslt1,
+               python3-lxml,
                valac,
                xvfb,
 Standards-Version: 4.4.1

debian/patches/1003_add-compile-warning-flags.patch

+Index: bamf-0.5.4/configure.ac
+===================================================================
+--- bamf-0.5.4.orig/configure.ac
++++ bamf-0.5.4/configure.ac
+@@ -15,17 +15,17 @@ AM_SILENT_RULES([yes])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ MATE_COMMON_INIT
+-MATE_COMPILE_WARNINGS(maximum)
+ 
+ AM_MAINTAINER_MODE
+-AM_DISABLE_STATIC
+-AM_PROG_LIBTOOL
+ AC_ISC_POSIX
+ AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4")
+ 
+ PKG_PROG_PKG_CONFIG
+ if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi
+ 
++LT_INIT([disable-static])
++LT_LIB_M
++
+ # Checks for programs.
+ AC_PROG_CC
+ AM_PROG_CC_C_O
+@@ -150,8 +150,39 @@ AC_SUBST(COVERAGE_LDFLAGS)
+ #
+ AM_PATH_GTK_3_0
+ 
++# Compile warnings
++AC_ARG_ENABLE(compile-warnings,
++              AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++                             [Turn on compiler warnings]),,
++              [enable_compile_warnings=maximum])
++
++warning_flags=
++
++case "$enable_compile_warnings" in
++no)
++warning_flags=
++;;
++minimum)
++warning_flags="-Wall"
++;;
++yes)
++warning_flags="-wall -Wno-error=deprecated-declarations"
++;;
++maximum|error)
++warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration"
++if test "$enable_compile_warnings" = "error" ; then
++    warning_flags="$warning_flags -Werror"
++fi
++;;
++*)
++AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++;;
++esac
++AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++AC_MSG_RESULT($warning_flags)
++
+ dnl CFLAGS
+-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
++CFLAGS="$CFLAGS $warning_flags $LIBM"
+ 
+ AC_SUBST(BAMFDAEMON_CFLAGS)
+ AC_SUBST(BAMFDAEMON_LIBS)
+@@ -186,5 +217,6 @@ ${PACKAGE}-${VERSION}
+     Headless tests:       ${enable_headless_tests}
+     Coverage Reporting:   ${use_gcov}
+     Export actions menus: ${enable_export_actions_menu} 
++    Compiler Flags:       ${CFLAGS}
+ 
+ EOF

debian/patches/1004_py2to3_gtester2xunit.patch

+Description: Run gtester2xunit.py with Python3, port libxml2/libxslt to lxml module..
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/tests/gtester2xunit.py
++++ b/tests/gtester2xunit.py
+@@ -1,18 +1,17 @@
+-#! /usr/bin/python
++#! /usr/bin/python3
+ from argparse import ArgumentParser
+-import libxslt
+-import libxml2
++from lxml import etree
+ import sys
+ import os
+ 
+ XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
+ 
+ def transform_file(input_filename, output_filename, xsl_file):
+-    gtester = libxml2.parseFile(xsl_file)
+-    style = libxslt.parseStylesheetDoc(gtester)
+-    doc = libxml2.parseFile(input_filename)
+-    result = style.applyStylesheet(doc, None)
+-    result.saveFormatFile(filename=output_filename, format=True)
++    gtester = etree.parse(xsl_file)
++    transform = etree.XSLT(gtester)
++    doc = etree.parse(input_filename)
++    result = transform(doc)
++    result.write(output_filename)
+ 
+ 
+ def get_output_filename(input_filename):
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,11 +109,11 @@
+ # gtester2xunit checks    #
+ ###########################
+ 
+-AC_PATH_PROG([PYTHON],[python])
++AC_PATH_PROG([PYTHON],[python3])
+ AC_MSG_CHECKING(for gtester2xunit dependencies)
+-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
++if !($PYTHON -c "from lxml import etree" 2> /dev/null); then
+   AC_MSG_RESULT([no])
+-  AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
++  AC_MSG_ERROR([You need to install python3-lxml]);
+ fi
+ AC_MSG_RESULT([yes])
+ 

debian/patches/series

 1001_remove-former-mono-macros.patch
 2001_build-using-mate-common.patch
 1002_spelling-fix.patch
+1003_add-compile-warning-flags.patch
+1004_py2to3_gtester2xunit.patch

debian/rules

@@ -17,7 +17,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ $(DHFLAGS) --with gir
+	dh $@ $(DHFLAGS) --with gir --without autoreconf
 
 override_dh_auto_configure:
 	NOCONFIGURE=1 ./autogen.sh
@@ -31,8 +31,8 @@ override_dh_auto_install:
 	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
 	find debian/tmp/usr/lib -name \*.a -exec rm {} \;
 
-override_dh_install:
-	dh_install --fail-missing
+override_dh_missing:
+	dh_missing --fail-missing
 
 override_dh_strip:
 	dh_strip --package=bamfdaemon --dbgsym-migration='bamfdaemon-dbg (<< 0.5.3-1~)'