diff -Nru libmediaart-1.9.4/debian/changelog libmediaart-1.9.4/debian/changelog --- libmediaart-1.9.4/debian/changelog 2018-05-31 00:04:31.000000000 +0000 +++ libmediaart-1.9.4/debian/changelog 2020-11-28 16:45:05.000000000 +0000 @@ -1,3 +1,24 @@ +libmediaart (1.9.4-3) unstable; urgency=medium + + * Team upload + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + + [ Simon McVittie ] + * Change Maintainer to GNOME team at maintainer's request + * Preferentially build-depend on libgdk-pixbuf-2.0-dev. + We don't need the deprecated Xlib integration that is also pulled in + by the older libgdk-pixbuf2.0-dev package (see #974870). + (Closes: #976032) + * d/control: Trim trailing whitespace + * Set debhelper-compat version in Build-Depends + * Remove Section on libmediaart-2.0-0 that duplicates source + * d/upstream/metadata: Add + * d/tests: Add a superficial autopkgtest + + -- Simon McVittie Sat, 28 Nov 2020 16:45:05 +0000 + libmediaart (1.9.4-2) unstable; urgency=medium * Update Vcs-* to point to salsa.debian.org (gitlab) diff -Nru libmediaart-1.9.4/debian/compat libmediaart-1.9.4/debian/compat --- libmediaart-1.9.4/debian/compat 2018-05-31 00:04:31.000000000 +0000 +++ libmediaart-1.9.4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru libmediaart-1.9.4/debian/control libmediaart-1.9.4/debian/control --- libmediaart-1.9.4/debian/control 2018-05-31 00:04:31.000000000 +0000 +++ libmediaart-1.9.4/debian/control 2020-11-28 16:45:05.000000000 +0000 @@ -1,11 +1,12 @@ Source: libmediaart Section: libs Priority: optional -Maintainer: Michael Biebl -Build-Depends: debhelper (>= 11), +Maintainer: Debian GNOME Maintainers +Uploaders: Michael Biebl +Build-Depends: debhelper-compat (= 11), gtk-doc-tools (>= 1.8), libglib2.0-dev (>= 2.35.1), - libgdk-pixbuf2.0-dev (>= 2.12.0), + libgdk-pixbuf-2.0-dev (>= 2.12.0) | libgdk-pixbuf2.0-dev (>= 2.12.0), libgirepository1.0-dev (>= 1.30.0), gobject-introspection (>= 1.30.0), valac @@ -17,7 +18,6 @@ Package: libmediaart-2.0-0 Architecture: any Multi-Arch: same -Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -35,7 +35,7 @@ gir1.2-mediaart-2.0 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev, - libgdk-pixbuf2.0-dev + libgdk-pixbuf-2.0-dev | libgdk-pixbuf2.0-dev Suggests: libmediaart-doc Description: media art extraction and cache management library - development files Libmediaart is a library tasked with managing, extracting and handling @@ -65,4 +65,3 @@ media art caches. . This package contains introspection data for libmediaart. - diff -Nru libmediaart-1.9.4/debian/copyright libmediaart-1.9.4/debian/copyright --- libmediaart-1.9.4/debian/copyright 2018-05-31 00:04:31.000000000 +0000 +++ libmediaart-1.9.4/debian/copyright 2020-11-28 16:45:05.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libmediaart Source: https://download.gnome.org/sources/libmediaart diff -Nru libmediaart-1.9.4/debian/tests/control libmediaart-1.9.4/debian/tests/control --- libmediaart-1.9.4/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libmediaart-1.9.4/debian/tests/control 2020-11-28 16:45:05.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: libmediaart-2.0-dev +Restrictions: allow-stderr, superficial +Depends: build-essential, libmediaart-2.0-dev, pkg-config diff -Nru libmediaart-1.9.4/debian/tests/libmediaart-2.0-dev libmediaart-1.9.4/debian/tests/libmediaart-2.0-dev --- libmediaart-1.9.4/debian/tests/libmediaart-2.0-dev 1970-01-01 00:00:00.000000000 +0000 +++ libmediaart-1.9.4/debian/tests/libmediaart-2.0-dev 2020-11-28 16:45:05.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh +# Copyright 2020 Collabora Ltd. +# Copyright 2020 Simon McVittie +# SPDX-License-Identifier: LGPL-2.1-or-later + +set -eux + +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" + CC="${CROSS_COMPILE}gcc" + PKG_CONFIG="${CROSS_COMPILE}pkg-config" +else + CROSS_COMPILE= + CC=cc + PKG_CONFIG=pkg-config +fi + +cd "$AUTOPKGTEST_TMP" + +cat > trivial.c < +#include + +int main (void) +{ + g_assert_cmpstr (media_art_strip_invalid_entities ("hello"), ==, "hello"); + return 0; +} +EOF + +# Deliberately word-splitting pkg-config's output: +# shellcheck disable=SC2046 +"${CC}" -otrivial trivial.c $("${PKG_CONFIG}" --cflags --libs libmediaart-2.0 glib-2.0) +./trivial diff -Nru libmediaart-1.9.4/debian/upstream/metadata libmediaart-1.9.4/debian/upstream/metadata --- libmediaart-1.9.4/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libmediaart-1.9.4/debian/upstream/metadata 2020-11-28 16:45:05.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://gitlab.gnome.org/GNOME/libmediaart/issues +Bug-Submit: https://gitlab.gnome.org/GNOME/libmediaart/issues/new +Repository: https://gitlab.gnome.org/GNOME/libmediaart.git +Repository-Browse: https://gitlab.gnome.org/GNOME/libmediaart