fix doc folder cleanup fallout (#2370)

diff --git a/dist/debian/kvirc-data.install b/dist/debian/kvirc-data.install
index c4da0ff98663d5b2e9b9c776314e1275f05d308b..4e681881f3feb5bedaf0620db63a481f9cb619d7 100644 (file)
--- a/dist/debian/kvirc-data.install
+++ b/dist/debian/kvirc-data.install
@@ -1,7 +1,6 @@
 usr/share/icons/hicolor/
 usr/share/kvirc/*/config/
 usr/share/kvirc/*/defscript/
-usr/share/kvirc/*/doc/
 usr/share/kvirc/*/help/
 usr/share/kvirc/*/locale/
 usr/share/kvirc/*/modules/caps/

diff --git a/dist/debian/kvirc-data.links b/dist/debian/kvirc-data.links
index c6f213ae27c96feaa6d5c5e5eff267f394bdc320..195bbc8b8c522a8ffd9d5e2e0fb127d2d58753fb 100644 (file)
--- a/dist/debian/kvirc-data.links
+++ b/dist/debian/kvirc-data.links
@@ -1,2 +1,2 @@
 usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_make_scriptdist.sh.1.gz
-usr/share/doc/kvirc-data/copyright usr/share/kvirc/4.9/license/COPYING
+usr/share/doc/kvirc-data/copyright usr/share/kvirc/4.9/license/ABOUT-LICENSE

diff --git a/dist/debian/kvirc.docs b/dist/debian/kvirc.docs
deleted file mode 100644 (file)
index afe6da2..0000000
--- a/dist/debian/kvirc.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/README

diff --git a/dist/debian/rules b/dist/debian/rules
index facba1d3c75ea7169f1afdc711e4172e2fa6bff8..f2c1972994c2cfa3150b7f892c811c02092b32a3 100755 (executable)
--- a/dist/debian/rules
+++ b/dist/debian/rules
@@ -27,8 +27,8 @@ endif
 NOT_INSTALLED := \
                                usr/lib/$(DEB_HOST_MULTIARCH)/libkvilib.so \
                                usr/bin/kvirc-config \
+                               usr/share/kvirc/4.9/license/ABOUT-LICENSE \
                                usr/share/kvirc/4.9/license/LICENSE-OPENSSL \
-                               usr/share/kvirc/4.9/license/COPYING \
                                usr/share/pixmaps/kvirc.png
 
 override_dh_auto_configure:

diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index 8ae48632f252eb4152479332bdb792bc3b92be39..00bd5297a825eb5d90e7818d141bf5d043a348b7 100644 (file)
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -192,7 +192,7 @@ SetupWizard::SetupWizard()
        ed->setWordWrapMode(QTextOption::NoWrap);
        QString szLicense;
        QString szLicensePath;
-       g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "COPYING");
+       g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "ABOUT-LICENSE");
        if(!KviFileUtils::loadFile(szLicensePath, szLicense))
        {
                szLicense = __tr("Oops! Can't find the license file.\n"