[neon/backports-focal/appstream/Neon/release] debian: fix merge

[Jonathan Riddell]

Git commit a62987d8d3f14ddb97da0867d8fd3749a19e6fcd by Jonathan Riddell.
Committed on 31/01/2022 at 11:01.
Pushed by jriddell into branch 'Neon/release'.

fix merge

M  +1    -11   debian/control

https://invent.kde.org/neon/backports-focal/appstream/commit/a62987d8d3f14ddb97da0867d8fd3749a19e6fcd

diff --git a/debian/control b/debian/control
index efb767d..9aedb42 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libcairo2-dev,
                libcurl4-gnutls-dev (>= 7.62) | libcurl-dev (>= 7.62),
                libfontconfig-dev,
-               libgdk-pixbuf-2.0-dev,
+               libgdk-pixbuf2.0-dev,
                libgirepository1.0-dev (>= 1.62),
                libglib2.0-dev (>= 2.62),
                libjs-highlight.js,
@@ -51,18 +51,12 @@ Description: Software component metadata management
  validating it for compliance with the specification.
 
 Package: appstream-compose
-<<<<<<< HEAD
-Architecture: any
-Depends: appstream, ${misc:Depends}, ${shlibs:Depends}
-Recommends: ffmpeg, optipng
-=======
 Architecture: amd64 arm64 armel armhf i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
 Depends: appstream,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: ffmpeg,
             optipng
->>>>>>> salsa/debian/master
 Description: Compose metadata collections from directory trees
  AppStream is a metadata specification which permits software components to
  provide information about themselves to automated systems and end-users
@@ -115,14 +109,10 @@ Description: Library to access AppStream services (development files)
 Package: gir1.2-appstream-1.0
 Architecture: any
 Section: introspection
-<<<<<<< HEAD
-Depends: libappstream4 (= ${binary:Version}), ${gir:Depends}, ${misc:Depends}
-=======
 Multi-Arch: same
 Depends: libappstream4 (= ${binary:Version}),
          ${gir:Depends},
          ${misc:Depends}
->>>>>>> salsa/debian/master
 Description: Library to access AppStream services (introspection data)
  AppStream is a metadata specification which permits software components to
  provide information about themselves to automated systems and end-users