Package: kvirc
Version: 2:3.2.4-4
Severity: normal
Tags: patch
Hi,
Attached is the diff for my kvirc 2:3.2.4-4.1 NMU, currently in
DELAYED/3-day.
--
Homepage: http://www.sesse.net/
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/acinclude.m4
/tmp/3Jg8UmzVXO/kvirc-3.2.4/acinclude.m4
--- /tmp/S12NbQWHq2/kvirc-3.2.4/acinclude.m4 2006-07-28 14:51:40.000000000
+0200
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/acinclude.m4 2006-11-02 02:35:01.000000000
+0100
@@ -2173,10 +2173,10 @@
helpdir="\${globalkvircdir}/help/en"
AC_SUBST(helpdir)
- pluglibdir="\${globalkvircdir}/modules"
+ pluglibdir="\${exec_prefix}/lib/kvirc/$SS_DIRTAG/modules"
AC_SUBST(pluglibdir)
- modulelibdir="\${globalkvircdir}/modules"
+ modulelibdir="\${exec_prefix}/lib/kvirc/$SS_DIRTAG/modules"
AC_SUBST(modulelibdir)
defscriptdir="\${globalkvircdir}/defscript"
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/configure
/tmp/3Jg8UmzVXO/kvirc-3.2.4/configure
--- /tmp/S12NbQWHq2/kvirc-3.2.4/configure 2006-11-02 02:34:48.000000000
+0100
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/configure 2006-11-02 02:35:01.000000000
+0100
@@ -33295,10 +33295,10 @@
helpdir="\${globalkvircdir}/help/en"
- pluglibdir="\${globalkvircdir}/modules"
+ pluglibdir="\${exec_prefix}/lib/kvirc/$SS_DIRTAG/modules"
- modulelibdir="\${globalkvircdir}/modules"
+ modulelibdir="\${exec_prefix}/lib/kvirc/$SS_DIRTAG/modules"
defscriptdir="\${globalkvircdir}/defscript"
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/debian/changelog
/tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/changelog
--- /tmp/S12NbQWHq2/kvirc-3.2.4/debian/changelog 2006-11-02
02:34:48.000000000 +0100
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/changelog 2006-11-02
02:35:01.000000000 +0100
@@ -1,3 +1,17 @@
+kvirc (2:3.2.4-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Move plugins and modules from /usr/share into /usr/lib. (Closes: #392393)
+ * Update paths in acinclude.m4, and rerun autoconf.
+ * Update debian/*.{dirs,install}.
+ * When checking if a directory is the kvirc global directory, don't check
+ for the modules, as they have moved; check for the help directory
+ instead (which the comments also suggest).
+ * Make a local hack in src/kvirc/kernel/kvi_app_fs.cpp to look for modules
+ and plugins in /usr/lib instead of /usr/share.
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Thu, 2 Nov 2006 01:45:18 +0100
+
kvirc (2:3.2.4-4) unstable; urgency=low
* Fix non-POSIX shell code in debian/rules (Closes: #384915).
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc-data.install
/tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc-data.install
--- /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc-data.install 2006-11-02
02:34:48.000000000 +0100
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc-data.install 2006-11-02
02:35:01.000000000 +0100
@@ -7,7 +7,7 @@
debian/tmp/usr/share/kvirc/*/help/
debian/tmp/usr/share/kvirc/*/license/
debian/tmp/usr/share/kvirc/*/locale/
-debian/tmp/usr/share/kvirc/*/modules/caps/
+debian/tmp/usr/lib/kvirc/*/modules/caps/
debian/tmp/usr/share/kvirc/*/msgcolors/
debian/tmp/usr/share/kvirc/*/pics/
debian/tmp/usr/share/kvirc/*/services/
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc-dev.install
/tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc-dev.install
--- /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc-dev.install 2006-11-02
02:34:48.000000000 +0100
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc-dev.install 2006-11-02
02:35:01.000000000 +0100
@@ -2,4 +2,4 @@
debian/tmp/usr/include/kvirc/
debian/tmp/usr/lib/*.la
debian/tmp/usr/lib/*.so
-debian/tmp/usr/share/kvirc/*/modules/*.la
+debian/tmp/usr/lib/kvirc/*/modules/*.la
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc.install
/tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc.install
--- /tmp/S12NbQWHq2/kvirc-3.2.4/debian/kvirc.install 2006-11-02
02:34:48.000000000 +0100
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/debian/kvirc.install 2006-11-02
02:35:01.000000000 +0100
@@ -1,4 +1,4 @@
debian/overrides/kvirc usr/share/lintian/overrides
debian/tmp/usr/bin/kvirc
debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/share/kvirc/*/modules/*.so
+debian/tmp/usr/lib/kvirc/*/modules/*.so
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/src/kvirc/kernel/kvi_app_fs.cpp
/tmp/3Jg8UmzVXO/kvirc-3.2.4/src/kvirc/kernel/kvi_app_fs.cpp
--- /tmp/S12NbQWHq2/kvirc-3.2.4/src/kvirc/kernel/kvi_app_fs.cpp 2006-07-28
14:51:38.000000000 +0200
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/src/kvirc/kernel/kvi_app_fs.cpp 2006-11-02
02:35:01.000000000 +0100
@@ -50,8 +50,11 @@
{
case None :
break;
case Pics : szData.append("pics");
break;
+
+ // local hack for Debian
case Modules :
- case Plugins : szData.append("modules");
break;
+ case Plugins : szData = "/usr/lib/kvirc/"
KVI_VERSION_BRANCH "/modules"; break;
+
case ConfigPlugins :
KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR);
break;
case ConfigScripts :
KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR);
break;
case Help :
diff -Nru /tmp/S12NbQWHq2/kvirc-3.2.4/src/kvirc/kernel/kvi_app_setup.cpp
/tmp/3Jg8UmzVXO/kvirc-3.2.4/src/kvirc/kernel/kvi_app_setup.cpp
--- /tmp/S12NbQWHq2/kvirc-3.2.4/src/kvirc/kernel/kvi_app_setup.cpp
2006-07-28 14:51:38.000000000 +0200
+++ /tmp/3Jg8UmzVXO/kvirc-3.2.4/src/kvirc/kernel/kvi_app_setup.cpp
2006-11-02 02:35:01.000000000 +0100
@@ -79,7 +79,7 @@
{
//First check if the help subdir exists
QString szDir2 = dir;
- szDir2+=KVI_PATH_SEPARATOR"modules";
+ szDir2+=KVI_PATH_SEPARATOR"help";
if(!KviFileUtils::directoryExists(szDir2))return false;
//Then check if the pics subdir exists
QString szDir = dir;
