Hello community,
here is the log from the commit of package obby
checked in at Sat Sep 13 12:30:02 CEST 2008.
--------
--- GNOME/obby/obby.changes 2008-06-30 18:14:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/obby/obby.changes 2008-09-12 14:39:12.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Sep 12 07:38:25 CDT 2008 - maw@suse.de
+
+- Update to version 0.4.6:
+ + Enable link-local IPv6 discovery through Avahi
+ + Bugfix: Do not throw exceptions in C callbacks
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
obby-0.4.5.tar.bz2
New:
----
obby-0.4.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obby.spec ++++++
--- /var/tmp/diff_new_pack.xg8161/_old 2008-09-13 12:29:52.000000000 +0200
+++ /var/tmp/diff_new_pack.xg8161/_new 2008-09-13 12:29:52.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package obby (Version 0.4.5)
+# spec file for package obby (Version 0.4.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -16,8 +23,8 @@
License: GPL v2 or later
Group: Productivity/Networking/Other
AutoReqProv: on
-Version: 0.4.5
-Release: 24
+Version: 0.4.6
+Release: 1
Summary: Synced document buffers
Source: %{name}-%{version}.tar.bz2
Patch: obby-avahi.patch
@@ -121,11 +128,16 @@
%files lang -f %{name}.lang
%changelog
+* Fri Sep 12 2008 maw@suse.de
+- Update to version 0.4.6:
+ + Enable link-local IPv6 discovery through Avahi
+ + Bugfix: Do not throw exceptions in C callbacks
+ + Updated translations.
* Mon Jun 30 2008 schwab@suse.de
- Use autoreconf.
-* Fri May 16 2008 crrodriguez@suse.de
+* Thu May 15 2008 crrodriguez@suse.de
- disable not really usable static libraries
-* Wed Apr 02 2008 maw@suse.de
+* Tue Apr 01 2008 maw@suse.de
- Update to version 0.4.5:
+ ABI breaks from 0.4.4
+ Updated translations
@@ -134,7 +146,7 @@
- Do not call (too old) autoconf in older SuSE versions.
* Thu Oct 11 2007 sbrabec@suse.cz
- Use binding specific avahi package.
-* Wed Aug 08 2007 maw@suse.de
+* Tue Aug 07 2007 maw@suse.de
- Use %%fdupes
- Split off a -lang subpackage
- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
@@ -165,5 +177,5 @@
- Updated to version 0.3.0rc3
* Sat Jan 14 2006 kukuk@suse.de
- Add gmp-devel to nfb
-* Sat Nov 05 2005 gekker@suse.de
+* Fri Nov 04 2005 gekker@suse.de
- Initial import into autobuild, version 0.2.1
++++++ obby-0.4.5.tar.bz2 -> obby-0.4.6.tar.bz2 ++++++
++++ 3930 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/obby-0.4.5/ChangeLog new/obby-0.4.6/ChangeLog
--- old/obby-0.4.5/ChangeLog 2007-12-27 20:52:56.000000000 +0100
+++ new/obby-0.4.6/ChangeLog 2008-09-09 15:20:22.000000000 +0200
@@ -1,3 +1,34 @@
+2008-09-09 Philipp Kern
+
+ * configure.ac:
+ * NEWS: bump version to 0.4.6, document the changes
+
+2008-09-09 Philipp Kern
+
+ * po/LINGUAS:
+ * po/oc.po: add new Occitan (post 1500) translation
+
+2008-09-09 Philipp Kern
+
+ * src/Makefile.am, src/serialise/Makefile.am, test/Makefile.am: clean
+ up include handling; first step to support distcheck
+
+2008-09-08 Armin Burgmeier
+
+ * inc/client_buffer.hpp: Added a connect(const net6::address&)
+ overload.
+
+2008-09-08 Armin Burgmeier
+
+ * src/zeroconf_avahi.cpp: Set scope ID of discovered IPv6 services,
+ for link-local IPv6 to work.
+
+2008-06-22 Armin Burgmeier
+
+ * src/zeroconf_howl.cpp: Don't throw exceptions in C callbacks.
+ Instead, print the error to std::cerr as the avahi implementation
+ does.
+
2007-12-27 Philipp Kern
* src/zeroconf_avahi.cpp: compilation fix for non-IPv6 builds
@@ -8,7 +39,7 @@
2007-12-27 Philipp Kern
- * configure.ac: bump version to 1.3.6
+ * configure.ac: bump version to 0.4.5
2007-12-27 Philipp Kern
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/obby-0.4.5/configure.ac new/obby-0.4.6/configure.ac
--- old/obby-0.4.5/configure.ac 2007-12-27 18:16:04.000000000 +0100
+++ new/obby-0.4.6/configure.ac 2008-09-09 15:08:02.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([obby], [0.4.5], [crew@0x539.de])
+AC_INIT([obby], [0.4.6], [crew@0x539.de])
AM_INIT_AUTOMAKE(1.9 check-news)
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([inc/buffer.hpp])
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/obby-0.4.5/inc/client_buffer.hpp new/obby-0.4.6/inc/client_buffer.hpp
--- old/obby-0.4.5/inc/client_buffer.hpp 2007-11-23 13:50:25.000000000 +0100
+++ new/obby-0.4.6/inc/client_buffer.hpp 2008-09-09 14:41:44.000000000 +0200
@@ -97,6 +97,18 @@
*/
void connect(const std::string& hostname, unsigned int port = 6522);
+ /** Connects to the given address where a obby server is assumed to be
+ * running. After the connection has been established, signal_welcome
+ * will be emitted after the server sent us some initial data
+ * At this point the login function may be used to login as a user
+ * with a given colour.
+ * TODO: Ask username and colour parameters already here and login
+ * implicitly after having called connect().
+ *
+ * @param address Address to connect to.
+ */
+ void connect(const net6::address& addr);
+
/** Disconnects from a server. Note that documents and users are
* still available until reconnection. get_self() will still return
* the local user. is_logged_in() will returns false since the
@@ -402,6 +414,31 @@
}
template
+void basic_client_buffer::
+ connect(const net6::address& addr)
+{
+ if(basic_buffer::is_open() )
+ {
+ throw std::logic_error(
+ "obby::basic_client_buffer::connect:\n"
+ "Connection already established"
+ );
+ }
+
+ // Create connection object
+ basic_buffer::m_net.reset(new_net() );
+
+ // Register signal handlers
+ register_signal_handlers();
+
+ // Connect
+ net6_client().connect(addr);
+
+ // Set keepalive
+ net6_client().set_enable_keepalives(m_enable_keepalives);
+}
+
+template
void basic_client_buffer::disconnect()
{
if(!basic_buffer::is_open() )
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/obby-0.4.5/INSTALL new/obby-0.4.6/INSTALL
--- old/obby-0.4.5/INSTALL 2006-10-19 06:51:14.000000000 +0200
+++ new/obby-0.4.6/INSTALL 2008-02-10 03:55:24.000000000 +0100
@@ -2,7 +2,7 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
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/obby-0.4.5/NEWS new/obby-0.4.6/NEWS
--- old/obby-0.4.5/NEWS 2007-12-27 19:06:55.000000000 +0100
+++ new/obby-0.4.6/NEWS 2008-09-09 15:11:22.000000000 +0200
@@ -1,6 +1,12 @@
obby
====
+Version 0.4.6:
+ * Enable link-local IPv6 discovery through Avahi.
+ * Bugfix: Do not throw exceptions in C callbacks.
+ * Translation roundup
+ - New Occitan (post 1500) translation, thanks to Cédric VALMARY
+
Version 0.4.5:
* IPv6 discovery for Avahi. This breaks the ABI and thus applications
built against an older obby need to be recompiled.
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/obby-0.4.5/po/LINGUAS new/obby-0.4.6/po/LINGUAS
--- old/obby-0.4.5/po/LINGUAS 2007-12-01 19:13:26.000000000 +0100
+++ new/obby-0.4.6/po/LINGUAS 2008-09-09 15:10:42.000000000 +0200
@@ -1 +1 @@
-de fr ca sv es nl it
+de fr ca sv es nl it oc
Files old/obby-0.4.5/po/oc.gmo and new/obby-0.4.6/po/oc.gmo differ
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/obby-0.4.5/po/oc.po new/obby-0.4.6/po/oc.po
--- old/obby-0.4.5/po/oc.po 1970-01-01 01:00:00.000000000 +0100
+++ new/obby-0.4.6/po/oc.po 2008-09-09 15:21:20.000000000 +0200
@@ -0,0 +1,148 @@
+# Occitan (post 1500) translation for obby
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the obby package.
+# FIRST AUTHOR , 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: obby\n"
+"Report-Msgid-Bugs-To: http://gobby.0x539.de/\n"
+"POT-Creation-Date: 2007-04-15 12:36+0200\n"
+"PO-Revision-Date: 2008-03-21 16:19+0000\n"
+"Last-Translator: Cédric VALMARY <Unknown>\n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2008-09-09 13:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: inc/server_buffer.hpp:292
+msgid "Sends an action to the chat."
+msgstr ""
+
+#: inc/server_buffer.hpp:373
+msgid "File is not an obby document"
+msgstr "Lo fichièr es pas un fichièr Obby"
+
+#: inc/server_buffer.hpp:380
+msgid "File is not a stored obby session"
+msgstr "Lo fichièr correspond pas a cap de sesilha Obby"
+
+#: inc/server_buffer.hpp:423 src/user_table.cpp:75 src/chat.cpp:251
+#: src/text.cpp:188
+msgid "Unexpected child node: '%0%'"
+msgstr "Nos enfant inesperat :'%0%'"
+
+#: inc/serialise/attribute.hpp:127
+msgid "Attribute '%0%' has unexpected type: %1%"
+msgstr "L'atribut '%0%' possedís un tipe inesperat : %1%"
+
+#: src/error.cpp:39
+msgid "Colour is already in use"
+msgstr "Aquesta color ja es utilizada"
+
+#: src/error.cpp:41
+msgid "Wrong session password"
+msgstr ""
+
+#: src/error.cpp:43
+msgid "Wrong user password"
+msgstr "Marrit senhal de sesilha"
+
+#: src/error.cpp:45
+msgid "Protocol version mismatch"
+msgstr "Marrida version del protocòl"
+
+#: src/error.cpp:47
+msgid "Connection is not yet encrypted"
+msgstr "La connexion es pas encara chifrada"
+
+#: src/user_table.cpp:58
+msgid "User ID %0% is already in use"
+msgstr "L'ID utilizaire %0% ja es utilizada"
+
+#: src/chat.cpp:257
+msgid "Restored session"
+msgstr "Represa de sesilha"
+
+#: src/chat.cpp:332
+msgid "%0% has joined"
+msgstr "%0% es demest nosautres !"
+
+#: src/chat.cpp:339
+msgid "%0% has left"
+msgstr "%0% nos a quitat :("
+
+#: src/serialise/token.cpp:94
+msgid "Unexpected escape sequence: \\%0%"
+msgstr "Sequéncia d'escapament inesperada : \\%0%"
+
+#: src/serialise/token.cpp:170
+msgid "String not closed"
+msgstr "Cadena de caractèr non tampada"
+
+#: src/serialise/token.cpp:275
+msgid "Unexpected token: '%0%'"
+msgstr "Marca inesperada : '%0%'"
+
+#: src/serialise/token.cpp:395
+msgid "Unexpected end of input"
+msgstr "Fin de picament inesperat"
+
+#: src/serialise/attribute.cpp:54
+msgid "Expected '=' after %0%"
+msgstr "'=' esperat aprèp %0%"
+
+#: src/serialise/attribute.cpp:65
+msgid "Expected string literal as value for attribute '%0%'"
+msgstr "Cadena literala esperada per la valor de l'atribut '%0%'"
+
+#: src/serialise/object.cpp:135
+msgid "Child object's indentation must be parent's plus one"
+msgstr ""
+"L'indentacion d'un objècte enfant deu èsser egala a la de son parent mai un"
+
+#: src/serialise/object.cpp:148
+msgid "Expected child object after indentation"
+msgstr "Objècte enfant inesperat aprèp l'indentacion"
+
+#: src/serialise/object.cpp:159
+msgid "Expected child object instead of '%0%'"
+msgstr "Objècte enfant inesperat al luòc de '%0%'"
+
+#: src/serialise/object.cpp:220 src/serialise/object.cpp:234
+msgid "Object '%0%' requires attribute '%1%'"
+msgstr "L'objècte '%0%' requerís l'atribut '%1%'"
+
+#: src/serialise/parser.cpp:36
+msgid "Could not open file '%0%' for reading"
+msgstr "Impossible de dobrir lo fichièr '%0%' en lectura"
+
+#: src/serialise/parser.cpp:97
+msgid "Expected initial exclamation mark"
+msgstr "Punt d'exclamacion inicial inesperat"
+
+#: src/serialise/parser.cpp:107
+msgid "Expected document type after '!'"
+msgstr "Tipe de document esperat aprèp '!'"
+
+#: src/serialise/parser.cpp:118
+msgid "Expected newline after document type"
+msgstr "Linha esperada novèla aprèp lo tipe de document"
+
+#: src/serialise/parser.cpp:127
+msgid "Expected top-level object after document type"
+msgstr "Objècte del màger nivèl esperat aprèp lo tipe de document"
+
+#: src/serialise/parser.cpp:137
+msgid "Expected root object after document type"
+msgstr "Objècte raiç esperat aprèp lo tipe de document"
+
+#: src/serialise/parser.cpp:147
+msgid "Expected end of input instead of '%0%'"
+msgstr "Fin de picada esperada a la plaça de '%0%'"
+
+#: src/serialise/parser.cpp:159
+msgid "Could not open file '%0%' for writing"
+msgstr "Impossible de dobrir lo fichièr '%0%' en escritura"
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/obby-0.4.5/src/Makefile.am new/obby-0.4.6/src/Makefile.am
--- old/obby-0.4.5/src/Makefile.am 2007-12-27 18:12:27.000000000 +0100
+++ new/obby-0.4.6/src/Makefile.am 2008-09-09 15:00:25.000000000 +0200
@@ -1,5 +1,7 @@
SUBDIRS = serialise .
+INCLUDES = -I$(top_srcdir)/inc
+
lib_LTLIBRARIES = libobby.la
# current : revision : age
@@ -14,7 +16,7 @@
libobby_la_LDFLAGS += -no-undefined -Wl,--enable-runtime-pseudo-reloc
endif
-libobby_la_CPPFLAGS = $(libobby_CFLAGS) -I../inc @extra_includes@
+libobby_la_CPPFLAGS = $(libobby_CFLAGS) @extra_includes@
# gettext
libobby_la_CPPFLAGS += -DLOCALEDIR=\""$(datadir)/locale"\"
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/obby-0.4.5/src/serialise/Makefile.am new/obby-0.4.6/src/serialise/Makefile.am
--- old/obby-0.4.5/src/serialise/Makefile.am 2007-11-23 13:50:25.000000000 +0100
+++ new/obby-0.4.6/src/serialise/Makefile.am 2008-09-09 15:00:46.000000000 +0200
@@ -1,5 +1,7 @@
+INCLUDES = -I$(top_srcdir)/inc
+
noinst_LTLIBRARIES = libserialise.la
-libserialise_la_CPPFLAGS = $(libobby_CFLAGS) -I../inc @extra_includes@
+libserialise_la_CPPFLAGS = $(libobby_CFLAGS) @extra_includes@
libserialise_la_LIBADD = $(libobby_LIBS) $(LIBINTL) @extra_libraries@
libserialise_la_SOURCES = error.cpp
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/obby-0.4.5/src/zeroconf_avahi.cpp new/obby-0.4.6/src/zeroconf_avahi.cpp
--- old/obby-0.4.5/src/zeroconf_avahi.cpp 2007-12-27 20:51:55.000000000 +0100
+++ new/obby-0.4.6/src/zeroconf_avahi.cpp 2008-09-09 14:41:44.000000000 +0200
@@ -241,7 +241,7 @@
else
static_cast(userdata)->discover6_event().emit(
name, net6::ipv6_address::create_from_address(
- addr->data.ipv6.address, port));
+ addr->data.ipv6.address, port, 0, interface));
}
/* Clean up */
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/obby-0.4.5/src/zeroconf_howl.cpp new/obby-0.4.6/src/zeroconf_howl.cpp
--- old/obby-0.4.5/src/zeroconf_howl.cpp 2007-11-23 13:50:25.000000000 +0100
+++ new/obby-0.4.6/src/zeroconf_howl.cpp 2008-09-09 14:41:44.000000000 +0200
@@ -115,9 +115,7 @@
{
if (status != SW_OKAY)
{
- std::stringstream stream;
- stream << "publish failed: " << status;
- throw std::runtime_error(stream.str());
+ std::cerr << "publish failed: " << status;
}
return SW_OKAY;
}
@@ -133,8 +131,7 @@
{
case SW_DISCOVERY_BROWSE_INVALID:
{
- throw std::runtime_error(
- "sw_discovery failed within the callback");
+ std::cerr << "sw_discovery failed within the callback";
break;
}
@@ -146,9 +143,7 @@
&zeroconf_howl::handle_resolve_reply,
extra, &oid)) != SW_OKAY)
{
- std::stringstream stream;
- stream << "resolve failed: " << result;
- throw std::runtime_error(stream.str());
+ std::cerr << "resolve failed: " << result;
}
break;
}
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/obby-0.4.5/test/Makefile.am new/obby-0.4.6/test/Makefile.am
--- old/obby-0.4.5/test/Makefile.am 2007-11-23 13:50:25.000000000 +0100
+++ new/obby-0.4.6/test/Makefile.am 2008-09-09 14:55:00.000000000 +0200
@@ -1,7 +1,9 @@
check_PROGRAMS = serialise text jupiter
TESTS = serialise text jupiter
-AM_CPPFLAGS = -I../inc/ $(libobby_CFLAGS)
+INCLUDES = -I$(top_srcdir)/inc
+
+AM_CPPFLAGS = $(libobby_CFLAGS)
LDADD = $(libobby_LIBS)
serialise_SOURCES = test_serialise.cpp
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org