Package: celluloid Version: 0.20-2 Severity: wishlist Dear Maintainer,
Here is attached a patch proposal for this goal. Thanks, Patrice -- System Information: Debian Release: bookworm/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 6.0.0-4-amd64 (SMP w/12 CPU threads; PREEMPT) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages celluloid depends on: ii dconf-gsettings-backend [gsettings-backend] 0.40.0-3 ii libc6 2.36-5 ii libcairo2 1.16.0-6 ii libepoxy0 1.5.10-1 ii libglib2.0-0 2.74.1-2 ii libgtk-3-0 3.24.34-3 ii libmpv1 0.34.1-1+b5 ii libpango-1.0-0 1.50.10+ds-1 ii libpangocairo-1.0-0 1.50.10+ds-1 Versions of packages celluloid recommends: pn youtube-dl <none> celluloid suggests no packages. -- no debconf information
diff --git a/debian/celluloid.lintian-overrides b/debian/celluloid.lintian-overrides index 4422594..45335ee 100644 --- a/debian/celluloid.lintian-overrides +++ b/debian/celluloid.lintian-overrides @@ -3,4 +3,4 @@ # This is known-correct at compile time and therefore the compiler uses the # unprotected function even with fortify-source as per case (1) in: # https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html -celluloid binary: hardening-no-fortify-functions usr/bin/celluloid +celluloid binary: hardening-no-fortify-functions [usr/bin/celluloid] diff --git a/debian/changelog b/debian/changelog index 0d7c126..e38d4f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +celluloid (0.24-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add B-D libadwaita-1-dev. + * Change B-D from gtk3-dev to gtk-4-dev. + * Clear all debian/patches (obsolete). + * New upstream release. + * Update lintian override info format in d/celluloid.lintian-overrides on line + 6. + * Update watch file format version to 4. + * Move transitional package gnome-mpv to oldlibs/optional per policy 4.0.1. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse. + * Drop unnecessary dependency on dh-autoreconf. + * Update standards version to 4.6.1, no changes needed. + + -- Patrice Duroux <[email protected]> Mon, 14 Nov 2022 19:59:46 -0000 + celluloid (0.20-2) unstable; urgency=medium * Fix FTBFS on ppc64el due to confusion over Makefile :/&: syntax. diff --git a/debian/control b/debian/control index 94e7682..b8f5473 100644 --- a/debian/control +++ b/debian/control @@ -7,11 +7,12 @@ Build-Depends: debhelper-compat (= 13), appstream-util, autoconf-archive, libepoxy-dev, - libgtk-3-dev (>= 3.22), + libgtk-4-dev, + libadwaita-1-dev, libmpv-dev (>= 0.32), pkg-config, python3:any -Standards-Version: 4.5.0 +Standards-Version: 4.6.1 Homepage: https://github.com/celluloid-player/celluloid Vcs-Git: https://salsa.debian.org/multimedia-team/celluloid.git Vcs-Browser: https://salsa.debian.org/multimedia-team/celluloid @@ -30,7 +31,6 @@ Description: simple GTK+ frontend for mpv Package: gnome-mpv Depends: celluloid, ${misc:Depends} Architecture: all -Priority: optional Section: oldlibs Description: transitional package This is a transitional package. It can safely be removed. diff --git a/debian/copyright b/debian/copyright index 8d83795..93a3fb4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: celluloid Source: https://github.com/celluloid-player/celluloid Files: * -Copyright: 2014-2020 celluloid (formerly gnome-mpv) contributors +Copyright: 2014-2022 celluloid (formerly gnome-mpv) contributors License: GPL-3+ Files: data/io.github.celluloid_player.Celluloid.* @@ -14,11 +14,13 @@ Files: debian/* Copyright: 2015 Ximin Luo <[email protected]> License: GPL-3+ -License: GPL-3 +License: GPL-3+ On Debian systems, the complete text of the GNU General Public License can be found in the file /usr/share/common-licenses/GPL-3'. License: CC-BY-SA-4.0 + https://creativecommons.org/licenses/by-sa/4.0/ + . Attribution-ShareAlike 4.0 International . ======================================================================= diff --git a/debian/patches/fix-makefile.patch b/debian/patches/fix-makefile.patch deleted file mode 100644 index c016962..0000000 --- a/debian/patches/fix-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Bug: https://github.com/celluloid-player/celluloid/issues/605 - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,7 +9,7 @@ - mpris/celluloid-mpris-player.c mpris/celluloid-mpris-player.h \ - mpris/celluloid-mpris-track-list.c mpris/celluloid-mpris-track-list.h \ - $(mpris_generated) --$(mpris_generated): $(top_srcdir)/data/celluloid-mpris-gdbus.xml -+$(mpris_generated) &: $(top_srcdir)/data/celluloid-mpris-gdbus.xml - $(AM_V_GEN) \ - $(GDBUS_CODEGEN) --c-namespace celluloid_mpris --generate-c-code mpris/celluloid-mpris-gdbus $< && \ - $(SED) -i '1i#pragma GCC diagnostic ignored \"-Wconversion\"' mpris/celluloid-mpris-gdbus.c diff --git a/debian/patches/relax-gettext-version.patch b/debian/patches/relax-gettext-version.patch deleted file mode 100644 index cc712aa..0000000 --- a/debian/patches/relax-gettext-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ - GETTEXT_PACKAGE=celluloid - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) --AM_GNU_GETTEXT_VERSION([0.20]) -+AM_GNU_GETTEXT_VERSION([0.19]) - AM_GNU_GETTEXT([external]) - - GLIB_GSETTINGS diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index fc436e2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -relax-gettext-version.patch -fix-makefile.patch diff --git a/debian/rules b/debian/rules index 0c51e55..3afa01e 100755 --- a/debian/rules +++ b/debian/rules @@ -19,4 +19,4 @@ include /usr/share/dpkg/default.mk # main packaging script based on dh7 syntax %: - dh $@ --with autoreconf + dh $@ diff --git a/debian/watch b/debian/watch index 7662988..d69e2a7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 -opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/celluloid-$1.tar.gz/" \ - https://github.com/celluloid-player/celluloid/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz +version=4 +opts=filenamemangle=s/(?:.*?)?v?(\d[\d.]*)(@ARCHIVE_EXT@)/@PACKAGE@-$1$2/ \ + https://github.com/celluloid-player/celluloid/tags (?:.*?/)?v@ANY_VERSION@@ARCHIVE_EXT@
