[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/bamf][master] 8 commits: debian/patches: Add 1003_add-compile-warning-flags.patch. Add...

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / bamf

Commits:

7 changed files:

Changes:

  • debian/bamfdaemon.install
    1 
    -usr/lib/*/bamf
    1 
    +usr/libexec/bamf
    2 2 
     usr/share/dbus-1/services/
    3 3 
     usr/lib/systemd/user/bamfdaemon.service
    4 4 
     usr/share/upstart/sessions/bamfdaemon.conf

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

  • debian/control
    ... ... @@ -14,7 +14,7 @@ Build-Depends: dbus (>= 1.8),
    14 14 
                    libgtop2-dev,
    15 15 
                    libwnck-3-dev (>= 3.4.7),
    16 16 
                    mate-common,
    17 
    -               python-libxslt1,
    17 
    +               python3-lxml,
    18 18 
                    valac,
    19 19 
                    xvfb,
    20 20 
     Standards-Version: 4.4.1

  • debian/patches/1003_add-compile-warning-flags.patch
    1 
    +Index: bamf-0.5.4/configure.ac
    2 
    +===================================================================
    3 
    +--- bamf-0.5.4.orig/configure.ac
    4 
    ++++ bamf-0.5.4/configure.ac
    5 
    +@@ -15,17 +15,17 @@ AM_SILENT_RULES([yes])
    6 
    + AC_CONFIG_MACRO_DIR([m4])
    7 
    +
    8 
    + MATE_COMMON_INIT
    9 
    +-MATE_COMPILE_WARNINGS(maximum)
    10 
    +
    11 
    + AM_MAINTAINER_MODE
    12 
    +-AM_DISABLE_STATIC
    13 
    +-AM_PROG_LIBTOOL
    14 
    + AC_ISC_POSIX
    15 
    + AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4")
    16 
    +
    17 
    + PKG_PROG_PKG_CONFIG
    18 
    + if test "x$PKG_CONFIG" = "x"; then AC_MSG_ERROR([You need to install pkg-config]); fi
    19 
    +
    20 
    ++LT_INIT([disable-static])
    21 
    ++LT_LIB_M
    22 
    ++
    23 
    + # Checks for programs.
    24 
    + AC_PROG_CC
    25 
    + AM_PROG_CC_C_O
    26 
    +@@ -150,8 +150,39 @@ AC_SUBST(COVERAGE_LDFLAGS)
    27 
    + #
    28 
    + AM_PATH_GTK_3_0
    29 
    +
    30 
    ++# Compile warnings
    31 
    ++AC_ARG_ENABLE(compile-warnings,
    32 
    ++              AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
    33 
    ++                             [Turn on compiler warnings]),,
    34 
    ++              [enable_compile_warnings=maximum])
    35 
    ++
    36 
    ++warning_flags=
    37 
    ++
    38 
    ++case "$enable_compile_warnings" in
    39 
    ++no)
    40 
    ++warning_flags=
    41 
    ++;;
    42 
    ++minimum)
    43 
    ++warning_flags="-Wall"
    44 
    ++;;
    45 
    ++yes)
    46 
    ++warning_flags="-wall -Wno-error=deprecated-declarations"
    47 
    ++;;
    48 
    ++maximum|error)
    49 
    ++warning_flags="-Wall -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration"
    50 
    ++if test "$enable_compile_warnings" = "error" ; then
    51 
    ++    warning_flags="$warning_flags -Werror"
    52 
    ++fi
    53 
    ++;;
    54 
    ++*)
    55 
    ++AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
    56 
    ++;;
    57 
    ++esac
    58 
    ++AC_MSG_CHECKING(what warning flags to pass to the C compiler)
    59 
    ++AC_MSG_RESULT($warning_flags)
    60 
    ++
    61 
    + dnl CFLAGS
    62 
    +-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
    63 
    ++CFLAGS="$CFLAGS $warning_flags $LIBM"
    64 
    +
    65 
    + AC_SUBST(BAMFDAEMON_CFLAGS)
    66 
    + AC_SUBST(BAMFDAEMON_LIBS)
    67 
    +@@ -186,5 +217,6 @@ ${PACKAGE}-${VERSION}
    68 
    +     Headless tests:       ${enable_headless_tests}
    69 
    +     Coverage Reporting:   ${use_gcov}
    70 
    +     Export actions menus: ${enable_export_actions_menu}
    71 
    ++    Compiler Flags:       ${CFLAGS}
    72 
    +
    73 
    + EOF

  • debian/patches/1004_py2to3_gtester2xunit.patch
    1 
    +Description: Run gtester2xunit.py with Python3, port libxml2/libxslt to lxml module..
    2 
    +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    3 
    +
    4 
    +--- a/tests/gtester2xunit.py
    5 
    ++++ b/tests/gtester2xunit.py
    6 
    +@@ -1,18 +1,17 @@
    7 
    +-#! /usr/bin/python
    8 
    ++#! /usr/bin/python3
    9 
    + from argparse import ArgumentParser
    10 
    +-import libxslt
    11 
    +-import libxml2
    12 
    ++from lxml import etree
    13 
    + import sys
    14 
    + import os
    15 
    +
    16 
    + XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
    17 
    +
    18 
    + def transform_file(input_filename, output_filename, xsl_file):
    19 
    +-    gtester = libxml2.parseFile(xsl_file)
    20 
    +-    style = libxslt.parseStylesheetDoc(gtester)
    21 
    +-    doc = libxml2.parseFile(input_filename)
    22 
    +-    result = style.applyStylesheet(doc, None)
    23 
    +-    result.saveFormatFile(filename=output_filename, format=True)
    24 
    ++    gtester = etree.parse(xsl_file)
    25 
    ++    transform = etree.XSLT(gtester)
    26 
    ++    doc = etree.parse(input_filename)
    27 
    ++    result = transform(doc)
    28 
    ++    result.write(output_filename)
    29 
    +
    30 
    +
    31 
    + def get_output_filename(input_filename):
    32 
    +--- a/configure.ac
    33 
    ++++ b/configure.ac
    34 
    +@@ -109,11 +109,11 @@
    35 
    + # gtester2xunit checks    #
    36 
    + ###########################
    37 
    +
    38 
    +-AC_PATH_PROG([PYTHON],[python])
    39 
    ++AC_PATH_PROG([PYTHON],[python3])
    40 
    + AC_MSG_CHECKING(for gtester2xunit dependencies)
    41 
    +-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
    42 
    ++if !($PYTHON -c "from lxml import etree" 2> /dev/null); then
    43 
    +   AC_MSG_RESULT([no])
    44 
    +-  AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
    45 
    ++  AC_MSG_ERROR([You need to install python3-lxml]);
    46 
    + fi
    47 
    + AC_MSG_RESULT([yes])
    48 
    +

  • debian/patches/series
    1 1 
     1001_remove-former-mono-macros.patch
    2 2 
     2001_build-using-mate-common.patch
    3 3 
     1002_spelling-fix.patch
    4 
    +1003_add-compile-warning-flags.patch
    5 
    +1004_py2to3_gtester2xunit.patch

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: