diff -pruN 3.2.2+dfsg-33/debian/changelog 3.2.2+dfsg-35/debian/changelog
--- 3.2.2+dfsg-33/debian/changelog	2024-06-07 23:10:37.000000000 +0000
+++ 3.2.2+dfsg-35/debian/changelog	2025-01-06 21:52:11.000000000 +0000
@@ -1,3 +1,19 @@
+fp-units-win (3.2.2+dfsg-35) unstable; urgency=medium
+
+  * Fixed lintian error about alien tag.
+    The name of the binary package was misspelled in the override file.
+  * Fixed lintian error about debhelper substitution var not correctly used.
+    The substitution var was applied to a package that is not being built.
+    We used another mechanism to build the dependency.
+  * Fixed clean target in debian/rules to remove auto generated files.
+  * Fixed build for i386-win32 as i386-win64 does not make sense.
+    (Closes: Bug#1084752)
+  * Fixed VCS link debian/control file.
+  * Removed units that do not make sense for win32 target.
+    These are Kylix compatibility units that are per essence Linux units.
+
+ -- Abou Al Montacir <abou.almontacir@sfr.fr>  Mon, 06 Jan 2025 22:52:11 +0100
+
 fp-units-win (3.2.2+dfsg-33) unstable; urgency=medium
 
   * Fixed typos in package descriptions. (Closes: Bug#1055903)
diff -pruN 3.2.2+dfsg-33/debian/control 3.2.2+dfsg-35/debian/control
--- 3.2.2+dfsg-33/debian/control	2024-06-07 23:09:19.000000000 +0000
+++ 3.2.2+dfsg-35/debian/control	2025-01-06 21:52:11.000000000 +0000
@@ -15,8 +15,8 @@ Build-Depends:
  fp-units-fcl,
  fp-utils,
  fpc-source,
-Vcs-Git: https://salsa.debian.org/pascal-team/fpc
-Vcs-Browser: https://salsa.debian.org/pascal-team/fpc
+Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win
+Vcs-Browser: https://salsa.debian.org/pascal-team/fp-units-win
 Homepage: https://www.freepascal.org/
 
 Package: fp-units-win-rtl-3.2.2
@@ -26,7 +26,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- fp-compiler-3.2.2 (= ${binary:Version})
+ fp-compiler-3.2.2 (>= 3.2.2+dfsg-35)
 Provides:
  fp-units-win-rtl,
  fpc-abi-3.2.2
@@ -50,7 +50,7 @@ Package: fp-units-win-base-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests:
@@ -77,8 +77,8 @@ Package: fp-units-win-fcl-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base-3.2.2 (= ${binary:Version}),
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-35),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -101,7 +101,7 @@ Package: fp-units-win-fv-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -125,8 +125,8 @@ Package: fp-units-win-gtk2-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fcl-3.2.2 (= ${binary:Version}),
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-fcl-3.2.2 (>= 3.2.2+dfsg-35),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  libgtk2.0-dev,
  ${misc:Depends},
  ${shlibs:Depends}
@@ -151,7 +151,7 @@ Package: fp-units-win-db-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests:
@@ -184,8 +184,8 @@ Package: fp-units-win-gfx-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base-3.2.2 (= ${binary:Version}),
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-35),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -221,7 +221,7 @@ Package: fp-units-win-net-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -246,7 +246,7 @@ Package: fp-units-win-math-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
@@ -277,7 +277,7 @@ Package: fp-units-win-misc-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -302,7 +302,7 @@ Package: fp-units-win-multimedia-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
@@ -331,35 +331,11 @@ Description: Free Pascal - multimedia un
  This package contains Free Pascal multimedia units: a52, dts, mad, modplug,
  oggvorbis, openal, and vlc.
 
