diff -pruN 1.1.0+dfsg-3.1/debian/changelog 1.1.0+dfsg-3.1ubuntu2/debian/changelog --- 1.1.0+dfsg-3.1/debian/changelog 2022-06-28 20:07:41.000000000 +0000 +++ 1.1.0+dfsg-3.1ubuntu2/debian/changelog 2022-07-31 21:03:07.000000000 +0000 @@ -1,3 +1,16 @@ +gerbera (1.1.0+dfsg-3.1ubuntu2) kinetic; urgency=medium + + * No-change rebuild against libavformat59 + + -- Steve Langasek Sun, 31 Jul 2022 21:03:07 +0000 + +gerbera (1.1.0+dfsg-3.1ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + + -- Steve Langasek Sun, 03 Jul 2022 13:15:30 -0700 + gerbera (1.1.0+dfsg-3.1) unstable; urgency=medium * Non-maintainer upload. @@ -6,6 +19,49 @@ gerbera (1.1.0+dfsg-3.1) unstable; urgen -- Nicholas Guriev Tue, 28 Jun 2022 23:07:41 +0300 +gerbera (1.1.0+dfsg-3ubuntu4) jammy; urgency=medium + + * No-change rebuild against libduktape207 + + -- Steve Langasek Mon, 07 Mar 2022 17:13:48 +0000 + +gerbera (1.1.0+dfsg-3ubuntu3) jammy; urgency=medium + + * No-change rebuild against latest duktape + + -- Jeremy Bicha Sun, 24 Oct 2021 08:35:03 -0400 + +gerbera (1.1.0+dfsg-3ubuntu2) focal; urgency=medium + + * No-change rebuild against libduktape205 + + -- Steve Langasek Fri, 28 Feb 2020 23:15:54 +0000 + +gerbera (1.1.0+dfsg-3ubuntu1) focal; urgency=medium + + * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8. + (LP: #1863026) + + -- Andreas Hasenack Wed, 12 Feb 2020 20:36:24 -0300 + +gerbera (1.1.0+dfsg-3build4) focal; urgency=medium + + * No-change rebuild for exiv2 soname change. + + -- Matthias Klose Tue, 04 Feb 2020 20:20:58 +0100 + +gerbera (1.1.0+dfsg-3build3) eoan; urgency=medium + + * No-change rebuild against libduktape204 + + -- Steve Langasek Thu, 12 Sep 2019 06:36:13 +0000 + +gerbera (1.1.0+dfsg-3build2) eoan; urgency=medium + + * No change rebuild for libmysqlclient21. + + -- Robie Basak Mon, 12 Aug 2019 12:01:21 +0000 + gerbera (1.1.0+dfsg-3) unstable; urgency=medium * d/patches: Fix FTBFS with pupnp 1.8.3. (Closes: #885025) @@ -612,3 +668,4 @@ mediatomb (0.10.0.dfsg1-1) unstable; urg + zlib1g-dev changed to libz-dev. -- Andres Mejia Sat, 02 Feb 2008 01:42:48 -0500 + diff -pruN 1.1.0+dfsg-3.1/debian/control 1.1.0+dfsg-3.1ubuntu2/debian/control --- 1.1.0+dfsg-3.1/debian/control 2018-11-12 23:05:26.000000000 +0000 +++ 1.1.0+dfsg-3.1ubuntu2/debian/control 2022-07-01 15:18:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: gerbera Section: net Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: James Cowgill Build-Depends: cmake (>= 3.2), diff -pruN 1.1.0+dfsg-3.1/debian/patches/0015_mysql8_my_bool.patch 1.1.0+dfsg-3.1ubuntu2/debian/patches/0015_mysql8_my_bool.patch --- 1.1.0+dfsg-3.1/debian/patches/0015_mysql8_my_bool.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.1.0+dfsg-3.1ubuntu2/debian/patches/0015_mysql8_my_bool.patch 2020-02-12 23:35:27.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Reintroduce my_bool to fix build with MySQL 8 +Author: Andreas Hasenack +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gambas3/+bug/1863026 +Forwarded: no +Last-Update: 2020-02-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/src/storage/mysql/mysql_storage.h b/src/storage/mysql/mysql_storage.h +index a1a0754..e205dc8 100644 +--- a/src/storage/mysql/mysql_storage.h ++++ b/src/storage/mysql/mysql_storage.h +@@ -38,6 +38,7 @@ + #include "storage/sql_storage.h" + #include + #include ++typedef bool my_bool; + + class MysqlStorage : private SQLStorage { + private: diff -pruN 1.1.0+dfsg-3.1/debian/patches/series 1.1.0+dfsg-3.1ubuntu2/debian/patches/series --- 1.1.0+dfsg-3.1/debian/patches/series 2022-06-25 14:30:13.000000000 +0000 +++ 1.1.0+dfsg-3.1ubuntu2/debian/patches/series 2022-07-03 20:15:30.000000000 +0000 @@ -2,4 +2,5 @@ 0012_reload-log-on-hup.patch 0013_more-spelling.patch 0014_pupnp-1.8.3.patch +0015_mysql8_my_bool.patch 0015_ffmpeg-5.0.patch