Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: laza...@packages.debian.org
Control: affects -1 + src:lazarus
Please unblock package lazarus
(Please provide enough (but not too much) information to help
the release team to judge the request efficiently. E.g. by
filling in the sections below.)
[ Reason ]
User raised a bug report about missing help files.
Bug#1036293: lazarus: LHelp needs CHM files to display online help
[ Impact ]
This turned out to be wrong, as the CHM file exists, but it was just that
configuration file was pointing to the wrong location.
During investigation, we also discovered that HTML help files are not located
at the right position.
We fixed the CHM location in configuration file and fixed HTML files location.
[ Tests ]
Lazarus help is now working as expected without any need for user to change the
default configuration.
[ Risks ]
No risk as the the change touch only Lazarus help which does not work without
user manual intervention. At worst it will be still the case. But user already
confirmed he was happy with this fix.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
This should help improving the quality of SW intended to be part of next
release.
unblock lazarus/2.2.6+dfsg2-2
diff -Nru lazarus-2.2.6+dfsg2/debian/changelog
lazarus-2.2.6+dfsg2/debian/changelog
--- lazarus-2.2.6+dfsg2/debian/changelog 2023-04-30 15:46:27.000000000
+0200
+++ lazarus-2.2.6+dfsg2/debian/changelog 2023-05-20 14:29:04.000000000
+0200
@@ -1,3 +1,13 @@
+lazarus (2.2.6+dfsg2-2) unstable; urgency=medium
+
+ * Fixed lcl docs installation path. (Closes: Bug#1036293)
+ * Tried removin Lintian error about unknown file in debian/source folder.
+ Thanks to Peter Blackman <pe...@pblackman.plus.com>
+ * Removed overrides for Lintian warnings that were fixed by upstream.
+ * Updated debian/copyright file with moved and removed files.
+
+ -- Abou Al Montacir <abou.almonta...@sfr.fr> Sat, 20 May 2023 14:29:04 +0200
+
lazarus (2.2.6+dfsg2-1) unstable; urgency=medium
* Cleaned sources repackaging removing unused Windows help files.
diff -Nru lazarus-2.2.6+dfsg2/debian/copyright
lazarus-2.2.6+dfsg2/debian/copyright
--- lazarus-2.2.6+dfsg2/debian/copyright 2023-04-29 22:34:53.000000000
+0200
+++ lazarus-2.2.6+dfsg2/debian/copyright 2023-05-20 14:29:04.000000000
+0200
@@ -117,6 +117,10 @@
intellectual property as long as the interface itself is publicly available.
Files:
+ components/buildintf/baseideintf.pas
+ components/buildintf/ideexterntoolintf.pas
+ components/buildintf/macrodefintf.pas
+ components/buildintf/macrointf.pas
components/chmhelp/lhelp/chmdataprovider.pas
components/chmhelp/lhelp/chmspecialparser.pas
components/customdrawn/customdrawnextras.pas
@@ -130,15 +134,11 @@
components/fpvectorial/htmlvectorialreader.pas
components/ideintf/actionseditor.pas
components/ideintf/actionseditorstd.pas
- components/ideintf/baseideintf.pas
components/ideintf/dbpropedits.pas
components/ideintf/fieldseditor.pas
components/ideintf/idedialogs.pas
- components/ideintf/ideexterntoolintf.pas
components/ideintf/ideutils.pas
components/ideintf/keyvalpropeditdlg.pas
- components/ideintf/macrodefintf.pas
- components/ideintf/macrointf.pas
components/ideintf/maskpropedit.pas
components/ideintf/newfield.pas
components/ideintf/toolbarintf.pas
@@ -170,7 +170,6 @@
components/printers/printer4lazstrconst.pas
components/sparta/dockedformeditor/source/*
components/sparta/generics/source/*
- components/wiki/myfphttpclient.pp
examples/lpicustomdata/lpicustomdata.lpr
ide/findinfilesdlg.pas
ide/findreplacedialog.pp
@@ -281,13 +280,11 @@
components/jcf2/CommandLine/CommandLineReturnCode.pas
components/jcf2/CommandLine/Lazarus/JCF.lpr
components/jcf2/CommandLine/StatusMessageReceiver.pas
- components/jcf2/IdePlugin/JcfIdeMain.pas
- components/jcf2/IdePlugin/JcfIdeRegister.pas
+ components/jcf2/IdePlugin/lazarus/JcfIdeMain.pas
+ components/jcf2/IdePlugin/lazarus/JcfIdeRegister.pas
components/jcf2/IdePlugin/lazarus/jcfidemain.pas
components/jcf2/IdePlugin/lazarus/jcfideregister.pas
- components/jcf2/JcfGui/fMain.pas
components/jcf2/JcfVersionConsts.pas
- components/jcf2/Notepad/frmJcfNotepad.pas
components/jcf2/Parse/AsmKeywords.pas
components/jcf2/Parse/BuildParseTree.pas
components/jcf2/Parse/BuildTokenList.pas
@@ -438,12 +435,8 @@
components/jcf2/Ui/Settings/frWarnings.pas
components/jcf2/Ui/fAbout.pas
components/jcf2/Ui/fJcfErrorDisplay.pas
- components/jcf2/Ui/fRegistrySettings.pas
components/jcf2/Utils/Delay.pas
- components/jcf2/Utils/DragDrop/JCFDropTarget.pas
- components/jcf2/Utils/DragDrop/frDrop.pas
components/jcf2/Utils/IntList.pas
- components/jcf2/Utils/JcfFileUtils.pas
components/jcf2/Utils/JcfFontSetFunctions.pas
components/jcf2/Utils/JcfHelp.pas
components/jcf2/Utils/JcfLog.pas
@@ -708,25 +701,25 @@
License: own_dwywwi_license
Files:
- components/lazutils/lazfreetype.pas
- components/lazutils/ttcache.pas
- components/lazutils/ttcalc.pas
- components/lazutils/ttcalc1.inc
- components/lazutils/ttcalc2.inc
- components/lazutils/ttcalc3.inc
- components/lazutils/ttcalc4.inc
- components/lazutils/ttcmap.pas
- components/lazutils/ttdebug.pas
- components/lazutils/tterror.pas
- components/lazutils/ttfile.pas
- components/lazutils/ttgload.pas
- components/lazutils/ttinterp.pas
- components/lazutils/ttload.pas
- components/lazutils/ttmemory.pas
- components/lazutils/ttobjs.pas
- components/lazutils/ttraster.pas
- components/lazutils/tttables.pas
- components/lazutils/tttypes.pas
+ components/freetype/lazfreetype.pas
+ components/freetype/ttcache.pas
+ components/freetype/ttcalc.pas
+ components/freetype/ttcalc1.inc
+ components/freetype/ttcalc2.inc
+ components/freetype/ttcalc3.inc
+ components/freetype/ttcalc4.inc
+ components/freetype/ttcmap.pas
+ components/freetype/ttdebug.pas
+ components/freetype/tterror.pas
+ components/freetype/ttfile.pas
+ components/freetype/ttgload.pas
+ components/freetype/ttinterp.pas
+ components/freetype/ttload.pas
+ components/freetype/ttmemory.pas
+ components/freetype/ttobjs.pas
+ components/freetype/ttraster.pas
+ components/freetype/tttables.pas
+ components/freetype/tttypes.pas
Copyright:
1996-1997 David Turner, Robert Wilhelm and Werner Lemberg
License: Freetype
diff -Nru lazarus-2.2.6+dfsg2/debian/lazarus-doc.install.in
lazarus-2.2.6+dfsg2/debian/lazarus-doc.install.in
--- lazarus-2.2.6+dfsg2/debian/lazarus-doc.install.in 2023-04-29
22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/lazarus-doc.install.in 2023-05-20
14:29:04.000000000 +0200
@@ -1,3 +1,5 @@
+/usr/share/doc/lazarus/${VERSION}/*.chm
+/usr/share/doc/lazarus/${VERSION}/*.xct
/usr/share/doc/lazarus/${VERSION}/index.html
/usr/share/doc/lazarus/${VERSION}/images
/usr/share/doc/lazarus/${VERSION}/lcl
diff -Nru lazarus-2.2.6+dfsg2/debian/lazarus-ide-gtk2.lintian-overrides.in
lazarus-2.2.6+dfsg2/debian/lazarus-ide-gtk2.lintian-overrides.in
--- lazarus-2.2.6+dfsg2/debian/lazarus-ide-gtk2.lintian-overrides.in
2023-04-29 22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/lazarus-ide-gtk2.lintian-overrides.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-# False spell error detections
-lazarus-ide-gtk2${PACKAGESUFFIX}: spelling-error-in-binary */lazarus-gtk2
Childs Children
-
-# This package is compiled by the FPC and Lazarus. These compilers don't have
-# hardening flags yet, so ignoring these lintian warnings for now
-# Paul Gevers <elb...@debian.org>, 22 Jun 2013
-lazarus-ide-gtk2${PACKAGESUFFIX}: hardening-no-fortify-functions */lazarus-gtk2
-
-# The following typo is intentionally because it is a backwards compatible
-# issue
-lazarus-ide-gtk2${PACKAGESUFFIX}: spelling-error-in-binary */lazarus-gtk2
commited committed
diff -Nru lazarus-2.2.6+dfsg2/debian/lazarus-ide-qt5.lintian-overrides.in
lazarus-2.2.6+dfsg2/debian/lazarus-ide-qt5.lintian-overrides.in
--- lazarus-2.2.6+dfsg2/debian/lazarus-ide-qt5.lintian-overrides.in
2023-04-29 22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/lazarus-ide-qt5.lintian-overrides.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-# False spell error detections
-lazarus-ide-qt5${PACKAGESUFFIX}: spelling-error-in-binary */lazarus-qt5 Childs
Children
-
-# This package is compiled by the FPC and Lazarus. These compilers don't have
-# hardening flags yet, so ignoring these lintian warnings for now
-# Paul Gevers <elb...@debian.org>, 22 Jun 2013
-lazarus-ide-qt5${PACKAGESUFFIX}: hardening-no-fortify-functions */lazarus-qt5
-
-# The following typo is intentionally because it is a backwards compatible
-# issue
-lazarus-ide-qt5${PACKAGESUFFIX}: spelling-error-in-binary */lazarus-qt5
commited committed
diff -Nru lazarus-2.2.6+dfsg2/debian/lcl-units.lintian-overrides.in
lazarus-2.2.6+dfsg2/debian/lcl-units.lintian-overrides.in
--- lazarus-2.2.6+dfsg2/debian/lcl-units.lintian-overrides.in 2023-04-29
22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/lcl-units.lintian-overrides.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# False spell error detection
-lcl-units${PACKAGESUFFIX}: spelling-error-in-binary */*.o Childs Children
-lcl-units${PACKAGESUFFIX}: spelling-error-in-binary */*.o CHILDS CHILDREN
diff -Nru lazarus-2.2.6+dfsg2/debian/lcl-utils.lintian-overrides.in
lazarus-2.2.6+dfsg2/debian/lcl-utils.lintian-overrides.in
--- lazarus-2.2.6+dfsg2/debian/lcl-utils.lintian-overrides.in 2023-04-29
22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/lcl-utils.lintian-overrides.in 2023-05-20
14:29:04.000000000 +0200
@@ -1,13 +1,4 @@
-# False spell error detections
-lcl-utils${PACKAGESUFFIX}: spelling-error-in-binary */lazbuild Childs Children
-lcl-utils${PACKAGESUFFIX}: spelling-error-in-binary */tools/lazres Childs
Children
-lcl-utils${PACKAGESUFFIX}: spelling-error-in-binary */tools/lrstolfm Childs
Children
-
# This package is compiled by FPC and Lazarus. These compilers don't have
# hardening flags yet, so ignoring these lintian warnings for now
# Paul Gevers <elb...@debian.org>, 27 Dec 2015
lcl-utils${PACKAGESUFFIX}: hardening-no-fortify-functions
-
-# The following typo is intentionally because it is a backwards compatible
-# issue
-lcl-utils${PACKAGESUFFIX}: spelling-error-in-binary */lazbuild commited
committed
diff -Nru lazarus-2.2.6+dfsg2/debian/patches/default_config.diff
lazarus-2.2.6+dfsg2/debian/patches/default_config.diff
--- lazarus-2.2.6+dfsg2/debian/patches/default_config.diff 2023-04-29
22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/patches/default_config.diff 2023-05-20
14:29:04.000000000 +0200
@@ -4,7 +4,7 @@
--- lazarus-0.9.28.2.orig/tools/install/linux/helpoptions.xml
+++ lazarus-0.9.28.2/tools/install/linux/helpoptions.xml
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<CONFIG>
+ <HelpOptions>
@@ -17,6 +17,9 @@
+ <THTMLBrowserHelpViewer>
+ <Browser Path="/usr/bin/x-www-browser"/>
+ </THTMLBrowserHelpViewer>
++ <TChmHelpViewer>
++ <CHMHelp FilesPath="/usr/share/doc/lazarus/%LazarusVersion%"/>
++ </TChmHelpViewer>
+ </Viewers>
+ <Databases>
+ <StartPage>
diff -Nru
lazarus-2.2.6+dfsg2/debian/patches/Fixed-lcl-docs-installation-path.patch
lazarus-2.2.6+dfsg2/debian/patches/Fixed-lcl-docs-installation-path.patch
--- lazarus-2.2.6+dfsg2/debian/patches/Fixed-lcl-docs-installation-path.patch
1970-01-01 01:00:00.000000000 +0100
+++ lazarus-2.2.6+dfsg2/debian/patches/Fixed-lcl-docs-installation-path.patch
2023-05-20 13:42:22.000000000 +0200
@@ -0,0 +1,17 @@
+Descripotion: Fixed LCL docs installation path.
+ Path where LCL docs were installation was wrong.
+ It contains an extra lcl level which needs to be removed.
+Author: Abou Al Montacir <abou.almonta...@sfr.fr>
+
+diff --git a/docs/html/Makefile b/docs/html/Makefile
+index 05875b79..8f28ae7e 100644
+--- a/docs/html/Makefile
++++ b/docs/html/Makefile
+@@ -36,6 +36,6 @@ clean:
+ htmlinstall chminstall:
+ install -d ${INSTALL_DOCDIR}
+ ${CP} -t ${INSTALL_DOCDIR} \
+- lcl
++ lcl/*
+
+ .PHONY: build clean install htmldocs chmdocs
diff -Nru lazarus-2.2.6+dfsg2/debian/patches/series
lazarus-2.2.6+dfsg2/debian/patches/series
--- lazarus-2.2.6+dfsg2/debian/patches/series 2023-04-29 22:34:09.000000000
+0200
+++ lazarus-2.2.6+dfsg2/debian/patches/series 2023-05-20 11:54:26.000000000
+0200
@@ -9,3 +9,4 @@
Fixed-allowing-arbitrary-FPPKG-path.patch
Added-missing-source-file.patch
Fixed-compilation-of-testsuite-on-armel.patch
+Fixed-lcl-docs-installation-path.patch
diff -Nru lazarus-2.2.6+dfsg2/debian/source/lintian-overrides
lazarus-2.2.6+dfsg2/debian/source/lintian-overrides
--- lazarus-2.2.6+dfsg2/debian/source/lintian-overrides 2023-04-29
22:34:09.000000000 +0200
+++ lazarus-2.2.6+dfsg2/debian/source/lintian-overrides 2023-05-20
14:29:04.000000000 +0200
@@ -9,4 +9,4 @@
# In fpc 3.0.0+dfsg-5 elbrus added fp-fix-timestamps that expects
d/source/timestamps
# lintian bug: http://bugs.debian.org/825222
-lazarus source: unknown-file-in-debian-source timestamps
+unknown-file-in-debian-source
