Merge version 0.20.2+dfsg1-4+rpi1 and 0.21.2+dfsg1-3 to produce 0.21.2+dfsg1-3+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 21 Jun 2024 17:25:38 +0000 (18:25 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 21 Jun 2024 17:25:38 +0000 (18:25 +0100)
1  2 
debian/changelog
debian/control

index 2930ffd5f768c1e6de0514c234afb5ed81b2cc6f,5e0288b8ebea3b2b9ae50001c5f09091cbeb6ebe..bbb5b20b96bcc3d0463a5063bd774f034ff27fa3
- freecad (0.20.2+dfsg1-4+rpi1) bookworm-staging; urgency=medium
++freecad (0.21.2+dfsg1-3+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 0.20.2+dfsg1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 28 Feb 2023 01:17:57 +0000]
 +  * Switch armhf from qtwebengine to qtwebkit.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 28 Feb 2023 01:17:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Jun 2024 17:25:37 +0000
++
+ freecad (0.21.2+dfsg1-3) unstable; urgency=medium
+   * Team upload.
+   * Rework autopkgtest script, update available tests and block
+     TestPathApp also for i386.
+  -- Tobias Frost <tobi@debian.org>  Sat, 25 May 2024 16:11:03 +0200
+ freecad (0.21.2+dfsg1-2) unstable; urgency=medium
+   * Team upload.
+   * Fix FTBFS with opencascade 7.8.1 (Closes: #1071283), and B-D on new
+     opencascade.
+  -- Tobias Frost <tobi@debian.org>  Fri, 24 May 2024 21:17:26 +0200
+ freecad (0.21.2+dfsg1-1) unstable; urgency=medium
+   * Team upload.
+   * New upstream version. (Closes: #1043104)
+     - Remove upstream applied patches:
+       - 0000-numpy-1.24
+       - 0010-arch-tutorial
+       - 0030-fix-1014875-arm-FTBFS
+       - 0040-python3-interpreter
+       - 0050-appstream-meta-launcable
+       - 0060-bug-993089-dxf-support-desktop-file
+       - 0070-python3-interpreter
+       - 0080-fix-s390x-test-fail-skip-load-old-file
+       - 0090-gcc13-fix
+       - 0100-opencamlib-new-import
+       - 1110-path-g49-move-0.20.patch
+     - Remove obsolete Patch: 1010-opencascade74 - upstream removed raytracing
+       functionality.
+     - Refreshed paches:
+       - 0110-desktop-extra-categories.patch
+       - 1100-run_single-instance.patch
+     - New patch: 2040-ftbfs-macappbundle.patch, to avoid that CMake
+       is not missing the removed MacAppBundle directory.
+     - New B-Ds on libfmt-dev python3-pivy
+   * Remove override for dh_installchangelogs, upstream does no longer ship an
+     Changelog.
+   * Override dh_strip_nondeterminism, as it chokes on the corrupted zip
+     file used in a unit test.
+   * Add gmock/gtest to d/not-installed.
+   * Remove B-D on libqtwebkit5-dev, as upstream stopped support
+     for it. This results that freecad will be built without the "Web
+     Workbench", on architectures that do not have qtwebengine5-dev.
+     (all except amd64, arm64, armhf, i386 and mipsel64)
+  -- Tobias Frost <tobi@debian.org>  Mon, 18 Dec 2023 18:28:59 +0100
+ freecad (0.20.2+dfsg1-10) unstable; urgency=medium
+   * Team upload.
+   [ Petter Reinholdtsen ]
+   * Added 1120-desktop-extra-categories.patch to include X-CNC category
+     to XDG desktop meny entry.
+   [ Bas Couwenberg ]
+   * Drop unused libproj-dev build dependency.
+   [ Petter Reinholdtsen ]
+   * Added recommend and patched code to find find new opencamlib package.
+  -- Petter Reinholdtsen <pere@debian.org>  Mon, 04 Sep 2023 15:53:04 +0200
+ freecad (0.20.2+dfsg1-9) unstable; urgency=medium
+   * Team upload.
+   * Added 0090-gcc13-fix.patch to fix GCC 13 build problem (Closes: #1037664).
+  -- Petter Reinholdtsen <pere@debian.org>  Wed, 26 Jul 2023 23:14:08 +0200
+ freecad (0.20.2+dfsg1-8) unstable; urgency=medium
+   * Team upload.
+   * Updated patch metadata for patches now applied upstream.
+   * Added 1110-path-g49-move-0.20.patch avoiding dangerous G-code
+     from Path (Closes: #1040426).
+  -- Petter Reinholdtsen <pere@debian.org>  Tue, 11 Jul 2023 17:29:12 +0200
+ freecad (0.20.2+dfsg1-7) unstable; urgency=medium
+   * Team upload.
+   * Moved patches upstream to 0xxx patch sequence.
+   * Corrected patch metadata for *opencascade74.patch.
+   * Added new 1160-python3-interpreter.patch to fix more
+     lintian warnings.
+   * Dropped superfluous file patterns pointing to non-existing files
+     from d/copyright.
+   * Remove unused dh-exec from debian/freecad-common.install.
+  -- Petter Reinholdtsen <pere@debian.org>  Thu, 06 Jul 2023 08:25:20 +0200
+ freecad (0.20.2+dfsg1-6) unstable; urgency=medium
+   * Team upload.
+   * Removed 1000-fix-occt-7.5.2.patch now applied upstream.
+   * Sent patches upstream and updated metadata to relect this.
+   * Removed cruft from metadata of two patches.
+   * Classified *fix-1017598.patch as Debian specific, in line with
+     its description.
+   * Renamed and added patch metadata to *python3.8-syntax.patch.
+   * Added 1160-python3-interpreter.patch to fix lintian warning
+     unusual-interpreter.
+   * Added 0010-arch-tutorial.patch to get arch tutorials working
+     with Python >= 3.11  (Closes: #1031566).
+  -- Petter Reinholdtsen <pere@debian.org>  Sat, 01 Jul 2023 08:44:13 +0200
+ freecad (0.20.2+dfsg1-5) unstable; urgency=medium
+   * Team upload.
+   * Changed upstream URL from https://freecadweb.org/ to
+     https://freecad.org/ (Closes: #1031830).
+   * Updated Standards-Version from 4.6.1 to 4.6.2.  No changes needed.
+   * Corrected typos and metadata in several patch files.
+   * Standardised Author information in patch files, preferred
+     @debian.org addresses.
+   * Restructured patches into upstreamable and debian specific groups.
+   * Removed obsolete NEWS.debian.
+   * Added 1150-appstream-meta-launcable.patch trying to fix Appstream
+     generator warning.
+  -- Petter Reinholdtsen <pere@debian.org>  Fri, 30 Jun 2023 08:02:21 +0200
  
  freecad (0.20.2+dfsg1-4) unstable; urgency=medium
  
diff --cc debian/control
index 942bdf150093a66f050209f71f6e57b497ae0b9f,5580e68e8f9d0e3901fcc9be6659a9e745c0b7d6..f32fdbf4a7c08d770e1ab9f38d2176cf6cc0c96e
@@@ -62,13 -62,13 +62,13 @@@ Build-Depends: cmake
                 python3-requests,
                 qtbase5-dev,
                 qttools5-dev,
-                qtwebengine5-dev [amd64 arm64 i386 mips64el mipsel],
 -               qtwebengine5-dev [amd64 arm64 armhf i386 mips64el],
++               qtwebengine5-dev [amd64 arm64 i386 mips64el],
                 swig
  Build-Depends-Indep: doxygen
- Standards-Version: 4.6.1
+ Standards-Version: 4.6.2
  Vcs-Browser: https://salsa.debian.org/science-team/freecad
  Vcs-Git: https://salsa.debian.org/science-team/freecad.git
- Homepage: https://freecadweb.org/
+ Homepage: https://freecad.org/
  Rules-Requires-Root: no
  
  Package: freecad