Dear release team,
could you please grant net6, obby and gobby a freeze exception? The uploads
of net6 and obby allow Gobby to be used with kernels without IPv6
support (i.e. self-compiled ones or kernels provided by hosting facilities).
Furthermore invalid input on the connection (i.e. send by a hostile
server) does no longer cause an exception propagating to the
application, which did terminate Gobby.
The IPv6 patch added a new default parameter. Tests of mine shows that
it was ABI- and API-compatible, but I guess you judge that better than I
could.
The Gobby changes are fairly trivial, adopting the provided mime mapping
to the current one present in GtkSourceView (which is quite
inconsistent, but probably in line with mime.types). And there is a
more or less one line patch to remove a dialog window which pops up
when avahi-daemon is not started. This is not critical and just disables
one control in the application (it's then hidden, not greyed out).
net6 changes:
* Adopted dpatch.
- Fix IPv6 usage: Every application could now choose to use IPv6
on connect which enables them to retry without if the first
attempt fails due to missing kernel support.
- Errors caused by invalid data on the connection does propagate
as a seperate exception.
- Moved gettext compatibility patch into a seperate patch file.
* Bump versioned dependency in shlibs file.
obby changes:
* Adopt dpatch:
- Add a patch to retry IPv6 if it's unavailable.
gobby changes:
* Fix mime type mapping.
* Lack of avahi-daemon now fails silently instead of a verbose message
confusing the user. Zeroconf is a `nice to have' but in no means
required.
The debdiffs of all three packages are attached. net6 and obby were
uploaded on 2007-01-17, gobby today.
Kind regards,
Philipp Kern
Debian Developer
reverted:
--- net6-1.3.1/inc/gettext_package.hpp
+++ net6-1.3.1.orig/inc/gettext_package.hpp
@@ -22,13 +22,6 @@
#include <string>
#include "non_copyable.hpp"
-/* This is a bugfix specifically for Debian Sarge. It is included here as
- * a patch because it does no harm and fixes problems with backports to
- * that platform.
- */
-#undef gettext
-#undef ngettext
-
namespace net6
{
diff -u net6-1.3.1/debian/control net6-1.3.1/debian/control
--- net6-1.3.1/debian/control
+++ net6-1.3.1/debian/control
@@ -2,8 +2,8 @@
Section: net
Priority: optional
Maintainer: Philipp Kern <pkern@debian.org>
-Build-Depends: debhelper (>= 5.0.0), libtool, autotools-dev, libsigc++-2.0-dev (>= 2.0.16-2), libgnutls-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.0), dpatch (>= 2.0.0), libtool, autotools-dev, libsigc++-2.0-dev (>= 2.0.16-2), libgnutls-dev
+Standards-Version: 3.7.2
Package: libnet6-1.3-dev
Section: libdevel
diff -u net6-1.3.1/debian/rules net6-1.3.1/debian/rules
--- net6-1.3.1/debian/rules
+++ net6-1.3.1/debian/rules
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
@@ -35,33 +36,30 @@
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
-
build: build-stamp
-build-stamp: config.status
+build-stamp: patch config.status
+ @echo ">>> Starting compile (`date`)..."
dh_testdir
-
$(MAKE)
-
touch build-stamp
-clean:
+clean: clean1 unpatch
+
+clean1:
+ @echo ">>> Cleaning..."
dh_testdir
dh_testroot
rm -f build-stamp
-
-$(MAKE) distclean
-
# Kill auto-generated files so that they do not enter the diff.
rm -rf config.guess config.log config.sub
-
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
@@ -90,2 +88,14 @@
+patch: patch-stamp
+
+patch-stamp:
+ dpatch apply-all
+ dpatch cat-all > patch-stamp
+ touch patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+ clean1
diff -u net6-1.3.1/debian/changelog net6-1.3.1/debian/changelog
--- net6-1.3.1/debian/changelog
+++ net6-1.3.1/debian/changelog
@@ -1,3 +1,16 @@
+net6 (1:1.3.1-3) unstable; urgency=low
+
+ * Adopted dpatch.
+ - Fix IPv6 usage: Every application could now choose to use IPv6
+ on connect which enables them to retry without if the first
+ attempt fails due to missing kernel support.
+ - Errors caused by invalid data on the connection does propagate
+ as a seperate exception.
+ - Moved gettext compatibility patch into a seperate patch file.
+ * Bump versioned dependency in shlibs file.
+
+ -- Philipp Kern <pkern@debian.org> Wed, 17 Jan 2007 00:17:58 +0100
+
net6 (1:1.3.1-2) unstable; urgency=low
* Fix the shlibs dependencies.
diff -u net6-1.3.1/debian/libnet6-1.3-0.shlibs net6-1.3.1/debian/libnet6-1.3-0.shlibs
--- net6-1.3.1/debian/libnet6-1.3-0.shlibs
+++ net6-1.3.1/debian/libnet6-1.3-0.shlibs
@@ -1 +1 @@
-libnet6-1.3 0 libnet6-1.3-0 (>= 1:1.3.1-1)
+libnet6-1.3 0 libnet6-1.3-0 (>= 1:1.3.1-3)
only in patch2:
unchanged:
--- net6-1.3.1.orig/debian/patches/00list
+++ net6-1.3.1/debian/patches/00list
@@ -0,0 +1,3 @@
+01-ipv6_fix.dpatch
+02-selector_exceptions.dpatch
+03-sarge_gettext.dpatch
only in patch2:
unchanged:
--- net6-1.3.1.orig/debian/patches/02-selector_exceptions.dpatch
+++ net6-1.3.1/debian/patches/02-selector_exceptions.dpatch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-selector_exceptions.patch by Philipp Kern <pkern@debian.org>
+##
+## DP: Do not propagate errors which occur on the connection to
+## DP: the selector, as this might crash the application.
+
+@DPATCH@
+Sat Nov 4 14:36:05 CET 2006 Armin Burgmeier <armin@0x539.de>
+ * Do not propagate any errors to the selector [fixes #215]
+diff -rN -u old-net6/inc/connection.hpp new-net6/inc/connection.hpp
+--- old-net6/inc/connection.hpp 2007-01-16 23:57:54.000000000 +0100
++++ new-net6/inc/connection.hpp 2007-01-16 23:57:54.000000000 +0100
+@@ -53,6 +53,13 @@
+ KEEPALIVE_WAITING
+ };
+
++ class fatal: public std::runtime_error
++ {
++ public:
++ fatal(const std::string& error_message):
++ std::runtime_error(error_message) {}
++ };
++
+ typedef sigc::signal<void, const packet&> signal_recv_type;
+ typedef sigc::signal<void> signal_send_type;
+ typedef sigc::signal<void> signal_close_type;
+diff -rN -u old-net6/src/connection.cpp new-net6/src/connection.cpp
+--- old-net6/src/connection.cpp 2007-01-16 23:57:54.000000000 +0100
++++ new-net6/src/connection.cpp 2007-01-16 23:57:54.000000000 +0100
+@@ -241,18 +241,24 @@
+ if(e.get_code() == error::WOULD_BLOCK)
+ return;
+ #endif
+- if(e.get_code() == error::CONNECTION_RESET ||
++ // We should not throw any error here because it would fall
++ // through to the selector. If something went wrong, then
++ // we have to handle it here.
++ /*if(e.get_code() == error::CONNECTION_RESET ||
+ e.get_code() == error::BROKEN_PIPE ||
+ e.get_code() == error::PULL_ERROR ||
+ e.get_code() == error::PUSH_ERROR ||
+- e.get_code() == error::UNEXPECTED_PACKET_LENGTH) // TLS...
++ e.get_code() == error::UNEXPECTED_PACKET ||
++ e.get_code() == error::UNEXPECTED_HANDSHAKE ||
++ e.get_code() == error::UNEXPECTED_PACKET_LENGTH ||
++ e.get_code() == error::UNKNOWN)*/
+ {
+ on_close();
+ }
+- else
++ /*else
+ {
+ throw e;
+- }
++ }*/
+ }
+ }
+
+
only in patch2:
unchanged:
--- net6-1.3.1.orig/debian/patches/01-ipv6_fix.dpatch
+++ net6-1.3.1/debian/patches/01-ipv6_fix.dpatch
@@ -0,0 +1,124 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-ipv6_fix.patch by Philipp Kern <pkern@debian.org>
+##
+## DP: Make IPv6 a parameter to reopen to enable applications to
+## DP: retry without it.
+
+@DPATCH@
+Sun Dec 31 16:29:03 CET 2006 Armin Burgmeier <armin@0x539.de>
+ * Preserve API compatibility for the IPv6 fix
+Wed Nov 8 19:47:54 CET 2006 Armin Burgmeier <armin@0x539.de>
+ * Made ipv6 a parameter to reopen
+Sat Nov 4 14:37:57 CET 2006 Armin Burgmeier <armin@0x539.de>
+ * Reorder netinet/in.h inclusion in address.hpp
+diff -rN -u old-net6/inc/address.hpp new-net6/inc/address.hpp
+--- old-net6/inc/address.hpp 2007-01-16 23:57:54.000000000 +0100
++++ new-net6/inc/address.hpp 2007-01-16 23:57:54.000000000 +0100
+@@ -26,8 +26,8 @@
+ #include <ws2tcpip.h>
+ #else
+ #include <sys/socket.h>
+-#include <netinet/in.h>
+ #include <netinet/in_systm.h>
++#include <netinet/in.h>
+ #include <netinet/ip.h>
+ #endif
+
+diff -rN -u old-net6/inc/host.hpp new-net6/inc/host.hpp
+--- old-net6/inc/host.hpp 2007-01-16 23:57:54.000000000 +0100
++++ new-net6/inc/host.hpp 2007-01-16 23:57:54.000000000 +0100
+@@ -36,7 +36,8 @@
+ public:
+ /** Creates a new basic_host object.
+ * @param username user name to use for the local user.
+- * @param ipv6 Whether to use IPv6.
++ * @param ipv6 Whether to use IPv6 when no parameter is given to
++ * reopen.
+ */
+ basic_host(const std::string& username, bool ipv6 = true);
+
+diff -rN -u old-net6/inc/server.hpp new-net6/inc/server.hpp
+--- old-net6/inc/server.hpp 2007-01-16 23:57:54.000000000 +0100
++++ new-net6/inc/server.hpp 2007-01-16 23:57:54.000000000 +0100
+@@ -83,7 +83,8 @@
+ signal_data_type;
+
+ /** Creates a new basic_server object.
+- * @param ipv6 Whether to use IPv6.
++ * @param ipv6 Whether to use IPv6 when no ipv6 parameter is given
++ * to reopen.
+ */
+ basic_server(bool ipv6 = true);
+
+@@ -96,7 +97,7 @@
+ /** (re)opens the server socket on port <em>port</em>, if it has
+ * been shut down before.
+ */
+- virtual void reopen(unsigned int port);
++ virtual void reopen(unsigned int port, bool ipv6 = get_ipv6_default());
+
+ /** Shuts down the server socket. New connections will no longer be
+ * accepted, but already established connections stay open.
+@@ -237,22 +238,30 @@
+
+ private:
+ void shutdown_impl();
+- void reopen_impl(unsigned int port);
++ void reopen_impl(unsigned int port, bool use_ipv6);
++
++ // This is required for the default parameter in reopen. C++ does not
++ // allow to use a member variable as default initializer, but it
++ // seems to allow member function calls. Plase do not ask me why...
++#ifndef DOXYGEN_SHOULD_SKIP_THIS
++ bool get_ipv6_default() const { return use_ipv6; }
++#endif // DOXYGEN_SHOULD_SKIP_THIS
++
+ };
+
+ typedef basic_server<selector> server;
+
+ template<typename selector_type>
+ basic_server<selector_type>::basic_server(bool ipv6)
+- : use_ipv6(ipv6), id_counter(0)
++ : id_counter(0), use_ipv6(ipv6)
+ {
+ }
+
+ template<typename selector_type>
+ basic_server<selector_type>::basic_server(unsigned int port, bool ipv6)
+- : use_ipv6(ipv6), id_counter(0)
++ : id_counter(0), use_ipv6(ipv6)
+ {
+- reopen_impl(port);
++ reopen_impl(port, ipv6);
+ }
+
+ template<typename selector_type>
+@@ -264,9 +273,9 @@
+ }
+
+ template<typename selector_type>
+-void basic_server<selector_type>::reopen(unsigned int port)
++void basic_server<selector_type>::reopen(unsigned int port, bool ipv6)
+ {
+- reopen_impl(port);
++ reopen_impl(port, ipv6);
+ }
+
+ template<typename selector_type>
+@@ -646,12 +655,12 @@
+ }
+
+ template<typename selector_type>
+-void basic_server<selector_type>::reopen_impl(unsigned int port)
++void basic_server<selector_type>::reopen_impl(unsigned int port, bool ipv6)
+ {
+ selector_type& selector = basic_object<selector_type>::get_selector();
+
+ // Open IPv4 socket on local port
+- if(!use_ipv6)
++ if(!ipv6)
+ {
+ ipv4_address bind_addr(port);
+ serv_sock.reset(new tcp_server_socket(bind_addr) );
+
only in patch2:
unchanged:
--- net6-1.3.1.orig/debian/patches/03-sarge_gettext.dpatch
+++ net6-1.3.1/debian/patches/03-sarge_gettext.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-sarge_gettext.dpatch by Philipp Kern <pkern@debian.org>
+##
+## DP: This is a bugfix specifically for Debian Sarge, included to
+## DP: ease backports. We implement `gettext' as functions, which
+## DP: conflicts with `#define's provided with Sarge.
+
+@DPATCH@
+--- net6-1.3.1.orig/inc/gettext_package.hpp
++++ net6-1.3.1/inc/gettext_package.hpp
+@@ -22,6 +22,13 @@
+ #include <string>
+ #include "non_copyable.hpp"
+
++/* This is a bugfix specifically for Debian Sarge. It is included here as
++ * a patch because it does no harm and fixes problems with backports to
++ * that platform.
++ */
++#undef gettext
++#undef ngettext
++
+ namespace net6
+ {
+
diff -u obby-0.4.1/debian/control obby-0.4.1/debian/control
--- obby-0.4.1/debian/control
+++ obby-0.4.1/debian/control
@@ -2,13 +2,13 @@
Section: net
Priority: optional
Maintainer: Philipp Kern <pkern@debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libsigc++-2.0-dev (>= 2.0.16-2), libnet6-1.3-dev (>= 1:1.3.1-2), libavahi-compat-howl-dev, libavahi-client-dev
+Build-Depends: debhelper (>= 5.0.0), dpatch (>= 2.0.0), autotools-dev, libsigc++-2.0-dev (>= 2.0.16-2), libnet6-1.3-dev (>= 1:1.3.1-3), libavahi-compat-howl-dev, libavahi-client-dev
Standards-Version: 3.7.2
Package: libobby-0.4-dev
Section: libdevel
Architecture: any
-Depends: libobby-0.4-0 (= ${Source-Version}), libnet6-1.3-dev (>= 1:1.3.1-2), libavahi-compat-howl-dev, libavahi-client-dev
+Depends: libobby-0.4-0 (= ${Source-Version}), libnet6-1.3-dev (>= 1:1.3.1-3), libavahi-compat-howl-dev, libavahi-client-dev
Conflicts: libobby-0.2-dev, libobby-0.3-dev
Replaces: libobby-0.2-dev, libobby-0.3-dev
Description: Synced document buffers - development files
diff -u obby-0.4.1/debian/rules obby-0.4.1/debian/rules
--- obby-0.4.1/debian/rules
+++ obby-0.4.1/debian/rules
@@ -37,34 +37,29 @@
--infodir=\$${prefix}/share/info \
--disable-tests --with-zeroconf --enable-ipv6
-
build: build-stamp
-build-stamp: config.status
+build-stamp: patch config.status
dh_testdir
-
$(MAKE)
make check
-
touch build-stamp
-clean:
+clean: clean1 unpatch
+
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp
-
-$(MAKE) distclean
-
# Remove the auto-generated files so that they do not enter the diff.
rm -rf config.guess config.log config.sub
-
dh_clean
-install: build
+install: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
-
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
@@ -93,2 +88,13 @@
+patch: patch-stamp
+
+patch-stamp:
+ dpatch apply-all
+ dpatch cat-all > patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+ clean1
diff -u obby-0.4.1/debian/changelog obby-0.4.1/debian/changelog
--- obby-0.4.1/debian/changelog
+++ obby-0.4.1/debian/changelog
@@ -1,3 +1,10 @@
+obby (0.4.1-2) unstable; urgency=low
+
+ * Adopt dpatch:
+ - Add a patch to retry IPv6 if it's unavailable.
+
+ -- Philipp Kern <pkern@debian.org> Wed, 17 Jan 2007 14:28:52 +0100
+
obby (0.4.1-1) unstable; urgency=low
* New upstream release
diff -u obby-0.4.1/debian/copyright obby-0.4.1/debian/copyright
--- obby-0.4.1/debian/copyright
+++ obby-0.4.1/debian/copyright
@@ -20,7 +20,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- Copyright (C) 2005 0x539 dev group <crew@0x539.de>
+ Copyright (C) 2005, 2006 0x539 dev group <crew@0x539.de>
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
only in patch2:
unchanged:
--- obby-0.4.1.orig/debian/patches/01-ipv6_fix.dpatch
+++ obby-0.4.1/debian/patches/01-ipv6_fix.dpatch
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-ipv6_fix.dpatch by Philipp Kern <pkern@debian.org>
+##
+## DP: Fall back to IPv4 if the session could not be hosted on an
+## DP: IPv6 port.
+
+@DPATCH@
+Wed Nov 8 19:48:32 CET 2006 Armin Burgmeier <armin@0x539.de>
+ * Fall back to IPv4 when the session could not be hosted on port IPv6 [fixes #221]
+diff -rN -u old-obby/inc/host_buffer.hpp new-obby/inc/host_buffer.hpp
+--- old-obby/inc/host_buffer.hpp 2007-01-17 14:24:39.000000000 +0100
++++ new-obby/inc/host_buffer.hpp 2007-01-17 14:24:39.000000000 +0100
+@@ -384,7 +384,7 @@
+ typename basic_host_buffer<Document, Selector>::base_net_type*
+ basic_host_buffer<Document, Selector>::new_net()
+ {
+- return new net_type(m_username, IPV6_ENABLED);
++ return new net_type(m_username);
+ }
+
+ template<typename Document, typename Selector>
+diff -rN -u old-obby/inc/server_buffer.hpp new-obby/inc/server_buffer.hpp
+--- old-obby/inc/server_buffer.hpp 2007-01-17 14:24:39.000000000 +0100
++++ new-obby/inc/server_buffer.hpp 2007-01-17 14:24:39.000000000 +0100
+@@ -251,6 +251,8 @@
+
+ command_map m_command_map;
+ private:
++ void reopen_impl(unsigned int port);
++
+ /** This function provides access to the underlaying net6::basic_server
+ * object.
+ */
+@@ -282,6 +284,28 @@
+ }
+
+ template<typename Document, typename Selector>
++void basic_server_buffer<Document, Selector>::reopen_impl(unsigned int port)
++{
++ if(IPV6_ENABLED)
++ {
++ // Prefer IPv6 when compiled with IPv6 support,
++ // fallback to IPv4
++ try
++ {
++ net6_server().reopen(port, true);
++ }
++ catch(net6::error& e)
++ {
++ net6_server().reopen(port, false);
++ }
++ }
++ else
++ {
++ net6_server().reopen(port, false);
++ }
++}
++
++template<typename Document, typename Selector>
+ void basic_server_buffer<Document, Selector>::open(unsigned int port)
+ {
+ if(basic_buffer<Document, Selector>::is_open() )
+@@ -295,7 +319,7 @@
+ basic_buffer<Document, Selector>::m_net.reset(new_net());
+ register_signal_handlers();
+
+- net6_server().reopen(port);
++ reopen_impl(port);
+
+ // Clear previous documents and users
+ basic_buffer<Document, Selector>::document_clear();
+@@ -322,7 +346,7 @@
+ basic_buffer<Document, Selector>::m_net.reset(new_net());
+ register_signal_handlers();
+
+- net6_server().reopen(port);
++ reopen_impl(port);
+
+ // Deserialise file
+ serialise::parser parser;
+@@ -1173,7 +1197,7 @@
+ typename basic_server_buffer<Document, Selector>::base_net_type*
+ basic_server_buffer<Document, Selector>::new_net()
+ {
+- return new net_type(IPV6_ENABLED);
++ return new net_type();
+ }
+
+ template<typename Document, typename Selector>
only in patch2:
unchanged:
--- obby-0.4.1.orig/debian/patches/00list
+++ obby-0.4.1/debian/patches/00list
@@ -0,0 +1 @@
+01-ipv6_fix.dpatch
diff -u gobby-0.4.1/config.sub gobby-0.4.1/config.sub
--- gobby-0.4.1/config.sub
+++ gobby-0.4.1/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff -u gobby-0.4.1/debian/changelog gobby-0.4.1/debian/changelog
--- gobby-0.4.1/debian/changelog
+++ gobby-0.4.1/debian/changelog
@@ -1,3 +1,12 @@
+gobby (0.4.1-2) unstable; urgency=medium
+
+ * Fix mime type mapping.
+ * Lack of avahi-daemon now fails silently instead of a verbose message
+ confusing the user. Zeroconf is a `nice to have' but in no means
+ required.
+
+ -- Philipp Kern <pkern@debian.org> Mon, 12 Mar 2007 19:41:21 +0100
+
gobby (0.4.1-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- gobby-0.4.1.orig/src/preferences.cpp
+++ gobby-0.4.1/src/preferences.cpp
@@ -185,12 +185,12 @@
{
// Default list
add_by_mime_type("*.ada", "text/x-ada", lang_mgr);
- add_by_mime_type("*.c", "text/x-c", lang_mgr);
- add_by_mime_type("*.h", "text/x-c++", lang_mgr);
- add_by_mime_type("*.hh", "text/x-c++", lang_mgr);
- add_by_mime_type("*.cpp", "text/x-c++", lang_mgr);
- add_by_mime_type("*.hpp", "text/x-c++", lang_mgr);
- add_by_mime_type("*.cc", "text/x-c++", lang_mgr);
+ add_by_mime_type("*.c", "text/x-csrc", lang_mgr);
+ add_by_mime_type("*.h", "text/x-chdr", lang_mgr);
+ add_by_mime_type("*.hh", "text/x-c++hdr", lang_mgr);
+ add_by_mime_type("*.cpp", "text/x-c++src", lang_mgr);
+ add_by_mime_type("*.hpp", "text/x-c++hdr", lang_mgr);
+ add_by_mime_type("*.cc", "text/x-c++src", lang_mgr);
add_by_mime_type("*.cs", "text/x-csharp", lang_mgr);
add_by_mime_type("*.css", "text/css", lang_mgr);
add_by_mime_type("*.diff", "text/x-diff", lang_mgr);
@@ -203,25 +203,25 @@
add_by_mime_type("*.xhtml", "text/html", lang_mgr);
add_by_mime_type("*.idl", "text/x-idl", lang_mgr);
add_by_mime_type("*.java", "text/x-java", lang_mgr);
- add_by_mime_type("*.js", "text/x-javascript", lang_mgr);
+ add_by_mime_type("*.js", "application/x-javascript", lang_mgr);
add_by_mime_type("*.tex", "text/x-tex", lang_mgr);
add_by_mime_type("*.latex", "text/x-tex", lang_mgr);
add_by_mime_type("*.lua", "text/x-lua", lang_mgr);
add_by_mime_type("*.dpr", "text/x-pascal", lang_mgr);
add_by_mime_type("*.pas", "text/x-pascal", lang_mgr);
- add_by_mime_type("*.pl", "text/x-perl", lang_mgr);
- add_by_mime_type("*.pm", "text/x-perl", lang_mgr);
- add_by_mime_type("*.php", "text/x-php", lang_mgr);
- add_by_mime_type("*.php3", "text/x-php", lang_mgr);
- add_by_mime_type("*.php4", "text/x-php", lang_mgr);
- add_by_mime_type("*.php5", "text/x-php", lang_mgr);
+ add_by_mime_type("*.pl", "application/x-perl", lang_mgr);
+ add_by_mime_type("*.pm", "application/x-perl", lang_mgr);
+ add_by_mime_type("*.php", "application/x-php", lang_mgr);
+ add_by_mime_type("*.php3", "application/x-php", lang_mgr);
+ add_by_mime_type("*.php4", "application/x-php", lang_mgr);
+ add_by_mime_type("*.php5", "application/x-php", lang_mgr);
add_by_mime_type(
"*.po",
"text/x-gettext-translation",
lang_mgr
);
add_by_mime_type("*.py", "text/x-python", lang_mgr);
- add_by_mime_type("*.rb", "text/x-ruby", lang_mgr);
+ add_by_mime_type("*.rb", "application/x-ruby", lang_mgr);
add_by_mime_type("*.sql", "text/x-sql", lang_mgr);
add_by_mime_type("*.texi", "text/x-texinfo", lang_mgr);
add_by_mime_type("*.bas", "text/x-vb", lang_mgr);
@@ -230,7 +230,7 @@
add_by_mime_type("*.xml", "text/xml", lang_mgr);
add_by_mime_type(
"*.desktop",
- "application/x-gnome-app-info",
+ "application/x-desktop",
lang_mgr
);
add_by_mime_type("*.tcl", "text/x-tcl", lang_mgr);
only in patch2:
unchanged:
--- gobby-0.4.1.orig/src/window.cpp
+++ gobby-0.4.1/src/window.cpp
@@ -179,10 +179,8 @@
}
catch(std::runtime_error&)
{
- display_error(_("Howl initialisation failed. Probably you need "
- "to run mDNSResponder as root prior to Gobby. "
- "Zeroconf support is deactivated for this session."),
- Gtk::MESSAGE_WARNING);
+ // No avahi-daemon, fail silently and deactivate all
+ // zeroconf functionality.
m_zeroconf.reset();
}
#endif
Attachment:
signature.asc
Description: Digital signature