--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: celluloid: upgrade to 0.24 (GTK4) with a patch proposal
- From: Patrice Duroux <patrice.duroux@gmail.com>
- Date: Mon, 14 Nov 2022 20:39:31 +0100
- Message-id: <166845477197.130133.14117271169461666946.reportbug@kos-moceratops.home>
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 <patrice.duroux@gmail.com> 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 <infinity0@debian.org>
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@
--- End Message ---
--- Begin Message ---
Source: celluloid
Source-Version: 0.25-1
Done: Boyuan Yang <byang@debian.org>
We believe that the bug you reported is fixed in the latest version of
celluloid, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1024098@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Boyuan Yang <byang@debian.org> (supplier of updated celluloid package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 02 Aug 2023 13:51:35 -0400
Source: celluloid
Architecture: source
Version: 0.25-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Boyuan Yang <byang@debian.org>
Closes: 994531 1024098 1024222
Changes:
celluloid (0.25-1) unstable; urgency=medium
.
* Team upload.
.
[ Danial Behzadi ]
* New upstream version. (Closes: #994531, #1024098)
+ Important change: Application version with port to GTK4 (0.22 tag).
+ Bug fixes.
* d/control:
- Add Danial Behzadi <dani.behzi@ubuntu.com> to uploaders.
- Bump Standards-Version to 4.6.2, no changes needed.
* d/copyright:
- Add Danial Behzadi <dani.behzi@ubuntu.com>.
- Update GPL-3+ license text.
* Add d/upstream/metadata.
* d/watch: Bump version 3 to 4.
* d/rules: Add override dh clean for po/*.gmo po/stamp-po files.
* d/patches: Drop patches.
.
[ Debian Janitor ]
* d/control:
- Remove constraints unnecessary since buster.
- Move transitional package gnome-mpv to oldlibs/optional per policy 4.0.1.
* d/rules: Drop unnecessary dependency on dh-autoreconf.
.
[ Jeremy Bicha ]
* d/rules: Build using buildsystem meson.
* d/control: Add build dep meson and remove Python.
.
[ Leandro Cunha ]
* d/copyright: Update years for upstream.
* d/control:
- Change youtube-dl to yt-dlp in recommends field. (Closes: #1024222)
* Add d/salsa-ci.yml.
.
[ Boyuan Yang ]
* debian/: Apply "wrap-and-sort -abst".
* Review and prepare the upload.
Checksums-Sha1:
c907704cda3685bdfd50dbaad14fdf793f710be1 2162 celluloid_0.25-1.dsc
32c14891facc829bf3ff3ef79484859810865a60 591504 celluloid_0.25.orig.tar.gz
9d0ee11a3497741ea8acabf22c5a372de20c90d5 8876 celluloid_0.25-1.debian.tar.xz
714c98d99dae665cb908ec03b5949b9bff75e9de 20220 celluloid_0.25-1_amd64.buildinfo
Checksums-Sha256:
c7f0f19c145e135de829f47acf8c196f475334bf38dc304b61053d2d07b00608 2162 celluloid_0.25-1.dsc
03338b311725e2b680e81407eef6471534a5600c73d93a22315a479b5529119f 591504 celluloid_0.25.orig.tar.gz
906eff96e26aab9d9c83aa5bf2d8f32ed093a1e25b86f144f928f55cc988ecc2 8876 celluloid_0.25-1.debian.tar.xz
de630f1abfcef1191e735055d80b9216832ecc65822509fd49b474cde3672a31 20220 celluloid_0.25-1_amd64.buildinfo
Files:
f8b1e4fdc1f86bb7402b3f29596efccc 2162 video optional celluloid_0.25-1.dsc
0ac02fc7235ac5429bfd7250f14ea7aa 591504 video optional celluloid_0.25.orig.tar.gz
8f07eb3e95e8989788b2c9afaf97d73d 8876 video optional celluloid_0.25-1.debian.tar.xz
880e4f64976c1b50337cf6a7f5c4c658 20220 video optional celluloid_0.25-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfncpR22H1vEdkazLwpPntGGCWs4FAmTKmSEACgkQwpPntGGC
Ws7vQxAAvanBlod4Adz1pnDENpdzuu56WztsLPVs68Kc7jKHg7JEofHLG2xuXgUs
mvyKscwqJ7iY75lGcBKDc4EWaM3McimqMnQL3c8toZyQ1ygEQa5sWUcnYV5hJHUZ
jxFqfpKNYyc2CQkx4wiVWz+lpXrH01yvbd5XQufWPOWoQsDIhLFmBw848TYlOIL/
S0h9bMRWbDk0+kQh1518T4IDg1/l5x63zei2SjzoSFoM8/f0kGUCAyIldX7OlmfP
/3WSWSlt/MWkVIQenutL9dLPNtJb285AFCng5DdmzUkxtEUayA9R5z82KJvpfyQw
GF9VhRTRw6UIcLHDF0PbLUk7Rqw5hiYMpjm9al/3uxeCIRqodfVkSzYkhqVPzUEE
XxWvtNIEeXHY6jySw1mGA8OvkK22iKWvnacvBRr2hCjCq37cjY5DeZwwz/B0t5gO
PDJQisqPZtoEic7O9RsOHdw+GAUmWndhMUayXCbyWb4nykq+4PZx87ejDwYQEaCI
uUg44zpNz0mR2FOX6kTOiN8P47w6QVNZgtKbDmGvp5egsqaGgbQgCGsRIMPHXgTB
uBk/mq8K8eDL3CIX3hll1PLEExKC4fPbFxcDDOzaqHVSfUsN04o5w6R3px5mXFru
BRZogplZnfZMU4m3xGWgJBmNGMpEbF7SzJ4lQ37mBoG1ZpbjYnc=
=i0GC
-----END PGP SIGNATURE-----
--- End Message ---