-Package: fp-units-win-i386-3.2.2
-Architecture: i386
-Multi-Arch: same
-Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Provides:
- fp-units-win-i386
-Breaks:
- fpc (<= 3.2.2+dfsg-0),
-Replaces:
- fpc (<= 3.2.2+dfsg-0),
-Description: Free Pascal - Kylix compatibility units
- The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
- and Turbo Pascal 7.0 dialects, as well as Mac Pascal dialects. It provides a
- completely portable RunTime Library (RTL) available on many platforms and
- compatible with Turbo Pascal, along with a platform-independent class-based
- Free Component Library (FCL) adding many Delphi extensions and interfacing
- with many popular open source libraries.
- .
- This package contains the deprecated Free Pascal libc unit for the i386
- architecture (used for compatibility with Borland's Kylix).
-
 Package: fp-units-win-wasm-3.2.2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -383,7 +359,7 @@ Package: fp-units-win-rtl
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl-3.2.2 (= ${binary:Version}),
+ fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - runtime libraries dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -400,7 +376,7 @@ Package: fp-units-win-base
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base-3.2.2 (= ${binary:Version}),
+ fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - base units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -419,7 +395,7 @@ Package: fp-units-win-fcl
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fcl-3.2.2 (= ${binary:Version}),
+ fp-units-win-fcl-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - Free Component Library dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -436,7 +412,7 @@ Package: fp-units-win-fv
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fv-3.2.2 (= ${binary:Version}),
+ fp-units-win-fv-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - Free Vision units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -454,7 +430,7 @@ Package: fp-units-win-gtk2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-gtk2-3.2.2 (= ${binary:Version}),
+ fp-units-win-gtk2-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - GTK+ 2.x units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -472,7 +448,7 @@ Package: fp-units-win-db
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-db-3.2.2 (= ${binary:Version}),
+ fp-units-win-db-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - database-library units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -490,7 +466,7 @@ Package: fp-units-win-gfx
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-gfx-3.2.2 (= ${binary:Version}),
+ fp-units-win-gfx-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - graphics-library units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -511,7 +487,7 @@ Package: fp-units-win-net
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-net-3.2.2 (= ${binary:Version}),
+ fp-units-win-net-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - networking units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -530,7 +506,7 @@ Package: fp-units-win-math
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-math-3.2.2 (= ${binary:Version}),
+ fp-units-win-math-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - math units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -551,7 +527,7 @@ Package: fp-units-win-misc
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-misc-3.2.2 (= ${binary:Version}),
+ fp-units-win-misc-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - miscellaneous units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -569,7 +545,7 @@ Package: fp-units-win-multimedia
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-multimedia-3.2.2 (= ${binary:Version}),
+ fp-units-win-multimedia-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - multimedia units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -583,28 +559,11 @@ Description: Free Pascal - multimedia un
  the package containing Free Pascal multimedia units: a52, dts, mad, modplug,
  oggvorbis, openal, and vlc.
 
-Package: fp-units-win-i386
-Architecture: i386
-Depends:
- fp-units-win-i386-3.2.2 (= ${binary:Version}),
- ${misc:Depends}
-Description: Free Pascal - Kylix compatibility units dependency package
- The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
- and Turbo Pascal 7.0 dialects, as well as Mac Pascal dialects. It provides a
- completely portable RunTime Library (RTL) available on many platforms and
- compatible with Turbo Pascal, along with a platform-independent class-based
- Free Component Library (FCL) adding many Delphi extensions and interfacing
- with many popular open source libraries.
- .
- This dependency package always depends on the latest available version of
- the package containing the deprecated Free Pascal libc unit for the i386
- architecture (used for compatibility with Borland's Kylix).
-
 Package: fp-units-win-wasm
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-wasm-3.2.2 (= ${binary:Version}),
+ fp-units-win-wasm-3.2.2 (>= 3.2.2+dfsg-35),
  ${misc:Depends}
 Description: Free Pascal - Web assembly support units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
diff -pruN 3.2.2+dfsg-33/debian/control.in 3.2.2+dfsg-35/debian/control.in
--- 3.2.2+dfsg-33/debian/control.in	2024-06-07 23:09:09.000000000 +0000
+++ 3.2.2+dfsg-35/debian/control.in	2025-01-06 21:50:20.000000000 +0000
@@ -15,8 +15,8 @@ Build-Depends:
  fp-units-fcl,
  fp-utils,
  fpc-source,
-Vcs-Git: https://salsa.debian.org/pascal-team/fpc
-Vcs-Browser: https://salsa.debian.org/pascal-team/fpc
+Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win
+Vcs-Browser: https://salsa.debian.org/pascal-team/fp-units-win
 Homepage: https://www.freepascal.org/
 
 Package: fp-units-win-rtl${PACKAGESUFFIX}
@@ -26,7 +26,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- fp-compiler${PACKAGESUFFIX} (= ${binary:Version})
+ fp-compiler${PACKAGESUFFIX} (>= ${PACKAGEVERSION})
 Provides:
  fp-units-win-rtl,
  fpc-abi${PACKAGESUFFIX}
@@ -50,7 +50,7 @@ Package: fp-units-win-base${PACKAGESUFFI
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests:
@@ -77,8 +77,8 @@ Package: fp-units-win-fcl${PACKAGESUFFIX
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base${PACKAGESUFFIX} (= ${binary:Version}),
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-base${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -101,7 +101,7 @@ Package: fp-units-win-fv${PACKAGESUFFIX}
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -125,8 +125,8 @@ Package: fp-units-win-gtk2${PACKAGESUFFI
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fcl${PACKAGESUFFIX} (= ${binary:Version}),
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-fcl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  libgtk2.0-dev,
  ${misc:Depends},
  ${shlibs:Depends}
@@ -151,7 +151,7 @@ Package: fp-units-win-db${PACKAGESUFFIX}
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Suggests:
@@ -184,8 +184,8 @@ Package: fp-units-win-gfx${PACKAGESUFFIX
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base${PACKAGESUFFIX} (= ${binary:Version}),
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-base${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -221,7 +221,7 @@ Package: fp-units-win-net${PACKAGESUFFIX
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -246,7 +246,7 @@ Package: fp-units-win-math${PACKAGESUFFI
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
@@ -277,7 +277,7 @@ Package: fp-units-win-misc${PACKAGESUFFI
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -302,7 +302,7 @@ Package: fp-units-win-multimedia${PACKAG
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
@@ -331,35 +331,11 @@ Description: Free Pascal - multimedia un
  This package contains Free Pascal multimedia units: a52, dts, mad, modplug,
  oggvorbis, openal, and vlc.
 
-Package: fp-units-win-i386${PACKAGESUFFIX}
-Architecture: i386
-Multi-Arch: same
-Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Provides:
- fp-units-win-i386
-Breaks:
- fpc (<= ${UPSTREAM_VERSION}-0),
-Replaces:
- fpc (<= ${UPSTREAM_VERSION}-0),
-Description: Free Pascal - Kylix compatibility units
- The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
- and Turbo Pascal 7.0 dialects, as well as Mac Pascal dialects. It provides a
- completely portable RunTime Library (RTL) available on many platforms and
- compatible with Turbo Pascal, along with a platform-independent class-based
- Free Component Library (FCL) adding many Delphi extensions and interfacing
- with many popular open source libraries.
- .
- This package contains the deprecated Free Pascal libc unit for the i386
- architecture (used for compatibility with Borland's Kylix).
-
 Package: fp-units-win-wasm${PACKAGESUFFIX}
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends},
  ${shlibs:Depends}
 Provides:
@@ -383,7 +359,7 @@ Package: fp-units-win-rtl
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-rtl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-rtl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - runtime libraries dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -400,7 +376,7 @@ Package: fp-units-win-base
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-base${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-base${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - base units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -419,7 +395,7 @@ Package: fp-units-win-fcl
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fcl${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-fcl${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - Free Component Library dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -436,7 +412,7 @@ Package: fp-units-win-fv
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-fv${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-fv${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - Free Vision units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -454,7 +430,7 @@ Package: fp-units-win-gtk2
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-gtk2${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-gtk2${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - GTK+ 2.x units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -472,7 +448,7 @@ Package: fp-units-win-db
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-db${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-db${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - database-library units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -490,7 +466,7 @@ Package: fp-units-win-gfx
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-gfx${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-gfx${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - graphics-library units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -511,7 +487,7 @@ Package: fp-units-win-net
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-net${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-net${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - networking units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -530,7 +506,7 @@ Package: fp-units-win-math
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-math${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-math${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - math units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -551,7 +527,7 @@ Package: fp-units-win-misc
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-misc${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-misc${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - miscellaneous units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -569,7 +545,7 @@ Package: fp-units-win-multimedia
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-multimedia${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-multimedia${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - multimedia units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
@@ -583,28 +559,11 @@ Description: Free Pascal - multimedia un
  the package containing Free Pascal multimedia units: a52, dts, mad, modplug,
  oggvorbis, openal, and vlc.
 
-Package: fp-units-win-i386
-Architecture: i386
-Depends:
- fp-units-win-i386${PACKAGESUFFIX} (= ${binary:Version}),
- ${misc:Depends}
-Description: Free Pascal - Kylix compatibility units dependency package
- The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
- and Turbo Pascal 7.0 dialects, as well as Mac Pascal dialects. It provides a
- completely portable RunTime Library (RTL) available on many platforms and
- compatible with Turbo Pascal, along with a platform-independent class-based
- Free Component Library (FCL) adding many Delphi extensions and interfacing
- with many popular open source libraries.
- .
- This dependency package always depends on the latest available version of
- the package containing the deprecated Free Pascal libc unit for the i386
- architecture (used for compatibility with Borland's Kylix).
-
 Package: fp-units-win-wasm
 Architecture: amd64 i386
 Multi-Arch: same
 Depends:
- fp-units-win-wasm${PACKAGESUFFIX} (= ${binary:Version}),
+ fp-units-win-wasm${PACKAGESUFFIX} (>= ${PACKAGEVERSION}),
  ${misc:Depends}
 Description: Free Pascal - Web assembly support units dependency package
  The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi
diff -pruN 3.2.2+dfsg-33/debian/fp-units-win-i386.install.in 3.2.2+dfsg-35/debian/fp-units-win-i386.install.in
--- 3.2.2+dfsg-33/debian/fp-units-win-i386.install.in	2023-06-10 21:14:06.000000000 +0000
+++ 3.2.2+dfsg-35/debian/fp-units-win-i386.install.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/libc
-usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/fpmkinst/*/libc.fpm
-usr/lib/${DEB_HOST_MULTIARCH}/fpc/*/*/*/unixutil*
-usr/share/doc/fp-units-win-i386
diff -pruN 3.2.2+dfsg-33/debian/fp-units-win-i386.lintian-overrides 3.2.2+dfsg-35/debian/fp-units-win-i386.lintian-overrides
--- 3.2.2+dfsg-33/debian/fp-units-win-i386.lintian-overrides	2023-06-10 21:14:06.000000000 +0000
+++ 3.2.2+dfsg-35/debian/fp-units-win-i386.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Spelling error in upstream license text
-spelling-error-in-copyright orignal original
diff -pruN 3.2.2+dfsg-33/debian/fp-units-win-i386.lintian-overrides.in 3.2.2+dfsg-35/debian/fp-units-win-i386.lintian-overrides.in
--- 3.2.2+dfsg-33/debian/fp-units-win-i386.lintian-overrides.in	2023-06-10 21:14:06.000000000 +0000
+++ 3.2.2+dfsg-35/debian/fp-units-win-i386.lintian-overrides.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-# Spelling error in upstream license text
-spelling-error-in-copyright orignal original
-# We create Windows binaries, so some sections are not recongnized by Lintian
-no-code-sections
diff -pruN 3.2.2+dfsg-33/debian/fp-units-win-rtl.lintian-overrides.in 3.2.2+dfsg-35/debian/fp-units-win-rtl.lintian-overrides.in
--- 3.2.2+dfsg-33/debian/fp-units-win-rtl.lintian-overrides.in	2023-06-10 21:14:06.000000000 +0000
+++ 3.2.2+dfsg-35/debian/fp-units-win-rtl.lintian-overrides.in	2025-01-06 14:58:52.000000000 +0000
@@ -1,4 +1,4 @@
-fp-units-rtl${PACKAGESUFFIX}: spelling-error-in-binary */rtl/stdconvs.o ang and
+fp-units-win-rtl${PACKAGESUFFIX}: spelling-error-in-binary */rtl/stdconvs.o ang and
 # Spelling error in upstream license text
 spelling-error-in-copyright orignal original
 # We create Windows binaries, so some sections are not recongnized by Lintian
diff -pruN 3.2.2+dfsg-33/debian/rules 3.2.2+dfsg-35/debian/rules
--- 3.2.2+dfsg-33/debian/rules	2023-07-25 11:26:54.000000000 +0000
+++ 3.2.2+dfsg-35/debian/rules	2025-01-06 21:07:03.000000000 +0000
@@ -42,9 +42,11 @@ PPSUF=68k
 endif
 ifeq ($(CPU_TARGET),i386)
 PPSUF=386
+OS_TARGET=win32
 endif
 ifeq ($(CPU_TARGET),x86_64)
 PPSUF=x64
+OS_TARGET=win64
 endif
 ifeq ($(CPU_TARGET),powerpc)
 PPSUF=ppc
@@ -83,7 +85,6 @@ endif
 PPNEW=$(PPPRE)$(PPSUF)
 # Take care that Debian uses kfreebsd while FPC prefers freebsd
 OS_SOURCE=${DEB_BUILD_ARCH_OS}
-OS_TARGET=win64
 # FPC uses FPCTARGET to identify the target for which the binaries are
 # produced. This is generally a couple of target CPU and target OS names
 # separated by a dash.
@@ -166,6 +167,8 @@ clean:
 	dh_clean
 	${RM} fpcsrc
 	${RM} ${DEB_BUILD_FPC_OPT} ${DEB_HOST_FPC_OPT}
+	${RM} debian/*.old
+	find debian -name *.install.in -execdir sh -c '${RM} $$(basename {} .in)' ';'
 
 FPCMAKEFILES=
 makefiles: makefiles-stamp
@@ -181,15 +184,18 @@ makefiles-stamp:
 
 debian-files: debian-files-stamp
 debian-files-stamp:debian/fixdeb debian/*.in
+	mv debian/control debian/control.old
 	@echo "--- Creating/fixing *.install files"
 	DEB_SUBST_PACKAGESUFFIX=${PACKAGESUFFIX} \
 	DEB_SUBST_PPCBIN=${PPNEW} \
 	DEB_SUBST_TARGET=${FPCTARGET} \
 	DEB_SUBST_DEB_HOST_MULTIARCH=${DEB_HOST_MULTIARCH} \
-	$< debian/*.in
+	$< --gen-control debian/*.in
 	# Because we use dh-exec to track units that don't need to install
 	# everywhere, we need the <package>.install files to be executable
 	chmod a+x debian/*.install
+	# Ensure we fail build if contol file changed so that we update it in VCS
+	diff -u debian/control.old debian/control
 	touch debian-files-stamp
 
 
@@ -327,7 +333,7 @@ binary-arch: arrange-arch
 	makefiles prepare-source gen-control run-tests \
 
 # Generate debian.control file
-gen-control: debian/control.in
+gen-control: debian/control
 
 # Run upstream test suite
 run-tests: