diff -pruN 3.2.2+dfsg-35/debian/changelog 3.2.2+dfsg-46/debian/changelog --- 3.2.2+dfsg-35/debian/changelog 2025-01-06 21:52:11.000000000 +0000 +++ 3.2.2+dfsg-46/debian/changelog 2025-02-18 13:36:17.000000000 +0000 @@ -1,3 +1,12 @@ +fp-units-win (3.2.2+dfsg-46) unstable; urgency=medium + + * Remove Lintian warning about dependencies on obsolete package. + * Simplified rules file and used dh sequencer. + * Removed unused Lintian overrides. + * Updated licenses in copyright file. + + -- Abou Al Montacir Tue, 18 Feb 2025 14:36:17 +0100 + fp-units-win (3.2.2+dfsg-35) unstable; urgency=medium * Fixed lintian error about alien tag. diff -pruN 3.2.2+dfsg-35/debian/control 3.2.2+dfsg-46/debian/control --- 3.2.2+dfsg-35/debian/control 2025-01-06 21:52:11.000000000 +0000 +++ 3.2.2+dfsg-46/debian/control 2025-02-18 13:30:08.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Abou Al Montacir , Paul Gevers , Peter Michael Green , -Standards-Version: 4.6.0 +Standards-Version: 4.7.0 Build-Depends: debhelper (>= 13), dh-exec (>=0.22), @@ -15,7 +15,7 @@ Build-Depends: fp-units-fcl, fp-utils, fpc-source, -Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win +Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win.git Vcs-Browser: https://salsa.debian.org/pascal-team/fp-units-win Homepage: https://www.freepascal.org/ @@ -26,7 +26,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: - fp-compiler-3.2.2 (>= 3.2.2+dfsg-35) + fp-compiler-3.2.2 (>= 3.2.2+dfsg-46) 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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), - fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-46), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), - fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-fcl-3.2.2 (>= 3.2.2+dfsg-46), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), 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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), - fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-46), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends}, ${shlibs:Depends} Provides: @@ -194,7 +194,7 @@ Recommends: libcairo2-dev, libforms-dev, libgd-dev, - libgl1-mesa-dev, + libgl-dev, libgraphviz-dev, libpng-dev, libxxf86dga-dev, @@ -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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${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 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends}, ${shlibs:Depends} Recommends: @@ -335,7 +335,7 @@ Package: fp-units-win-wasm-3.2.2 Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends}, ${shlibs:Depends} Provides: @@ -359,7 +359,7 @@ Package: fp-units-win-rtl Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-rtl-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - runtime libraries dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -376,7 +376,7 @@ Package: fp-units-win-base Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-base-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - base units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -395,7 +395,7 @@ Package: fp-units-win-fcl Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-fcl-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-fcl-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - Free Component Library dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -412,7 +412,7 @@ Package: fp-units-win-fv Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-fv-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-fv-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - Free Vision units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -430,7 +430,7 @@ Package: fp-units-win-gtk2 Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-gtk2-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-gtk2-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - GTK+ 2.x units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -448,7 +448,7 @@ Package: fp-units-win-db Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-db-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-db-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - database-library units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -466,7 +466,7 @@ Package: fp-units-win-gfx Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-gfx-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-gfx-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - graphics-library units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -487,7 +487,7 @@ Package: fp-units-win-net Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-net-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-net-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - networking units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -506,7 +506,7 @@ Package: fp-units-win-math Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-math-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-math-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - math units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -527,7 +527,7 @@ Package: fp-units-win-misc Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-misc-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-misc-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - miscellaneous units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -545,7 +545,7 @@ Package: fp-units-win-multimedia Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-multimedia-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-multimedia-3.2.2 (>= 3.2.2+dfsg-46), ${misc:Depends} Description: Free Pascal - multimedia units dependency package The Free Pascal Compiler is an Object Pascal compiler supporting both Delphi @@ -563,7 +563,7 @@ Package: fp-units-win-wasm Architecture: amd64 i386 Multi-Arch: same Depends: - fp-units-win-wasm-3.2.2 (>= 3.2.2+dfsg-35), + fp-units-win-wasm-3.2.2 (>= 3.2.2+dfsg-46), ${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-35/debian/control.in 3.2.2+dfsg-46/debian/control.in --- 3.2.2+dfsg-35/debian/control.in 2025-01-06 21:50:20.000000000 +0000 +++ 3.2.2+dfsg-46/debian/control.in 2025-02-18 12:02:51.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Abou Al Montacir , Paul Gevers , Peter Michael Green , -Standards-Version: 4.6.0 +Standards-Version: 4.7.0 Build-Depends: debhelper (>= 13), dh-exec (>=0.22), @@ -15,7 +15,7 @@ Build-Depends: fp-units-fcl, fp-utils, fpc-source, -Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win +Vcs-Git: https://salsa.debian.org/pascal-team/fp-units-win.git Vcs-Browser: https://salsa.debian.org/pascal-team/fp-units-win Homepage: https://www.freepascal.org/ @@ -194,7 +194,7 @@ Recommends: libcairo2-dev, libforms-dev, libgd-dev, - libgl1-mesa-dev, + libgl-dev, libgraphviz-dev, libpng-dev, libxxf86dga-dev, diff -pruN 3.2.2+dfsg-35/debian/copyright 3.2.2+dfsg-46/debian/copyright --- 3.2.2+dfsg-35/debian/copyright 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/copyright 2025-02-18 13:36:05.000000000 +0000 @@ -56,7 +56,7 @@ Comment: Info-ZIP. Info-ZIP's software (Zip, UnZip and related utilities) is free and can be obtained as source code or executables from Internet/WWW sites, including http://www.info-zip.org. - + Files: * Copyright: 1990-2000 Albert Graef @@ -105,7 +105,7 @@ Copyright: 2012 Sergei Gorelkin 2013 Yury Sidorov 2014 Nikolay Nikolov -License: LGPL-2.1+ with staticLink exception +License: GPL-2+ Files: debian/* Copyright: @@ -122,72 +122,20 @@ Copyright: 2012-2013 Peter Michael Green License: GPL-2+ -License: LGPL-2+ - . - On Debian systems, the complete text of version 2 of the GNU Lesser - General Public License can be found in '/usr/share/common-licenses/LGPL-2'. - -License: LGPL-2.1 +License: GPL-2+ This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; version 2.1 only + it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of version 2.1 of the GNU Lesser - General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. - -License: LGPL-2.1+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the complete text of version 2.1 of the GNU Lesser - General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. - -License: LGPL-2.1+ with staticLink exception - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version - with the following modification: - . - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent modules,and - to copy and distribute the resulting executable under terms of your choice, - provided that you also meet, for each linked independent module, the terms - and conditions of the license of that module. An independent module is a - module which is not derived from or based on this library. If you modify - this library, you may extend this exception to your version of the library, - but you are not obligated to do so. If you do not wish to do so, delete this - exception statement from your version. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. + GNU General Public License for more details. . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. . - On Debian systems, the complete text of version 2.1 of the GNU Lesser - General Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. diff -pruN 3.2.2+dfsg-35/debian/fp-units-win-base.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-base.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-base.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-base.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-35/debian/fp-units-win-base.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-base.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-base.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-base.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,4 +1,2 @@ -# 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-35/debian/fp-units-win-db.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-db.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-db.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-db.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-35/debian/fp-units-win-db.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-db.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-db.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-db.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,4 +1,2 @@ -# 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-35/debian/fp-units-win-fcl.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-fcl.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-fcl.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-fcl.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-35/debian/fp-units-win-fcl.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-fcl.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-fcl.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-fcl.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,6 +1,2 @@ -# 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 -# Some example source codes are in author's national encoding instead of UTF-8 -national-encoding [usr/share/doc/fp-units-win-fcl/3.2.2/examples/fcl-base/testreg.pp] diff -pruN 3.2.2+dfsg-35/debian/fp-units-win-fv.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-fv.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-fv.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-fv.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-35/debian/fp-units-win-fv.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-fv.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-fv.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-fv.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-35/debian/fp-units-win-gfx.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-gfx.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-gfx.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-gfx.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-35/debian/fp-units-win-gfx.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-gfx.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-gfx.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-gfx.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,4 +1,2 @@ -# 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-35/debian/fp-units-win-gtk2.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-gtk2.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-gtk2.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-gtk2.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-35/debian/fp-units-win-gtk2.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-gtk2.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-gtk2.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-gtk2.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,5 +1,2 @@ -# Spelling error in upstream license text -spelling-error-in-copyright orignal original -depends-on-obsolete-package Recommends: # We create Windows binaries, so some sections are not recongnized by Lintian no-code-sections diff -pruN 3.2.2+dfsg-35/debian/fp-units-win-math.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-math.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-math.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-math.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# False positive because the first occurrence is a name of a unit, while the -# second occurrence (between brackets) is a description of the unit. -spelling-error-in-description symbolic symbolic (duplicate word) symbolic -# Spelling error in upstream license text -spelling-error-in-copyright orignal original diff -pruN 3.2.2+dfsg-35/debian/fp-units-win-math.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-math.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-math.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-math.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,7 +1,2 @@ -# False positive because the first occurrence is a name of a unit, while the -# second occurrence (between brackets) is a description of the unit. -spelling-error-in-description symbolic symbolic (duplicate word) symbolic -# 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-35/debian/fp-units-win-misc.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-misc.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-misc.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-misc.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-35/debian/fp-units-win-misc.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-misc.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-misc.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-misc.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,7 +1,3 @@ -# Spelling error in upstream license text -spelling-error-in-copyright orignal original -# Spelling error in variable name in object file -spelling-error-in-binary relocateable relocatable # We create Windows binaries, so some sections are not recongnized by Lintian no-code-sections # We can't do so much for this diff -pruN 3.2.2+dfsg-35/debian/fp-units-win-multimedia.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-multimedia.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-multimedia.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-multimedia.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-35/debian/fp-units-win-multimedia.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-multimedia.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-multimedia.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-multimedia.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,4 +1,2 @@ -# 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-35/debian/fp-units-win-net.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-net.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-net.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-net.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-35/debian/fp-units-win-net.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-net.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-net.lintian-overrides.in 2023-06-10 21:14:06.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-net.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,4 +1,2 @@ -# 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-35/debian/fp-units-win-rtl.lintian-overrides 3.2.2+dfsg-46/debian/fp-units-win-rtl.lintian-overrides --- 3.2.2+dfsg-35/debian/fp-units-win-rtl.lintian-overrides 2025-01-06 20:42:42.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-rtl.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-35/debian/fp-units-win-rtl.lintian-overrides.in 3.2.2+dfsg-46/debian/fp-units-win-rtl.lintian-overrides.in --- 3.2.2+dfsg-35/debian/fp-units-win-rtl.lintian-overrides.in 2025-01-06 14:58:52.000000000 +0000 +++ 3.2.2+dfsg-46/debian/fp-units-win-rtl.lintian-overrides.in 2025-02-18 13:36:05.000000000 +0000 @@ -1,5 +1,2 @@ -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 no-code-sections diff -pruN 3.2.2+dfsg-35/debian/rules 3.2.2+dfsg-46/debian/rules --- 3.2.2+dfsg-35/debian/rules 2025-01-06 21:07:03.000000000 +0000 +++ 3.2.2+dfsg-46/debian/rules 2025-02-18 13:29:23.000000000 +0000 @@ -17,6 +17,7 @@ CONVERTER=${DOCTYPE} endif # Include standard dpkg-buildpackage variables include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/pkg-info.mk # Undefine FPC if it was set unexport FPC # Build new compiler name @@ -90,10 +91,8 @@ OS_SOURCE=${DEB_BUILD_ARCH_OS} # separated by a dash. FPCTARGET=$(CPU_TARGET)-$(OS_TARGET) # Get version information from changelog file -DEB_VERSION:=$(shell dpkg-parsechangelog --show-field Version) -DEB_DATE:=$(shell date --utc --date="`dpkg-parsechangelog --show-field Date`" +%Y/%m/%d) -DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | cut -f 1 -d -) -export DEB_UPSTREAM_MAIN_VERSION:=$(shell echo ${DEB_UPSTREAM_VERSION} | sed -e 's/^\([0-9\.]*\).*/\1/') +DEB_DATE:=$(shell date --utc --date="@${SOURCE_DATE_EPOCH}" +%Y/%m/%d) +export DEB_UPSTREAM_MAIN_VERSION:=$(shell echo ${DEB_VERSION_UPSTREAM} | sed -e 's/^\([0-9\.]*\).*/\1/') DEB_BUILD=$(lastword $(subst -, ,${DEB_VERSION})) ifndef PACKAGESUFFIX export PACKAGESUFFIX=-${DEB_UPSTREAM_MAIN_VERSION} @@ -124,13 +123,7 @@ unexport FPCDIR NEWPP=$(CURDIR)/fpcsrc/compiler/$(PPNEW) NEWFPDOC=$(CURDIR)/fpcsrc/utils/fpdoc/fpdoc # Set default compilation options -DEB_BUILD_FPC_OPT=debian/deb-build-fpc.cfg -DEB_HOST_FPC_OPT=debian/deb-host-fpc.cfg -ifeq ($(DEB_HOST_ARCH_CPU),ppc64el) -BUILDOPTS=PP=$(NEWPP) OPT='@${CURDIR}/${DEB_HOST_FPC_OPT} -Cb- -Caelfv2' -else -BUILDOPTS=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}' -endif +BUILDOPTS=OPT='@hardening' ifdef CROSSOPT BUILDOPTS+= CROSSOPT=${CROSSOPT} endif @@ -138,27 +131,14 @@ INSTALLOPTS=INSTALL_PREFIX=$(INSTALL_DIR export GDBLIBDIR=/usr/lib -ifeq ($(CPU_TARGET),m68k) - # Disable optimization for the first runs as there may be bugs associated - # with that, preventing proper building new versions - CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}' OPTLEVEL1=-O- -else - CYCLEOPTS:=OPT='@${CURDIR}/${DEB_HOST_FPC_OPT}' -endif - BUILDOPTS+=OS_TARGET=${OS_TARGET} INSTALLOPTS+=OS_TARGET=${OS_TARGET} -LDFLAGS=$(strip $(shell DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \ - dpkg-buildflags --get LDFLAGS | \ - sed -e 's/-Wl,//g' -e 's/,/ /g' -e 's1-specs=/usr/share/dpkg/.*\.specs11' -e 's/-ffat-lto-objects//')) - -# Until we switch to shorthand dh, we need to set this ourselves for -# reproducible builds -export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s) - #export DH_VERBOSE=1 +%: + dh ${@} + ################### # Clean # @@ -166,7 +146,6 @@ export SOURCE_DATE_EPOCH = $(shell date 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)' ';' @@ -183,7 +162,9 @@ makefiles-stamp: # debian-files: debian-files-stamp -debian-files-stamp:debian/fixdeb debian/*.in + @echo "--- Creating/fixing *.install files done!" + +debian-files-stamp:debian/fixdeb $(wildcard debian/*.in) mv debian/control debian/control.old @echo "--- Creating/fixing *.install files" DEB_SUBST_PACKAGESUFFIX=${PACKAGESUFFIX} \ @@ -225,7 +206,7 @@ prepare-source-stamp: # build-arch: debian-files prepare-source makefiles build-arch-stamp -build-arch-stamp: ${DEB_BUILD_FPC_OPT} ${DEB_HOST_FPC_OPT} +build-arch-stamp: @echo "--- Building" dh_testdir # First make a new Compiler using a make cycle @@ -347,15 +328,5 @@ debian/%:debian/fixdeb debian/changelog DEB_SUBST_DEB_HOST_MULTIARCH=${DEB_HOST_MULTIARCH} \ $< --gen-control $@.in -${DEB_BUILD_FPC_OPT}: - echo '# FPC configuration file for build system tools' > $@ - echo '-k${LDFLAGS}' >> $@ - echo '-Fl/usr/lib/${DEB_BUILD_MULTIARCH}' >> $@ - -${DEB_HOST_FPC_OPT}: - echo '# FPC configuration file for host system applications' > $@ - echo '-k${LDFLAGS}' >> $@ - echo '-Fl/usr/lib/${DEB_HOST_MULTIARCH}' >> $@ - lintian: - lintian -I -i ../fpc_${DEB_VERSION}_${DEB_HOST_ARCH}.changes + lintian -I -i ../${DEB_SOURCE}_${DEB_VERSION}_${DEB_HOST_ARCH}.changes