- Update to 2.4.0

- Remove LAZARUS_NO_FLAVORS. Now cqrlog can be compiled with lazarus-qt5 interface
- Add CONFLICTS

PR:		243006
Approved by:	db

1 files changed, 40 insertions, 7 deletions

diff --git a/comms/cqrlog/pkg-plist b/comms/cqrlog/pkg-plist
index 23287671c5bb..2311bef6eb48 100644
--- a/comms/cqrlog/pkg-plist
+++ b/comms/cqrlog/pkg-plist
@@ -7,6 +7,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/ctyfiles/Ambiguous.tbl
 %%DATADIR%%/ctyfiles/AreaOK1RR.tbl
 %%DATADIR%%/ctyfiles/CallResolution.tbl
+%%DATADIR%%/ctyfiles/ContestName.tab
 %%DATADIR%%/ctyfiles/Country.tab
 %%DATADIR%%/ctyfiles/CountryDel.tab
 %%DATADIR%%/ctyfiles/Exceptions.tab
@@ -21,9 +22,14 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/ctyfiles/us_states.tab
 %%DATADIR%%/help/contest.html
 %%DATADIR%%/help/cwd.html
+%%DATADIR%%/help/cwd.html.bak
+%%DATADIR%%/help/cwd.html.orig
 %%DATADIR%%/help/cwh.html
 %%DATADIR%%/help/fldxml.html
+%%DATADIR%%/help/gridmap.html
 %%DATADIR%%/help/h1.html
+%%DATADIR%%/help/h1.html.bak
+%%DATADIR%%/help/h1.html.orig
 %%DATADIR%%/help/h20.html
 %%DATADIR%%/help/h21.html
 %%DATADIR%%/help/h22.html
@@ -34,8 +40,8 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/h27.html
 %%DATADIR%%/help/h28.html
 %%DATADIR%%/help/h29.html
-%%DATADIR%%/help/h30.html
 %%DATADIR%%/help/h3.html
+%%DATADIR%%/help/h30.html
 %%DATADIR%%/help/h4.html
 %%DATADIR%%/help/h5.html
 %%DATADIR%%/help/h6.html
@@ -50,10 +56,14 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/fxml5.png
 %%DATADIR%%/help/img/fxml8.png
 %%DATADIR%%/help/img/fxml9.png
+%%DATADIR%%/help/img/gm1.png
+%%DATADIR%%/help/img/gm2.png
+%%DATADIR%%/help/img/gm3.png
 %%DATADIR%%/help/img/h1.png
 %%DATADIR%%/help/img/h10.png
 %%DATADIR%%/help/img/h100.png
 %%DATADIR%%/help/img/h101.png
+%%DATADIR%%/help/img/h101b.png
 %%DATADIR%%/help/img/h102.png
 %%DATADIR%%/help/img/h103.png
 %%DATADIR%%/help/img/h104.png
@@ -64,9 +74,6 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h109.png
 %%DATADIR%%/help/img/h11.png
 %%DATADIR%%/help/img/h110.png
-%%DATADIR%%/help/img/h117.png
-%%DATADIR%%/help/img/h118.png
-%%DATADIR%%/help/img/h165.png
 %%DATADIR%%/help/img/h111.png
 %%DATADIR%%/help/img/h1112.png
 %%DATADIR%%/help/img/h1114.png
@@ -76,11 +83,18 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h114.png
 %%DATADIR%%/help/img/h115.png
 %%DATADIR%%/help/img/h116.png
+%%DATADIR%%/help/img/h117.png
+%%DATADIR%%/help/img/h118.png
+%%DATADIR%%/help/img/h119.png
 %%DATADIR%%/help/img/h12.png
+%%DATADIR%%/help/img/h120.png
+%%DATADIR%%/help/img/h121.png
+%%DATADIR%%/help/img/h122.png
 %%DATADIR%%/help/img/h13.png
 %%DATADIR%%/help/img/h14.png
 %%DATADIR%%/help/img/h15.png
 %%DATADIR%%/help/img/h16.png
+%%DATADIR%%/help/img/h165.png
 %%DATADIR%%/help/img/h17.png
 %%DATADIR%%/help/img/h18.png
 %%DATADIR%%/help/img/h19.png
@@ -113,6 +127,10 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h43.png
 %%DATADIR%%/help/img/h44.png
 %%DATADIR%%/help/img/h45.png
+%%DATADIR%%/help/img/h45b.png
+%%DATADIR%%/help/img/h45c.png
+%%DATADIR%%/help/img/h45d.png
+%%DATADIR%%/help/img/h45e.png
 %%DATADIR%%/help/img/h46.png
 %%DATADIR%%/help/img/h47.png
 %%DATADIR%%/help/img/h48.png
@@ -141,6 +159,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h69.png
 %%DATADIR%%/help/img/h7.png
 %%DATADIR%%/help/img/h70.png
+%%DATADIR%%/help/img/h70b.png
 %%DATADIR%%/help/img/h71.png
 %%DATADIR%%/help/img/h72.png
 %%DATADIR%%/help/img/h73.png
@@ -172,6 +191,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/h97.png
 %%DATADIR%%/help/img/h98.png
 %%DATADIR%%/help/img/h99.png
+%%DATADIR%%/help/img/h9b.png
 %%DATADIR%%/help/img/line.png
 %%DATADIR%%/help/img/misc12.png
 %%DATADIR%%/help/img/misc13.png
@@ -184,8 +204,11 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/misc44.png
 %%DATADIR%%/help/img/misc5.png
 %%DATADIR%%/help/img/misc8.png
+%%DATADIR%%/help/img/n1mm1.png
+%%DATADIR%%/help/img/n1mm2.png
+%%DATADIR%%/help/img/n1mm3.png
 %%DATADIR%%/help/img/note.png
-%%DATADIR%%/help/img/radio_memory.png
+%%DATADIR%%/help/img/setting_rigctld_for_all_programs.pdf
 %%DATADIR%%/help/img/wkdgrid10.png
 %%DATADIR%%/help/img/wkdgrid11.png
 %%DATADIR%%/help/img/wkdgrid9.png
@@ -212,6 +235,9 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/img/wsjt36.png
 %%DATADIR%%/help/img/wsjt4.png
 %%DATADIR%%/help/index.html
+%%DATADIR%%/help/index_left.html
+%%DATADIR%%/help/index_right.html
+%%DATADIR%%/help/n1mm.html
 %%DATADIR%%/help/remi.html
 %%DATADIR%%/help/sql_console.html
 %%DATADIR%%/help/wkdgrid.html
@@ -219,6 +245,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/help/wsjt.html
 %%DATADIR%%/images/BigEarth.bmp
 %%DATADIR%%/images/HamQTH.png
+%%DATADIR%%/images/attach.png
 %%DATADIR%%/images/bck.png
 %%DATADIR%%/images/connect.png
 %%DATADIR%%/images/cqrlog.png
@@ -267,8 +294,8 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/599dxa.txt
 %%DATADIR%%/members/9acwg.txt
 %%DATADIR%%/members/a1-club.txt
-%%DATADIR%%/members/a1a-ea.txt
 %%DATADIR%%/members/a1-op.txt
+%%DATADIR%%/members/a1a-ea.txt
 %%DATADIR%%/members/afm.txt
 %%DATADIR%%/members/agb.txt
 %%DATADIR%%/members/agcw.txt
@@ -280,6 +307,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/bmars.txt
 %%DATADIR%%/members/bscc.txt
 %%DATADIR%%/members/btc.txt
+%%DATADIR%%/members/bug.txt
 %%DATADIR%%/members/cav.txt
 %%DATADIR%%/members/cct.txt
 %%DATADIR%%/members/cdxc.txt
@@ -295,6 +323,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/dig.txt
 %%DATADIR%%/members/dmc.txt
 %%DATADIR%%/members/dtc.txt
+%%DATADIR%%/members/ecwarc.txt
 %%DATADIR%%/members/ehsc.txt
 %%DATADIR%%/members/epc.txt
 %%DATADIR%%/members/ffr.txt
@@ -303,6 +332,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/fists.txt
 %%DATADIR%%/members/fmc.txt
 %%DATADIR%%/members/fnars.txt
+%%DATADIR%%/members/fo.txt
 %%DATADIR%%/members/foc.txt
 %%DATADIR%%/members/foc_names.txt
 %%DATADIR%%/members/fog.txt
@@ -318,9 +348,9 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/hhc.txt
 %%DATADIR%%/members/hsc.txt
 %%DATADIR%%/members/htc.txt
-%%DATADIR%%/members/kdr.txt
 %%DATADIR%%/members/inorc.txt
 %%DATADIR%%/members/jaig.txt
+%%DATADIR%%/members/kdr.txt
 %%DATADIR%%/members/lcc.txt
 %%DATADIR%%/members/lids.txt
 %%DATADIR%%/members/marac.txt
@@ -333,11 +363,13 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/mfca.txt
 %%DATADIR%%/members/naqcc.txt
 %%DATADIR%%/members/nra.txt
+%%DATADIR%%/members/nrr.txt
 %%DATADIR%%/members/okdxc.txt
 %%DATADIR%%/members/okdxf.txt
 %%DATADIR%%/members/okqrp.txt
 %%DATADIR%%/members/omiss.txt
 %%DATADIR%%/members/ootc.txt
+%%DATADIR%%/members/opnames.txt
 %%DATADIR%%/members/otc-sara.txt
 %%DATADIR%%/members/prc.txt
 %%DATADIR%%/members/prl.txt
@@ -366,6 +398,7 @@ share/applications/cqrlog.desktop
 %%DATADIR%%/members/tenten.txt
 %%DATADIR%%/members/tfc.txt
 %%DATADIR%%/members/trc.txt
+%%DATADIR%%/members/trn.txt
 %%DATADIR%%/members/udxc.txt
 %%DATADIR%%/members/uft.txt
 %%DATADIR%%/members/uksmg.txt