[SCM] easytag/master: Remove AppData support from build system

[Felipe Sateler]

On Tue, Feb 25, 2014 at 12:39 PM,
<jcowgill-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit 99718cdff30c6962047459616a5b268ed1c8a99a
> Author: James Cowgill <james410 at cowgill.org.uk>
> Date:   Sun Feb 23 13:35:19 2014 +0000
>
>     Remove AppData support from build system
>
>     - AppData support requires the appdata-tools package which is
>       not yet available in Debian.
>
> diff --git a/debian/patches/remove-appdata.patch b/debian/patches/remove-appdata.patch
> new file mode 100644
> index 0000000..e1d9b19
> --- /dev/null
> +++ b/debian/patches/remove-appdata.patch
> @@ -0,0 +1,58 @@
> +Description: Remove AppData from build system
> + This requires the appdata-tools package which is not in Debian yet.
> + Partially reverts upstream commit https://git.gnome.org/browse/easytag/commit/?id=02d199b2cac7c34b36cb534a48eda32172efb941
> +Author: James Cowgill <james410 at cowgill.org.uk>
> +Forwarded: not-needed
> +Last-Update: 2014-02-22
> +---
> +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -27,9 +27,6 @@
> + AS_IF([test "x$USE_NLS" != "xno"],
> +       [AC_DEFINE([ENABLE_NLS], [1], [Native Language support is enabled])])
> +
> +-dnl AppData
> +-APPDATA_XML
> +-
> + dnl -------------------------------
> + dnl Checks for programs.
> + dnl -------------------------------
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -1,7 +1,6 @@
> + ACLOCAL_AMFLAGS = -I m4
> +
> + DISTCHECK_CONFIGURE_FLAGS = \
> +-      --enable-appdata-check \

Isn't this sufficient to disable AppData when it is not available? If
so, perhaps it is better to create a patch that correctly disables
AppData when it is not available?


Also, please don't commit the changelog at the same time as the real
change. We normally use gbp dch + a final changelog commit.

-- 

Saludos,
Felipe Sateler