Merge version 1.0.0-16+rpi1 and 1.0.0-19 to produce 1.0.0-19+rpi1 archive/raspbian/1.0.0-19+rpi1 raspbian/1.0.0-19+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 11 Aug 2022 03:35:13 +0000 (04:35 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 11 Aug 2022 03:35:13 +0000 (04:35 +0100)
1  2 
debian/changelog
debian/control
debian/patches/series
debian/rules

index f8fe14412a8eb02f6445c248b739f2fc63b22333,a84d2afa8b7064a099dec6a43a6fc486d3d38255..3500e57b86228fc517fc4ac1f6017985324125bb
@@@ -1,12 -1,25 +1,35 @@@
- hedgewars (1.0.0-16+rpi1) bookworm-staging; urgency=medium
++hedgewars (1.0.0-19+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 24 Nov 2019 13:14:55 +0000]
 +  * Force use of C.UTF-8 locale, the build fails under some locales (e.g. POSIX).
 +
 +  [changes introduced in 1.0.0-16+rpi1 by Peter Michael Green]
 +  * Forve build with clang 11, newer versions cause armv7 contamination.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Sun, 26 Jun 2022 21:54:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Aug 2022 03:35:13 +0000
++
+ hedgewars (1.0.0-19) unstable; urgency=medium
+   * Add new patch to fix a cmake 3.24.0 build failure
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 05 Aug 2022 17:21:55 +0200
+ hedgewars (1.0.0-18) unstable; urgency=medium
+   * Fixup previous upload
+   * Drop duplicated entry in copyright file
+   * Drop trailing newline in changelog file
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 05 Aug 2022 15:04:31 +0200
+ hedgewars (1.0.0-17) unstable; urgency=medium
+   * Disable ffmpeg for now, code is not ffmpeg 5 compatible (Closes: #1016648)
+   * Drop dpkg-dev dependency
+   * Bump compat level to 13
+   * Bump std-version to 4.6.1
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 05 Aug 2022 13:30:38 +0200
  
  hedgewars (1.0.0-16) unstable; urgency=medium
  
diff --cc debian/control
index 0008ebaa2343d6d1574b07f8edf7b869800addbc,a6363020f30d009a5844a0fd6bc6835e396b858c..846bcf79e73df30010c4b51f588fcb25f3503dcd
@@@ -4,11 -4,10 +4,10 @@@ Priority: optiona
  Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
  Uploaders: Dmitry E. Oboukhov <unera@debian.org>,
             Gianfranco Costamagna <locutusofborg@debian.org>
- Standards-Version: 4.5.0
+ Standards-Version: 4.6.1
  Build-Depends: cmake,
 -               clang [armel armhf i386 mipsel ppc64el],
 +               clang-11 [armel armhf i386 mipsel ppc64el],
-                debhelper-compat (= 12),
-                dpkg-dev (>= 1.16.1~),
+                debhelper-compat (= 13),
                 fp-compiler [!armel !armhf !i386 !mipsel !ppc64el],
                 fp-units-misc [!armel !armhf !i386 !mipsel !ppc64el],
                 fp-units-gfx [!armel !armhf !i386 !mipsel !ppc64el],
index de9505fd62d0758b4efdc2dd9051401165d10be1,bff245f52d90c1d26e22c326c38d90987adb42e0..c35a461b435d3e9a8e9ef99f90e9aeee86bc3093
@@@ -7,5 -7,5 +7,6 @@@ fpc-3.2.0.patc
  036263d63b05.patch
  f09db263bc2a.patch
  #aa011799cb63.patch
- ffmpeg-5.0-compat.patch
+ #ffmpeg-5.0-compat.patch
+ new-cmake-3.24-build-fix.patch
 +build-with-clang-11-to-avoid-armv7-conta.patch
diff --cc debian/rules
Simple merge