diff -Nru gupnp-dlna-0.10.5/debian/changelog gupnp-dlna-0.10.5/debian/changelog --- gupnp-dlna-0.10.5/debian/changelog 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/changelog 2018-12-26 11:34:53.000000000 +0000 @@ -1,3 +1,24 @@ +gupnp-dlna (0.10.5-4) unstable; urgency=medium + + [ Sebastien Bacher ] + * libgupnp-dlna-doc suggests devhelp instead of depending a browser + * remove the build-depends on libgupnp-1.0-dev which is not needed + * update the copyright list to include Intel + + [ Simon McVittie ] + * gir1.2-gupnpdlna-2.0 Provides gir1.2-gupnpdlnagst-2.0, because + this package contains both GUPnPDLNA-2.0.typelib and + GUPnPDLNAGst-2.0.typelib + + [ Jeremy Bicha ] + * Update Vcs fields for migration to https://salsa.debian.org/ + * Bump debhelper compat to 11 + * Use --no-parallel only for dh_auto_build + * Add -Wl,-O1 to our LDFLAGS + * Bump Standards-Version to 4.3.0 + + -- Jeremy Bicha Wed, 26 Dec 2018 06:34:53 -0500 + gupnp-dlna (0.10.5-3) unstable; urgency=medium * debian/rules: use --no-parallel to avoid FTBFS (Closes: #837744) diff -Nru gupnp-dlna-0.10.5/debian/compat gupnp-dlna-0.10.5/debian/compat --- gupnp-dlna-0.10.5/debian/compat 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/compat 2018-12-26 11:34:53.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru gupnp-dlna-0.10.5/debian/control gupnp-dlna-0.10.5/debian/control --- gupnp-dlna-0.10.5/debian/control 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/control 2018-12-26 11:34:53.000000000 +0000 @@ -1,28 +1,27 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gupnp-dlna Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson -Build-Depends: debhelper (>= 10), +Uploaders: Jeremy Bicha +Build-Depends: debhelper (>= 11), gnome-pkg-tools, libxml2-dev, libxml2-utils, libgstreamer1.0-dev (>= 1.0), libgstreamer-plugins-base1.0-dev (>= 1.0), libglib2.0-dev (>= 2.32), - libgupnp-1.0-dev (>= 0.19.0), valac (>= 0.20), gtk-doc-tools, gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12) -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 +Vcs-Browser: https://salsa.debian.org/gnome-team/gupnp-dlna +Vcs-Git: https://salsa.debian.org/gnome-team/gupnp-dlna.git Homepage: http://www.gupnp.org -Vcs-Git: git://anonscm.debian.org/pkg-gnome/gupnp-dlna.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-gnome/gupnp-dlna.git/ Package: libgupnp-dlna-2.0-3 Section: libs @@ -38,6 +37,7 @@ Depends: ${misc:Depends}, ${gir:Depends} Conflicts: gir1.0-gupnp-1.0, gir1.2-gupnp-dlna-1.0 (<< 0.6.6~) Replaces: gir1.0-gupnp-1.0, gir1.2-gupnp-dlna-1.0 (<< 0.6.6~) +Provides: gir1.2-gupnpdlnagst-2.0 (= ${binary:Version}) Description: GObject introspection data for the DLNA utility library for GUPnP This package contains introspection data for the DLNA utility library for GUPnP, a UPnP library. @@ -62,7 +62,8 @@ Package: libgupnp-dlna-doc Section: doc Architecture: all -Depends: lynx | www-browser, ${misc:Depends} +Depends: ${misc:Depends} +Suggests: devhelp Description: DLNA utility library for GUPnP (documentation) A small utility library that aims to ease the DLNA-related tasks such as media profile guessing, transcoding to a given profile, etc. diff -Nru gupnp-dlna-0.10.5/debian/control.in gupnp-dlna-0.10.5/debian/control.in --- gupnp-dlna-0.10.5/debian/control.in 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/control.in 2018-12-26 11:34:53.000000000 +0000 @@ -3,22 +3,21 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11), gnome-pkg-tools, libxml2-dev, libxml2-utils, libgstreamer1.0-dev (>= 1.0), libgstreamer-plugins-base1.0-dev (>= 1.0), libglib2.0-dev (>= 2.32), - libgupnp-1.0-dev (>= 0.19.0), valac (>= 0.20), gtk-doc-tools, gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12) -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 +Vcs-Browser: https://salsa.debian.org/gnome-team/gupnp-dlna +Vcs-Git: https://salsa.debian.org/gnome-team/gupnp-dlna.git Homepage: http://www.gupnp.org -Vcs-Git: git://anonscm.debian.org/pkg-gnome/gupnp-dlna.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-gnome/gupnp-dlna.git/ Package: libgupnp-dlna-2.0-3 Section: libs @@ -34,6 +33,7 @@ Depends: ${misc:Depends}, ${gir:Depends} Conflicts: gir1.0-gupnp-1.0, gir1.2-gupnp-dlna-1.0 (<< 0.6.6~) Replaces: gir1.0-gupnp-1.0, gir1.2-gupnp-dlna-1.0 (<< 0.6.6~) +Provides: gir1.2-gupnpdlnagst-2.0 (= ${binary:Version}) Description: GObject introspection data for the DLNA utility library for GUPnP This package contains introspection data for the DLNA utility library for GUPnP, a UPnP library. @@ -58,7 +58,8 @@ Package: libgupnp-dlna-doc Section: doc Architecture: all -Depends: lynx | www-browser, ${misc:Depends} +Depends: ${misc:Depends} +Suggests: devhelp Description: DLNA utility library for GUPnP (documentation) A small utility library that aims to ease the DLNA-related tasks such as media profile guessing, transcoding to a given profile, etc. diff -Nru gupnp-dlna-0.10.5/debian/copyright gupnp-dlna-0.10.5/debian/copyright --- gupnp-dlna-0.10.5/debian/copyright 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/copyright 2018-12-26 11:34:53.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: gupnp-dlna Upstream-Contact: gupnp-list@gnome.org Source: https://git.gnome.org/browse/gupnp-dlna @@ -6,6 +6,7 @@ Files: * Copyright: 2010 Nokia Corporation. 2010 Collabora Multimedia + 2012, 2013 Intel Corporation License: LGPL-2+ Files: doc/* diff -Nru gupnp-dlna-0.10.5/debian/gbp.conf gupnp-dlna-0.10.5/debian/gbp.conf --- gupnp-dlna-0.10.5/debian/gbp.conf 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/gbp.conf 2018-12-26 11:34:53.000000000 +0000 @@ -1,13 +1,17 @@ [DEFAULT] pristine-tar = True +debian-branch = debian/master +upstream-branch = upstream/latest [buildpackage] sign-tags = True -export-dir = ../build-area/ -tarball-dir = ../tarballs/ -[pq] -patch-numbers = False +[dch] +multimaint-merge = True [import-orig] +postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit upstream-vcs-tag = gupnp-dlna-%(version)s + +[pq] +patch-numbers = False diff -Nru gupnp-dlna-0.10.5/debian/rules gupnp-dlna-0.10.5/debian/rules --- gupnp-dlna-0.10.5/debian/rules 2016-09-14 12:20:36.000000000 +0000 +++ gupnp-dlna-0.10.5/debian/rules 2018-12-26 11:34:53.000000000 +0000 @@ -1,16 +1,20 @@ -#! /usr/bin/make -f +#! /usr/bin/make -f --include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed %: - dh $@ --no-parallel --with gnome,gir + dh $@ --with gnome,gir override_dh_auto_configure: dh_auto_configure -- \ --enable-debug --enable-gtk-doc +override_dh_auto_build: + dh_auto_build --no-parallel + override_dh_makeshlibs: - dh_makeshlibs -V -- -c4 + dh_makeshlibs -- -c4 override_dh_strip: dh_strip --dbgsym-migration='libgupnp-dlna-2.0-dbg (<< 0.10.5-2~)' @@ -20,5 +24,8 @@ for program in debian/tmp/usr/bin/gupnp-dlna-*-2.0 ; do \ mv $$program $${program%%-2.0} ; \ done - find debian/tmp -name '*.la' -delete - dh_install --fail-missing + find debian/tmp -name '*.la' -print -delete + dh_install + +override_dh_missing: + dh_missing --fail-missing