Hello community,
here is the log from the commit of package licq
checked in at Mon Oct 16 18:59:31 CEST 2006.
--------
--- KDE/licq/licq.changes 2006-10-09 12:13:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/licq/licq.changes 2006-10-16 14:17:30.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 16 14:08:15 CEST 2006 - lmichnovic@suse.cz
+
+- update to final
+ * some minor fixes
+ * unnecessary messages are suppressed [#211312]
+
+-------------------------------------------------------------------
Old:
----
licq-1.3.4-rc3.tar.bz2
New:
----
licq-1.3.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ licq.spec ++++++
--- /var/tmp/diff_new_pack.Odjq3f/_old 2006-10-16 18:59:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Odjq3f/_new 2006-10-16 18:59:15.000000000 +0200
@@ -21,9 +21,9 @@
Group: Productivity/Networking/ICQ
Autoreqprov: on
Version: 1.3.4
-Release: 2
+Release: 6
Summary: Linux ICQ Client
-Source: %{name}-%{version}-rc3.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source1: icqnd-0.1.9.6.tar.bz2
Patch1: %{name}-config-fix.patch
Patch2: %{name}-assert.patch
@@ -71,7 +71,7 @@
Joachim Staib
%prep
-%setup -n licq-1.3.4-RC3 -a1
+%setup -a1
# move icqnd source into plugins where it belongs
mv icqnd-0.1.9.6 plugins
%patch1
@@ -271,6 +271,10 @@
/usr/share/licq/icqnd
%changelog -n licq
+* Mon Oct 16 2006 - lmichnovic@suse.cz
+- update to final
+ * some minor fixes
+ * unnecessary messages are suppressed [#211312]
* Mon Oct 09 2006 - lmichnovic@suse.cz
- update to RC3
* fix of pid file; obsoletes *pidfile.patch
++++++ licq-1.3.4-rc3.tar.bz2 -> licq-1.3.4.tar.bz2 ++++++
++++ 5650 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/configure.in new/licq-1.3.4/configure.in
--- old/licq-1.3.4-RC3/configure.in 2006-10-08 02:58:49.000000000 +0200
+++ new/licq-1.3.4/configure.in 2006-10-15 14:11:03.000000000 +0200
@@ -5,8 +5,8 @@
AC_ARG_PROGRAM
dnl All versioning is done via these defines
-INT_VERSION=1032
-AM_INIT_AUTOMAKE(licq, 1.3.2)
+INT_VERSION=1034
+AM_INIT_AUTOMAKE(licq, 1.3.4)
AM_CONFIG_HEADER(config.h)
@@ -172,11 +172,6 @@
AC_CHECK_HEADER(vector,,
AC_MSG_ERROR(You need to have the libstdc++ headers installed))
-AC_CHECK_HEADER(iconv.h,,
- AC_MSG_ERROR(Could not find iconv.h. Install libiconv.))
-
-AM_ICONV
-
AC_LANG_RESTORE
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -198,6 +193,10 @@
AC_LIBTOOL_CXX
AM_GNU_GETTEXT([external])
+AM_ICONV
+if test "$am_cv_func_iconv" != "yes"; then
+ AC_MSG_ERROR(Please install the iconv library.)
+fi
AC_OUTPUT(
po/Makefile.in \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/doc/CHANGELOG new/licq-1.3.4/doc/CHANGELOG
--- old/licq-1.3.4-RC3/doc/CHANGELOG 2006-10-08 02:58:48.000000000 +0200
+++ new/licq-1.3.4/doc/CHANGELOG 2006-10-15 14:11:02.000000000 +0200
@@ -1,25 +1,29 @@
Change log for Licq.
New in 1.3.4
-o Make sending typing notifications optional
-o Iconv fixes
-o Fixes for newly registered users
-o Fix a few bugs where users would falsely go offline
-o ICQ: Update the protocol to properly set info
-o ICQ: Show more version information of remote clients
-o ICQ: Fix a bug where contacts would receive empty messages
-o Compilation fixes
-o 64-bit compatibility changes
-o KDE: Addressbook fix
-o Qt/KDE: Show user's pictures as a tooltip or status icon
-o Qt/KDE: Optional "Send with Enter"
-o Qt/KDE: Improve hyperlink detection
-o Qt/KDE: Improve emoticon detection and processing
-o KDE: Add spell checking to the kde-gui (Using KSpell)
-o Qt/KDE: Add a custom message box handler
-o MSN: Fix a race error in MSN packet parsing
-o MSN: Fix socket handling
-o Many various minor bugs and crashes fixed... Use 'svn log' for the details :-)
+o Fix a few bugs where users would falsely go offline
+o Make sending typing notifications optional
+o Fixes for newly registered users
+o Fix the handling of pidfiles so that Licq always starts unless there actually is an other instance of Licq running.
+o 64-bit compatibility changes
+o Compilation fixes
+o Fixes for Licq on Mac OS X (with Fink)
+o Iconv fixes
+o ICQ: Fix a bug where contacts would receive empty messages
+o ICQ: Update the protocol to properly set info
+o ICQ: Show more version information of remote clients
+o ICQ: Fix SSL issue
+o MSN: Fix a race error in MSN packet parsing
+o MSN: Fix socket handling
+o KDE: Addressbook fix
+o KDE: Add spell checking to the kde-gui (Using KSpell)
+o Qt/KDE: Show user's pictures as a tooltip or status icon
+o Qt/KDE: Optional "Send with Enter"
+o Qt/KDE: Improve hyperlink detection
+o Qt/KDE: Improve emoticon detection and processing
+o Qt/KDE: Add a custom message box handler
+o Qt/KDE: New KDE iconset to better integrate with the KDE desktop
+Many various minor bugs and crashes fixed... See http://tinyurl.com/ygdrfo for details.
New in 1.2.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/console/configure.in new/licq-1.3.4/plugins/console/configure.in
--- old/licq-1.3.4-RC3/plugins/console/configure.in 2006-10-08 03:00:08.000000000 +0200
+++ new/licq-1.3.4/plugins/console/configure.in 2006-10-15 14:12:23.000000000 +0200
@@ -5,7 +5,7 @@
AC_ARG_PROGRAM
dnl All versioning is done via the following line
-AM_INIT_AUTOMAKE(Licq-Console, 1.3.2)
+AM_INIT_AUTOMAKE(Licq-Console, 1.3.4)
AM_CONFIG_HEADER(config.h)
dnl Chuck #defines for PACKAGE and VERSION into config.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/osd/po/Makefile.in.in new/licq-1.3.4/plugins/osd/po/Makefile.in.in
--- old/licq-1.3.4-RC3/plugins/osd/po/Makefile.in.in 2006-10-08 03:00:42.000000000 +0200
+++ new/licq-1.3.4/plugins/osd/po/Makefile.in.in 2006-10-15 14:12:57.000000000 +0200
@@ -8,7 +8,7 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.15
+# Origin: gettext-0.15.1
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -25,12 +25,22 @@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@
-localedir = @localedir@
+localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/qt-gui/acinclude.m4 new/licq-1.3.4/plugins/qt-gui/acinclude.m4
--- old/licq-1.3.4-RC3/plugins/qt-gui/acinclude.m4 2006-10-08 03:03:02.000000000 +0200
+++ new/licq-1.3.4/plugins/qt-gui/acinclude.m4 2006-10-15 14:15:23.000000000 +0200
@@ -49,7 +49,7 @@
fi
if test -n "$QTDIR"; then
- qt_library_dirs="$QTDIR/lib $qt_library_dirs"
+ qt_library_dirs="$QTDIR/lib64 $QTDIR/lib $qt_library_dirs"
fi
if test -n "$QTLIB"; then
@@ -203,7 +203,7 @@
MOC,
moc,
$QTDIR/bin/moc,
- $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH
)
else
AC_MSG_CHECKING(for moc)
@@ -337,7 +337,7 @@
QT_LUPDATE,
lupdate,
echo,
- $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH)
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
if test "$QT_LUPDATE" = "echo"; then
echo "** lupdate could not be found. You will not be able to update the translations."
@@ -352,7 +352,7 @@
QT_LRELEASE,
lrelease,
echo,
- $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH)
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
if test "$QT_LRELEASE" = "echo"; then
echo "** lrelease could not be found. You're losing the localisation."
@@ -475,7 +475,7 @@
kde_libraries=""
dnl check for KDE libraries
- kde_libdirs="/opt/kde3/lib /opt/kde2/lib /opt/kde/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/local/lib /usr/X11R6/lib /usr/X11R6/kde/lib"
+ kde_libdirs="/opt/kde3/lib64 /opt/kde3/lib /opt/kde/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/local/lib /usr/X11R6/lib /usr/X11R6/kde/lib"
if test -n "$KDEDIR"; then
kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/qt-gui/acinclude.m4.in new/licq-1.3.4/plugins/qt-gui/acinclude.m4.in
--- old/licq-1.3.4-RC3/plugins/qt-gui/acinclude.m4.in 2006-10-08 02:59:34.000000000 +0200
+++ new/licq-1.3.4/plugins/qt-gui/acinclude.m4.in 2006-10-15 14:11:48.000000000 +0200
@@ -49,7 +49,7 @@
fi
if test -n "$QTDIR"; then
- qt_library_dirs="$QTDIR/lib $qt_library_dirs"
+ qt_library_dirs="$QTDIR/lib64 $QTDIR/lib $qt_library_dirs"
fi
if test -n "$QTLIB"; then
@@ -203,7 +203,7 @@
MOC,
moc,
$QTDIR/bin/moc,
- $QTDIR/bin:/usr/lib/qt2/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH
)
else
AC_MSG_CHECKING(for moc)
@@ -337,7 +337,7 @@
QT_LUPDATE,
lupdate,
echo,
- $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH)
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
if test "$QT_LUPDATE" = "echo"; then
echo "** lupdate could not be found. You will not be able to update the translations."
@@ -352,7 +352,7 @@
QT_LRELEASE,
lrelease,
echo,
- $QTDIR/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:$PATH)
+ $QTDIR/bin:/usr/lib/qt3/bin:/usr/bin:/usr/X11R6/bin:/usr/lib/qt/bin:/usr/local/qt/bin:/usr/local/qt3/bin:$PATH)
if test "$QT_LRELEASE" = "echo"; then
echo "** lrelease could not be found. You're losing the localisation."
@@ -475,7 +475,7 @@
kde_libraries=""
dnl check for KDE libraries
- kde_libdirs="/opt/kde3/lib /opt/kde2/lib /opt/kde/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/local/lib /usr/X11R6/lib /usr/X11R6/kde/lib"
+ kde_libdirs="/opt/kde3/lib64 /opt/kde3/lib /opt/kde/lib /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/local/lib /usr/X11R6/lib /usr/X11R6/kde/lib"
if test -n "$KDEDIR"; then
kde_libdirs="$KDEDIR/lib $KDEDIR $kde_libdirs"
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/qt-gui/configure.in new/licq-1.3.4/plugins/qt-gui/configure.in
--- old/licq-1.3.4-RC3/plugins/qt-gui/configure.in 2006-10-08 02:59:34.000000000 +0200
+++ new/licq-1.3.4/plugins/qt-gui/configure.in 2006-10-15 14:11:48.000000000 +0200
@@ -5,7 +5,7 @@
AC_ARG_PROGRAM
dnl All versioning is done via the following line
-AM_INIT_AUTOMAKE(Licq-Qt-GUI, 1.3.2)
+AM_INIT_AUTOMAKE(Licq-Qt-GUI, 1.3.4)
AM_CONFIG_HEADER(config.h)
dnl Chuck #defines for PACKAGE and VERSION into config.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/plugins/qt-gui/src/mlview.cpp new/licq-1.3.4/plugins/qt-gui/src/mlview.cpp
--- old/licq-1.3.4-RC3/plugins/qt-gui/src/mlview.cpp 2006-10-08 02:59:26.000000000 +0200
+++ new/licq-1.3.4/plugins/qt-gui/src/mlview.cpp 2006-10-15 14:11:41.000000000 +0200
@@ -243,6 +243,9 @@
text.replace("<", "<");
text.replace(">", ">");
+ text.replace(""", "\"");
+
+ // & => & needs to be last
text.replace("&", "&");
drag->setText(text);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/po/Makefile.in.in new/licq-1.3.4/po/Makefile.in.in
--- old/licq-1.3.4-RC3/po/Makefile.in.in 2006-10-08 02:58:49.000000000 +0200
+++ new/licq-1.3.4/po/Makefile.in.in 2006-10-15 14:11:03.000000000 +0200
@@ -8,7 +8,7 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.15
+# Origin: gettext-0.15.1
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -25,12 +25,22 @@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
datadir = @datadir@
-localedir = @localedir@
+localedir = $(datadir)/locale
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
mkdir_p = @mkdir_p@
GMSGFMT_ = @GMSGFMT@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/licq-1.3.4-RC3/src/icqd-srv.cpp new/licq-1.3.4/src/icqd-srv.cpp
--- old/licq-1.3.4-RC3/src/icqd-srv.cpp 2006-10-08 02:58:44.000000000 +0200
+++ new/licq-1.3.4/src/icqd-srv.cpp 2006-10-15 14:10:58.000000000 +0200
@@ -2906,8 +2906,9 @@
if (bFake && isdigit(szId[0]))
{
ICQUser *user = gUserManager.FetchUser(szId, LICQ_PPID, LOCK_R);
- gLog.Error("%sIgnoring fake offline: %s (%s)\n", L_SRVxSTR,
- user->GetAlias(), szId);
+ //XXX Debug output
+ //gLog.Error("%sIgnoring fake offline: %s (%s)\n", L_SRVxSTR,
+ // user->GetAlias(), szId);
delete [] szId;
gUserManager.DropUser(user);
break;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org