From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 20 Oct 2022 17:55:50 +0000 (+0000)
Subject: Merge tag '7.0_repack-10' into bookworm-working
X-Git-Tag: archive/raspbian/7.0_repack-10+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0061845f98efef3571f235d2d8d07f5137efe57a;p=wine.git

Merge tag '7.0_repack-10' into bookworm-working
---

0061845f98efef3571f235d2d8d07f5137efe57a
diff --cc debian/changelog
index 47bacb7,35dd19e..c37cbdf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,54 +1,62 @@@
- wine (7.0~repack-4+rpi1) bookworm-staging; urgency=medium
++wine (7.0~repack-10+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.0.3~repack-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Mar 2022 00:48:02 +0000]
 +  * Build for armv6k on raspbian.
 +  * Replace movt instruction with orr instruction to support armv6k build.
 +
 + -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jul 2022 02:18:42 +0000
 +
+ wine (7.0~repack-10) unstable; urgency=medium
+ 
+   [ Phil Morrell ]
+   * Depend on libxml-libxml-perl.
+   * Add README.source to explain the layout.
+ 
+   [ Michael Gilbert ]
+   * Ignore debian-news-entry-has-unknown-version lintian warning.
+     - The NEWS file is correct for the different wine packages.
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Wed, 12 Oct 2022 00:18:28 +0000
+ 
+ wine (7.0~repack-9) unstable; urgency=medium
+ 
+   * Fix various lintian warnings.
+   * Drop unnecessary dpkg version constraint.
+   * Indicate vulkan >= 1.2.189.0 is required.
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Sun, 09 Oct 2022 07:01:14 +0000
+ 
+ wine (7.0~repack-8) unstable; urgency=medium
+ 
+   * Fix lintian warning.
+   * Restore netapi32.dll (closes: #1019943).
+   * Support building with unicode-data 15 (closes: #1020013).
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Sat, 24 Sep 2022 17:29:03 +0000
+ 
+ wine (7.0~repack-7) unstable; urgency=medium
+ 
+   * Update standards version to 4.6.1.
+   * Fix remaining build failures on arm.
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Tue, 13 Sep 2022 00:46:21 +0000
+ 
+ wine (7.0~repack-6) unstable; urgency=medium
+ 
+   * Fix arm build failures.
+   * Fix various lintian warnings.
+   * Remove clang from debian/rules.
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Sun, 11 Sep 2022 23:27:19 +0000
+ 
+ wine (7.0~repack-5) unstable; urgency=medium
+ 
+   * Build with gcc instead of clang on arm64.
+   * Disable link time optimization (closes: #1015705).
+   * Add multiarch:same to the dev package (closes: #1015239).
+ 
+  -- Michael Gilbert <mgilbert@debian.org>  Sun, 11 Sep 2022 17:20:52 +0000
+ 
  wine (7.0~repack-4) unstable; urgency=medium
  
    * Fix syntax error in configure.ac.
diff --cc debian/patches/series
index d3350d5,d14382f..f221685
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -44,6 -45,6 +45,7 @@@ warnings/parentheses.patc
  warnings/use-after-free.patch
  warnings/format-overflow.patch
  warnings/stringop-overflow.patch
+ warnings/incompatible-types.patch
  warnings/misleading-indentation.patch
  warnings/uninitialized-variables.patch
 +raspbian.patch
diff --cc debian/rules
index 890fb4f,e3ef10d..62da4fd
--- a/debian/rules
+++ b/debian/rules
@@@ -77,14 -77,12 +77,12 @@@ endi
  # build with hard float ABI on armhf
  ifeq ($(DEB_HOST_ARCH), armhf)
  CONFLAGS+=--with-float-abi=hard
 -export DEB_CFLAGS_MAINT_APPEND+=-Wno-unused-function
 +export DEB_CFLAGS_MAINT_APPEND+=-Wno-unused-function -march=armv6k+fp
  endif
  
- # on arm64 build using clang and ignore compiler warnings
+ # ignore unused function warnings on arm64
  ifeq ($(DEB_HOST_ARCH), arm64)
- export CC=clang
- export CXX=clang++
- export DEB_CFLAGS_MAINT_APPEND+=-Wno-error
+ export DEB_CFLAGS_MAINT_APPEND+=-Wno-unused-function
  endif
  
  # use date of the latest changelog update as the build date