rev 10015 - in people/raul/kvirc/debian: . overrides patches
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Sun Apr 6 17:02:59 UTC 2008
Author: kebianizao-guest
Date: 2008-04-06 17:02:59 +0000 (Sun, 06 Apr 2008)
New Revision: 10015
Added:
people/raul/kvirc/debian/kvirc-dev.postinst
people/raul/kvirc/debian/kvirc-dev.prerm
people/raul/kvirc/debian/kvirc.prerm
people/raul/kvirc/debian/overrides/
people/raul/kvirc/debian/overrides/kvirc
people/raul/kvirc/debian/patches/05_Kvi_Avatar_Resize.patch.noauto_apply
people/raul/kvirc/debian/patches/06_resizeavatar.patch.noauto_apply
Modified:
people/raul/kvirc/debian/changelog
people/raul/kvirc/debian/control
people/raul/kvirc/debian/kvirc-data.install
people/raul/kvirc/debian/kvirc-data.links
people/raul/kvirc/debian/kvirc-data.postinst
people/raul/kvirc/debian/kvirc-data.prerm
people/raul/kvirc/debian/kvirc-dev.install
people/raul/kvirc/debian/kvirc.install
people/raul/kvirc/debian/kvirc.menu
people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply
people/raul/kvirc/debian/patches/03_eula.patch
people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply
people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply
people/raul/kvirc/debian/patches/09_plugin_dir.patch
people/raul/kvirc/debian/rules
Log:
Replaying initial commit.
Modified: people/raul/kvirc/debian/changelog
===================================================================
--- people/raul/kvirc/debian/changelog 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/changelog 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,21 +1,3 @@
-kvirc (2:3.4.0-1) UNRELEASED; urgency=low
-
- * New upstream release.
- * Removed patches 05_Kvi_Avatar_Resize and 06_resizeavatar.patch. Applied
- upstream.
- * Changed 3.2 references in rules,kvirc-data installation scripts to 3.4.
- * Removing empty maintainer scripts: kvirc-dev and kvirc.prerm.
- * Tighting depends for kvirc and kvirc-data.
- * Moving kvirc manpage to kvirc package.
- * Updated menu file to menu policy 1.4.
- * Removing link to manpage for kvi_make_scriptdist.sh no longer existing.
- * Fixing installation paths for some files in kvirc and kvirc-data, taking
- those paths from a patch.
- * Adding some more new .desktop files.
- * Removing lintian overrides since they are ruled out now.
-
- -- Raúl Sánchez Siles <rasasi78 at gmail.com> Wed, 02 Apr 2008 00:13:00 +0200
-
kvirc (2:3.2.4-5.1) unstable; urgency=low
* Non-maintainer upload.
Modified: people/raul/kvirc/debian/control
===================================================================
--- people/raul/kvirc/debian/control 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/control 2008-04-06 17:02:59 UTC (rev 10015)
@@ -7,7 +7,7 @@
Package: kvirc
Architecture: any
-Depends: kvirc-data (= ${source:Version}), ${shlibs:Depends}
+Depends: kvirc-data (>= 2:3.0.0), ${shlibs:Depends}
Description: KDE based next generation IRC client with module support
A highly configurable graphical IRC client with an MDI interface,
built-in scripting language, support for IRC DCC, drag & drop file
@@ -23,7 +23,7 @@
Package: kvirc-data
Section: net
Architecture: all
-Depends: kvirc (= ${source:Version})
+Depends: kvirc (>= 2:3.0.0)
Conflicts: kvirc-doc, kvirc (<< 2:3.0.0)
Replaces: kvirc-doc
Description: Data files for KVIrc
@@ -40,7 +40,7 @@
Package: kvirc-dev
Section: devel
Architecture: any
-Depends: kvirc (>= ${source:Version})
+Depends: kvirc (>= 2:3.0.0)
Description: Development files for KVIrc
This package contains KVIrc libraries and include files you need if you
want to develop plugins for KVIrc.
Modified: people/raul/kvirc/debian/kvirc-data.install
===================================================================
--- people/raul/kvirc/debian/kvirc-data.install 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc-data.install 2008-04-06 17:02:59 UTC (rev 10015)
@@ -7,9 +7,10 @@
debian/tmp/usr/share/kvirc/*/help/
debian/tmp/usr/share/kvirc/*/license/
debian/tmp/usr/share/kvirc/*/locale/
-debian/tmp/usr/lib/kvirc/*/modules/caps/
+debian/tmp/usr/share/kvirc/*/modules/caps/
debian/tmp/usr/share/kvirc/*/msgcolors/
debian/tmp/usr/share/kvirc/*/pics/
debian/tmp/usr/share/kvirc/*/services/
debian/tmp/usr/share/kvirc/*/themes/
-debian/tmp/usr/share/mimelnk/text/*.desktop
+debian/tmp/usr/share/man/man1/kvirc.1
+debian/tmp/usr/share/mimelnk/text/x-kvs.desktop
Modified: people/raul/kvirc/debian/kvirc-data.links
===================================================================
--- people/raul/kvirc/debian/kvirc-data.links 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc-data.links 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,2 +1,3 @@
+usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_make_scriptdist.sh.1.gz
usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_run_netscape.1.gz
usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_search_help.1.gz
Modified: people/raul/kvirc/debian/kvirc-data.postinst
===================================================================
--- people/raul/kvirc/debian/kvirc-data.postinst 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc-data.postinst 2008-04-06 17:02:59 UTC (rev 10015)
@@ -6,10 +6,10 @@
configure)
update-alternatives --quiet --install \
/usr/share/services/irc.protocol irc.protocol \
- /usr/share/kvirc/3.4.0/services/irc.protocol 60
+ /usr/share/kvirc/3.2.0/services/irc.protocol 60
update-alternatives --quiet --install \
/usr/share/services/irc6.protocol irc6.protocol \
- /usr/share/kvirc/3.4.0/services/irc6.protocol 60
+ /usr/share/kvirc/3.2.0/services/irc6.protocol 60
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: people/raul/kvirc/debian/kvirc-data.prerm
===================================================================
--- people/raul/kvirc/debian/kvirc-data.prerm 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc-data.prerm 2008-04-06 17:02:59 UTC (rev 10015)
@@ -5,9 +5,9 @@
case "$1" in
remove)
update-alternatives --quiet --remove irc.protocol \
- /usr/share/kvirc/3.4.0/services/irc.protocol
+ /usr/share/kvirc/3.2.0/services/irc.protocol
update-alternatives --quiet --remove irc6.protocol \
- /usr/share/kvirc/3.4.0/services/irc6.protocol
+ /usr/share/kvirc/3.2.0/services/irc6.protocol
;;
upgrade|deconfigure)
Modified: people/raul/kvirc/debian/kvirc-dev.install
===================================================================
--- people/raul/kvirc/debian/kvirc-dev.install 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc-dev.install 2008-04-06 17:02:59 UTC (rev 10015)
@@ -2,4 +2,4 @@
debian/tmp/usr/include/kvirc/
debian/tmp/usr/lib/*.la
debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/kvirc/*/modules/*.la
+debian/tmp/usr/share/kvirc/*/modules/*.la
Added: people/raul/kvirc/debian/kvirc-dev.postinst
===================================================================
--- people/raul/kvirc/debian/kvirc-dev.postinst (rev 0)
+++ people/raul/kvirc/debian/kvirc-dev.postinst 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
Added: people/raul/kvirc/debian/kvirc-dev.prerm
===================================================================
--- people/raul/kvirc/debian/kvirc-dev.prerm (rev 0)
+++ people/raul/kvirc/debian/kvirc-dev.prerm 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
Modified: people/raul/kvirc/debian/kvirc.install
===================================================================
--- people/raul/kvirc/debian/kvirc.install 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc.install 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,4 +1,4 @@
+debian/overrides/kvirc usr/share/lintian/overrides
debian/tmp/usr/bin/kvirc
debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/lib/kvirc/*/modules/*.so
-debian/tmp/usr/share/man/man1/kvirc.1
+debian/tmp/usr/share/kvirc/*/modules/*.so
Modified: people/raul/kvirc/debian/kvirc.menu
===================================================================
--- people/raul/kvirc/debian/kvirc.menu 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/kvirc.menu 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,6 +1,6 @@
?package(kvirc):\
needs="x11"\
- section="Applications/Network/Communication"\
+ section="Apps/Net"\
title="KVIrc"\
command="/usr/bin/kvirc"\
hints="irc,scripting"\
Added: people/raul/kvirc/debian/kvirc.prerm
===================================================================
--- people/raul/kvirc/debian/kvirc.prerm (rev 0)
+++ people/raul/kvirc/debian/kvirc.prerm 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
Added: people/raul/kvirc/debian/overrides/kvirc
===================================================================
--- people/raul/kvirc/debian/overrides/kvirc (rev 0)
+++ people/raul/kvirc/debian/overrides/kvirc 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,2 @@
+kvirc: binary-without-manpage kvirc
+kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm
Modified: people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/patches/01_rpath.patch.noauto_apply 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,49 +1,44 @@
---- admin/acinclude.m4.in 2008-03-22 03:05:25.000000000 +0100
-+++ admin/acinclude.m4.in.2 2008-03-30 18:39:06.000000000 +0200
-@@ -1105,7 +1105,7 @@
+--- admin/acinclude.m4.in.orig 2005-02-23 17:10:48.111742600 -0500
++++ admin/acinclude.m4.in 2005-02-23 17:11:56.567335768 -0500
+@@ -1015,7 +1015,7 @@
ss_save_LIBS="$LIBS"
- CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
+ CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
CXXFLAGS="-O2 -Wall $CXXFLAGS"
-- LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
-+ LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME"
+- LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
++ LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
-@@ -2252,7 +2252,7 @@
+@@ -1864,7 +1864,7 @@
if test -n "$SS_X_LIBLINK"; then
LIBS="$LIBS $SS_X_LIBLINK"
fi
-- LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
-+ LIBS="-L$SS_KDE_LIBDIR -L$SS_QT3_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS"
+- LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR"
++ LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS"
if test "$SS_LINK_TO_LIBDL" = "yes"; then
LIBS="$LIBS -ldl";
fi
-@@ -2412,16 +2412,6 @@
+@@ -2016,10 +2016,7 @@
+ SS_LDFLAGS=""
fi
- if test "$SS_USE_QT4" = "no"; then
-- SS_RPATH="-rpath $SS_QT3_LIBDIR -rpath $libdir"
-- else
-- SS_RPATH="-rpath $SS_QT4_LIBDIR -rpath $libdir"
-- fi
--
+- SS_RPATH="-rpath $SS_QT_LIBDIR -rpath $libdir"
- if test -n "$SS_X_LIBDIR"; then
- SS_RPATH="$SS_RPATH -rpath $SS_X_LIBDIR"
- fi
--
-- if test "$SS_USE_QT4" = "no"; then
- SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT3_LIBDIR"
- else
- SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT4_LIBDIR"
-@@ -2470,7 +2460,6 @@
++ SS_RPATH=
+ SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT_LIBDIR"
+ if test -n "$SS_X_LIBDIR"; then
+@@ -2053,7 +2050,6 @@
+
if test "$SS_KDE_REQUESTED" = "yes"; then
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
- SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK"
- AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support])
-@@ -2484,7 +2473,6 @@
+ AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 2.x support])
+@@ -2067,7 +2063,6 @@
if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
$SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
Modified: people/raul/kvirc/debian/patches/03_eula.patch
===================================================================
--- people/raul/kvirc/debian/patches/03_eula.patch 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/patches/03_eula.patch 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,7 +1,6 @@
-unchanged:
---- src/modules/about/aboutdialog.cpp 2008-03-30 18:49:51.000000000 +0200
-+++ src/modules/about/aboutdialog.cpp.2 2008-03-30 18:49:46.000000000 +0200
-@@ -130,7 +130,7 @@
+--- ./src/modules/about/aboutdialog.cpp.orig 2006-07-25 13:02:18.000000000 +0000
++++ ./src/modules/about/aboutdialog.cpp 2006-07-25 13:03:01.000000000 +0000
+@@ -129,7 +129,7 @@
QString szLicense;
QString szLicensePath;
@@ -10,16 +9,14 @@
if(!KviFileUtils::loadFile(szLicensePath,szLicense))
{
-only in patch2:
-unchanged:
---- src/modules/setup/setupwizard.cpp 2008-03-30 18:49:51.000000000 +0200
-+++ src/modules/setup/setupwizard.cpp.2 2008-03-30 18:47:49.000000000 +0200
-@@ -197,7 +197,7 @@
- ed->setWordWrap(KviTalTextEdit::NoWrap);
- QString szLicense;
- QString szLicensePath;
+--- ./src/modules/setup/setupwizard.cpp.orig 2006-07-25 13:02:29.000000000 +0000
++++ ./src/modules/setup/setupwizard.cpp 2006-07-25 13:03:07.000000000 +0000
+@@ -161,7 +161,7 @@
+ ed->setWordWrap(QTextEdit::NoWrap);
+ KviStr szLicense;
+ KviStr szLicensePath;
- g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING");
+ g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA");
- if(!KviFileUtils::loadFile(szLicensePath,szLicense))
+ QString buf;
+ if(!KviFileUtils::loadFile(szLicensePath.ptr(),buf))
{
- szLicense = __tr("Oops... can't find the license file.\n" \
Modified: people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/patches/04_buildlog.patch.noauto_apply 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,36 +1,36 @@
---- admin/acinclude.m4.in 2008-03-30 18:55:41.000000000 +0200
-+++ admin/acinclude.m4.in.2 2008-03-30 18:57:56.000000000 +0200
-@@ -121,33 +121,26 @@
+--- admin/acinclude.m4.in.orig 2005-02-24 22:58:30.455077480 -0500
++++ admin/acinclude.m4.in 2005-02-24 22:59:09.864086400 -0500
+@@ -74,33 +74,26 @@
AC_DEFUN([AC_SS_HEADER],
[
-- AC_CROSS_COLOR([1],[2])
+- echo -en "\\033\\1331;32m"
echo "################################################################################"
echo "### $1"
echo "################################################################################"
-- AC_CROSS_COLOR([0],[9])
+- echo -en "\\033\\1330;39m"
])
AC_DEFUN([AC_SS_SECTION],
[
-- AC_CROSS_COLOR([1],[3])
+- echo -en "\\033\\1331;33m"
echo "### $1"
-- AC_CROSS_COLOR([0],[9])
+- echo -en "\\033\\1330;39m"
])
AC_DEFUN([AC_SS_SET_REDINK],
[
-- AC_CROSS_COLOR([1],[1])
+- echo -en "\\033\\1331;31m"
])
AC_DEFUN([AC_SS_SET_GREENINK],
[
-- AC_CROSS_COLOR([1],[2])
+- echo -en "\\033\\1331;32m"
])
AC_DEFUN([AC_SS_SET_NORMALINK],
[
-- AC_CROSS_COLOR([0],[9])
+- echo -en "\\033\\1330;39m"
])
dnl # // ##################################################################################################################
Added: people/raul/kvirc/debian/patches/05_Kvi_Avatar_Resize.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/05_Kvi_Avatar_Resize.patch.noauto_apply (rev 0)
+++ people/raul/kvirc/debian/patches/05_Kvi_Avatar_Resize.patch.noauto_apply 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,26 @@
+--- kvirc-3.2.0.new/src/kvilib/irc/kvi_avatar.cpp.old 2005-04-19 00:28:17.000000000 +0200
++++ kvirc-3.2.0.new/src/kvilib/irc/kvi_avatar.cpp 2005-04-19 00:47:21.000000000 +0200
+@@ -138,10 +138,20 @@
+ m_uLastScaleHeight = h;
+
+ int scaleW = w;
+- int scaleH = h;
++ int scaleH;
+
+- if(curW > curH)scaleH = (curH * scaleW) / curW;
+- else scaleW = (scaleH * curW) / curH;
++ /* We want to maintain the aspect of the image instead simply set
++ height and width. The first step is trying to adapt the image size
++ by "w" vaule */
++
++ scaleH = (curH * scaleW) / curW;
++
++ /* Now check the resized image size. If it is too wide or too tall,
++ resize it again by "h" value */
++ if(scaleH > h) {
++ scaleH = h;
++ scaleW = (scaleH * curW) / curH;
++ }
+
+ QImage img = m_pPixmap->convertToImage();
+
Added: people/raul/kvirc/debian/patches/06_resizeavatar.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/06_resizeavatar.patch.noauto_apply (rev 0)
+++ people/raul/kvirc/debian/patches/06_resizeavatar.patch.noauto_apply 2008-04-06 17:02:59 UTC (rev 10015)
@@ -0,0 +1,21 @@
+--- kvirc-3.2.0.new/src/kvirc/ui/kvi_userlistview.cpp.old 2005-04-18 05:45:51.000000000 +0200
++++ kvirc-3.2.0.new/src/kvirc/ui/kvi_userlistview.cpp 2005-04-18 05:46:54.000000000 +0200
+@@ -114,7 +114,17 @@
+ if(m_iHeight < 22)m_iHeight = 22;
+ if(av)
+ {
+- m_iHeight += KVI_OPTION_BOOL(KviOption_boolScaleAvatars) ? (int)KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight) : av->pixmap()->height();
++ if(KVI_OPTION_BOOL(KviOption_boolScaleAvatars))
++ {
++ QPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight));
++
++ m_iHeight += pix->height();
++ }
++ else
++ {
++ m_iHeight += av->pixmap()->height();
++ }
++
+ m_iHeight += 3;
+ }
+ }
Modified: people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply
===================================================================
--- people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/patches/08_gcc4fix.patch.noauto_apply 2008-04-06 17:02:59 UTC (rev 10015)
@@ -1,3 +1,24 @@
+--- ./src/kvirc/module/kvi_moduleextension.h.orig 2005-02-27 19:20:29.000000000 +0100
++++ ./src/kvirc/module/kvi_moduleextension.h 2005-08-27 17:45:18.000000000 +0200
+@@ -95,6 +95,8 @@
+
+ typedef KviPtrList<KviModuleExtensionDescriptor> KviModuleExtensionDescriptorList;
+
++class KviModuleExtensionManager;
++
+ extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager;
+
+ class KVIRC_API KviModuleExtensionManager
+--- ./src/kvirc/kernel/kvi_irccontext.h.orig 2005-08-27 16:49:51.000000000 +0000
++++ ./src/kvirc/kernel/kvi_irccontext.h 2005-08-27 16:51:03.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <qobject.h>
+
+ class KviChannel;
++class KviConsole;
+ class KviQuery;
+ class KviQuery;
+ class KviFrame;
--- src/kvirc/ui/kvi_console.h 2005-08-27 16:26:44.000000000 +0200
+++ src/kvirc/ui/kvi_console.h.new 2005-08-27 21:12:51.000000000 +0200
@@ -46,6 +46,8 @@
Modified: people/raul/kvirc/debian/patches/09_plugin_dir.patch
===================================================================
--- people/raul/kvirc/debian/patches/09_plugin_dir.patch 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/patches/09_plugin_dir.patch 2008-04-06 17:02:59 UTC (rev 10015)
@@ -30,10 +30,40 @@
defscriptdir="\${globalkvircdir}/defscript"
-diff -Nru src/kvirc/kernel/kvi_app_fs.cpp src/kvirc/kernel/kvi_app_fs.cpp.2
---- src/kvirc/kernel/kvi_app_fs.cpp 2008-03-30 22:02:35.000000000 +0200
-+++ src/kvirc/kernel/kvi_app_fs.cpp.2 2008-03-30 22:05:15.000000000 +0200
-@@ -52,8 +52,11 @@
+diff -Nru debian/kvirc-data.install debian/kvirc-data.install
+--- debian/kvirc-data.install 2006-11-02 02:34:48.000000000 +0100
++++ 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 debian/kvirc-dev.install debian/kvirc-dev.install
+--- debian/kvirc-dev.install 2006-11-02 02:34:48.000000000 +0100
++++ 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 debian/kvirc.install debian/kvirc.install
+--- debian/kvirc.install 2006-11-02 02:34:48.000000000 +0100
++++ 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 src/kvirc/kernel/kvi_app_fs.cpp src/kvirc/kernel/kvi_app_fs.cpp
+--- src/kvirc/kernel/kvi_app_fs.cpp 2006-07-28 14:51:38.000000000 +0200
++++ 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;
@@ -41,11 +71,11 @@
+ // Local hack for Debian
case Modules :
- case Plugins : szData.append("modules"); break;
-+ case Plugins : szData = "/usr/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
++ case Plugins : szData = "/usr/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
+
- case EasyPlugins : szData.append("easyplugins"); break;
- case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
- case ConfigScripts : KviQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); 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 src/kvirc/kernel/kvi_app_setup.cpp src/kvirc/kernel/kvi_app_setup.cpp
--- src/kvirc/kernel/kvi_app_setup.cpp 2006-07-28 14:51:38.000000000 +0200
+++ src/kvirc/kernel/kvi_app_setup.cpp 2006-11-02 02:35:01.000000000 +0100
Modified: people/raul/kvirc/debian/rules
===================================================================
--- people/raul/kvirc/debian/rules 2008-04-06 14:14:32 UTC (rev 10014)
+++ people/raul/kvirc/debian/rules 2008-04-06 17:02:59 UTC (rev 10015)
@@ -58,10 +58,10 @@
#
# Change the name of the COPYING file to appease lintian
#
- mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/COPYING \
- $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/EULA
+ mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.2/license/COPYING \
+ $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.2/license/EULA
#
# Move KDE service files to a better position
#
mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/services \
- $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/
+ $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.2/
Property changes on: people/raul/kvirc/debian/rules
___________________________________________________________________
Name: svn:executable
- *
More information about the pkg-kde-commits
mailing list