From a502ac12dabb467e8c1f4f1236057076b168827a Mon Sep 17 00:00:00 2001
From: Lennart Poettering
Date: Tue, 14 Apr 2009 02:14:19 +0000
Subject: [PATCH] New upstream release
---
.cvsignore | 2 +-
avahi-0.6.22-update-de.patch | 572 -----------------------------------
avahi-0.6.22-vncviewer.patch | 56 ----
avahi.spec | 7 +-
sources | 2 +-
5 files changed, 7 insertions(+), 632 deletions(-)
delete mode 100644 avahi-0.6.22-update-de.patch
delete mode 100644 avahi-0.6.22-vncviewer.patch
diff --git a/.cvsignore b/.cvsignore
index ea461e5..5fe2e34 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-avahi-0.6.24.tar.gz
+avahi-0.6.25.tar.gz
diff --git a/avahi-0.6.22-update-de.patch b/avahi-0.6.22-update-de.patch
deleted file mode 100644
index 8b5fd6d..0000000
--- a/avahi-0.6.22-update-de.patch
+++ /dev/null
@@ -1,572 +0,0 @@
-diff -ur avahi-0.6.22/po/de.po avahi-0.6.22-update-de/po/de.po
---- avahi-0.6.22/po/de.po 2007-12-17 16:11:38.000000000 +0100
-+++ avahi-0.6.22-update-de/po/de.po 2008-03-03 07:59:55.000000000 +0100
-@@ -1,20 +1,20 @@
- # SOME DESCRIPTIVE TITLE.
- # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR , YEAR.
-+# Fabian Affolter , 2007.
- #
- msgid ""
- msgstr ""
- "Project-Id-Version: Avahi\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2007-12-17 15:52+0100\n"
--"PO-Revision-Date: 2007-12-17 16:11+0100\n"
--"Last-Translator: \n"
--"Language-Team: de\n"
-+"POT-Creation-Date: 2007-12-31 01:39-0700\n"
-+"PO-Revision-Date: 2008-02-17 01:03+0100\n"
-+"Last-Translator: Fabian Affolter \n"
-+"Language-Team: German \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Poedit-Language: de\n"
-+"X-Poedit-Language: German\n"
- "X-Poedit-Country: DE\n"
-
- #: ../avahi-common/error.c:32
-@@ -43,7 +43,7 @@
-
- #: ../avahi-common/error.c:38
- msgid "Invalid DNS TTL"
--msgstr "Ungültige DNS TTL"
-+msgstr "Ungültige DNS-TTL"
-
- #: ../avahi-common/error.c:39
- msgid "Resource record key is pattern"
-@@ -59,11 +59,11 @@
-
- #: ../avahi-common/error.c:43
- msgid "Invalid service name"
--msgstr "Ungültiger Dienstename"
-+msgstr "Ungültiger Dienstname"
-
- #: ../avahi-common/error.c:44
- msgid "Invalid service type"
--msgstr "Ungültiger Dienstetyp"
-+msgstr "Ungültiger Diensttyp"
-
- #: ../avahi-common/error.c:45
- msgid "Invalid port number"
-@@ -99,7 +99,7 @@
-
- #: ../avahi-common/error.c:54
- msgid "Access denied"
--msgstr "Zugriff abgelehnt"
-+msgstr "Zugriff verweigert"
-
- #: ../avahi-common/error.c:55
- msgid "Invalid operation"
-@@ -159,7 +159,7 @@
-
- #: ../avahi-common/error.c:70
- msgid "Invalid DNS return code"
--msgstr "Ungültiger DNS Rückgabewert"
-+msgstr "Ungültiger DNS-Rückgabewert"
-
- #: ../avahi-common/error.c:71
- msgid "DNS failure: FORMERR"
-@@ -171,55 +171,55 @@
-
- #: ../avahi-common/error.c:73
- msgid "DNS failure: NXDOMAIN"
--msgstr ""
-+msgstr "DNS-Fehler: NXDOMAIN"
-
- #: ../avahi-common/error.c:74
- msgid "DNS failure: NOTIMP"
--msgstr ""
-+msgstr "DNS-Fehler: NOTIMP"
-
- #: ../avahi-common/error.c:76
- msgid "DNS failure: REFUSED"
--msgstr ""
-+msgstr "DNS-Fehler: REFUSED"
-
- #: ../avahi-common/error.c:77
- msgid "DNS failure: YXDOMAIN"
--msgstr ""
-+msgstr "DNS-Fehler: YXDOMAIN"
-
- #: ../avahi-common/error.c:78
- msgid "DNS failure: YXRRSET"
--msgstr ""
-+msgstr "DNS-Fehler: YXRRSET"
-
- #: ../avahi-common/error.c:79
- msgid "DNS failure: NXRRSET"
--msgstr ""
-+msgstr "DNS-Fehler: NXRRSET"
-
- #: ../avahi-common/error.c:80
- msgid "DNS failure: NOTAUTH"
--msgstr ""
-+msgstr "DNS-Fehler: NOTAUTH"
-
- #: ../avahi-common/error.c:81
- msgid "DNS failure: NOTZONE"
--msgstr ""
-+msgstr "DNS-Fehler: NOTZONE"
-
- #: ../avahi-common/error.c:82
- msgid "Invalid RDATA"
--msgstr ""
-+msgstr "Ungültige RDATA"
-
- #: ../avahi-common/error.c:83
- msgid "Invalid DNS type"
--msgstr ""
-+msgstr "Ungültiger DNS Typ"
-
- #: ../avahi-common/error.c:84
- msgid "Invalid DNS class"
--msgstr ""
-+msgstr "Ungültige DNS Klasse"
-
- #: ../avahi-common/error.c:85
- msgid "Not supported"
--msgstr ""
-+msgstr "Nicht unterstützt"
-
- #: ../avahi-common/error.c:87
- msgid "Not permitted"
--msgstr ""
-+msgstr "Nicht erlaubt"
-
- #: ../avahi-common/error.c:88
- msgid "Invalid argument"
-@@ -231,7 +231,7 @@
-
- #: ../avahi-common/error.c:90
- msgid "The requested operation is invalid because redundant"
--msgstr ""
-+msgstr "Die angeforderte Operation ist ungültig, da sie doppelt ausgeführt wurde"
-
- #: ../avahi-common/error.c:96
- msgid "Invalid Error Code"
-@@ -240,17 +240,17 @@
- #: ../avahi-ui/avahi-ui.c:326
- #, c-format
- msgid "Avahi client failure: %s"
--msgstr ""
-+msgstr "Avahi-Client-Fehler: %s"
-
- #: ../avahi-ui/avahi-ui.c:388
- #, c-format
- msgid "Avahi resolver failure: %s"
--msgstr ""
-+msgstr "Avahi-Auflösungsfehler: %s"
-
- #: ../avahi-ui/avahi-ui.c:518
- #, c-format
- msgid "Browsing for service type %s in domain %s failed: %s"
--msgstr ""
-+msgstr "Durchsuchen nach Dienst-Typen %s in Domäne %s fehlgeschlagen: %s"
-
- #: ../avahi-ui/avahi-ui.c:519
- #: ../avahi-utils/avahi-browse.c:157
-@@ -263,17 +263,17 @@
- #: ../avahi-ui/avahi-ui.c:649
- #, c-format
- msgid "Avahi domain browser failure: %s"
--msgstr ""
-+msgstr "Avahi-Domänenbrowser-Fehler: %s"
-
- #: ../avahi-ui/avahi-ui.c:684
- #, c-format
- msgid "Failed to read Avahi domain: %s"
--msgstr ""
-+msgstr "Fehler beim Lesen der Avahi-Domäne: %s"
-
- #: ../avahi-ui/avahi-ui.c:717
- #, c-format
- msgid "Failed to connect to Avahi server: %s"
--msgstr ""
-+msgstr "Verbindung zu Avahi-Server fehlgeschlagen: %s"
-
- #: ../avahi-ui/avahi-ui.c:735
- msgid "Browsing for services on local network:"
-@@ -287,25 +287,25 @@
- #: ../avahi-ui/avahi-ui.c:773
- #, c-format
- msgid "Failed to create browser for %s: %s"
--msgstr ""
-+msgstr "Browser-Erzeugung für %s fehlgeschlagen: %s"
-
- #: ../avahi-ui/avahi-ui.c:903
- #, c-format
- msgid "Failed to create resolver for %s of type %s in domain %s: %s"
--msgstr ""
-+msgstr "Auslöser-Erzeugung für %s vom Typ %s in Domäne %s fehlgeschlagen: %s"
-
- #: ../avahi-ui/avahi-ui.c:978
- #, c-format
- msgid "Failed to create domain browser: %s"
--msgstr ""
-+msgstr "Domänenbrowser-Erzeugung fehlgeschlagen: %s"
-
- #: ../avahi-ui/avahi-ui.c:989
- msgid "Change domain"
--msgstr "Domäne Ändern"
-+msgstr "Domäne ändern"
-
- #: ../avahi-ui/avahi-ui.c:1021
- msgid "Service Name"
--msgstr "Dienstename"
-+msgstr "Dienstname"
-
- #: ../avahi-ui/avahi-ui.c:1029
- #: ../avahi-ui/avahi-ui.c:1160
-@@ -320,38 +320,37 @@
- msgid "_Domain..."
- msgstr "_Domäne..."
-
--#: ../avahi-ui/bssh.c:50
-+#: ../avahi-ui/bssh.c:51
- msgid "Choose Shell Server"
- msgstr "Shell-Dienst Auswählen"
-
--#: ../avahi-ui/bssh.c:52
-+#: ../avahi-ui/bssh.c:53
- msgid "Desktop"
- msgstr "Arbeitsplatz"
-
--#: ../avahi-ui/bssh.c:53
-+#: ../avahi-ui/bssh.c:54
- msgid "Terminal"
- msgstr "Terminal"
-
--#: ../avahi-ui/bssh.c:55
-+#: ../avahi-ui/bssh.c:56
- msgid "Choose VNC server"
--msgstr "VNC-Dienst Auswählen"
-+msgstr "VNC-Dienst auswählen"
-
--#: ../avahi-ui/bssh.c:58
-+#: ../avahi-ui/bssh.c:59
- msgid "Choose SSH server"
--msgstr "SSH-Dienst Auswählen"
-+msgstr "SSH-Dienst auswählen"
-
--#: ../avahi-ui/bssh.c:80
-+#: ../avahi-ui/bssh.c:81
- #, c-format
- msgid "Connecting to '%s' ...\n"
- msgstr "Verbinde zu '%s' ...\n"
-
--#: ../avahi-ui/bssh.c:134
-+#: ../avahi-ui/bssh.c:135
- #, c-format
- msgid "execlp() failed: %s\n"
- msgstr "execlp() fehlgeschlagen: %s\n"
-
--#: ../avahi-ui/bssh.c:144
--#, c-format
-+#: ../avahi-ui/bssh.c:145
- msgid "Canceled.\n"
- msgstr "Abgebrochen.\n"
-
-@@ -369,32 +368,32 @@
- #: ../avahi-utils/avahi-browse.c:245
- #, c-format
- msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"
--msgstr ""
-+msgstr "Fehler beim Auflösen des Dienstes '%s' des Typ '%s' in Domäne '%s': %s\n"
-
- #: ../avahi-utils/avahi-browse.c:324
- #, c-format
- msgid "service_browser failed: %s\n"
--msgstr ""
-+msgstr "service_browser fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:362
- #, c-format
- msgid "avahi_service_browser_new() failed: %s\n"
--msgstr ""
-+msgstr "avahi_service_browser_new() fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:398
- #, c-format
- msgid "service_type_browser failed: %s\n"
--msgstr ""
-+msgstr "service_type_browser fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:428
- #, c-format
- msgid "avahi_service_type_browser_new() failed: %s\n"
--msgstr ""
-+msgstr "avahi_service_type_browser_new() fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:503
- #, c-format
- msgid "avahi_domain_browser_new() failed: %s\n"
--msgstr ""
-+msgstr "avahi_domain_browser_new() fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:519
- #: ../avahi-utils/avahi-publish.c:391
-@@ -402,7 +401,7 @@
- #: ../avahi-utils/avahi-set-host-name.c:170
- #, c-format
- msgid "Failed to query version string: %s\n"
--msgstr ""
-+msgstr "Versionsstring-Abfrage fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:524
- #: ../avahi-utils/avahi-publish.c:396
-@@ -411,7 +410,7 @@
- #: ../avahi-utils/avahi-set-host-name.c:191
- #, c-format
- msgid "Failed to query host name: %s\n"
--msgstr ""
-+msgstr "Hostname-Abfrage fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:528
- #: ../avahi-utils/avahi-publish.c:400
-@@ -424,27 +423,27 @@
- #: ../avahi-utils/avahi-browse.c:531
- #, c-format
- msgid "E Ifce Prot Domain\n"
--msgstr ""
-+msgstr "E Ifce Prot-Domäne\n"
-
- #: ../avahi-utils/avahi-browse.c:533
- #, c-format
- msgid "E Ifce Prot %-*s %-20s Domain\n"
--msgstr ""
-+msgstr "E Ifce Prot %-*s %-20s-Domäne\n"
-
- #: ../avahi-utils/avahi-browse.c:533
- msgid "Name"
--msgstr ""
-+msgstr "Name"
-
- #: ../avahi-utils/avahi-browse.c:533
- msgid "Type"
--msgstr ""
-+msgstr "Typ"
-
- #. We have been disconnected, so let reconnect
- #: ../avahi-utils/avahi-browse.c:564
- #: ../avahi-utils/avahi-publish.c:165
- #, c-format
- msgid "Disconnected, reconnecting ...\n"
--msgstr ""
-+msgstr "Nicht verbunden, neu verbinden ...\n"
-
- #: ../avahi-utils/avahi-browse.c:578
- #: ../avahi-utils/avahi-browse.c:808
-@@ -454,7 +453,7 @@
- #: ../avahi-utils/avahi-set-host-name.c:162
- #, c-format
- msgid "Failed to create client object: %s\n"
--msgstr ""
-+msgstr "Clientobjekt-Erzeugung fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:583
- #: ../avahi-utils/avahi-publish.c:177
-@@ -462,13 +461,13 @@
- #: ../avahi-utils/avahi-set-host-name.c:61
- #, c-format
- msgid "Client failure, exiting: %s\n"
--msgstr ""
-+msgstr "Client-Fehler, verlassen: %s\n"
-
- #: ../avahi-utils/avahi-browse.c:602
- #: ../avahi-utils/avahi-publish.c:208
- #, c-format
- msgid "Waiting for daemon ...\n"
--msgstr ""
-+msgstr "Warte auf Daemon ...\n"
-
- #: ../avahi-utils/avahi-browse.c:626
- msgid ""
-@@ -485,18 +484,32 @@
- " -f --no-fail Don't fail if the daemon is not available\n"
- " -p --parsable Output in parsable format\n"
- msgstr ""
-+" -h --help Zeigt diese Hilfe an\n"
-+" -V --version Zeigt die Version an\n"
-+" -D --browse-domains Durchsuche nach suchenden Domäne statt nach Diensten\n"
-+" -a --all Zeigt alle Dienste, ohne Rücksicht auf die Typen\n"
-+" -d --domain=DOMAIN Die Domäne zum Durchsuchen\n"
-+" -v --verbose Aktiviert detaillierten Modus\n"
-+" -t --terminate Beenden nach Ausgeben einer mehr oder weniger kompletten Liste\n"
-+" -c --cache Beenden nach Ausgeben aller Einträge aus dem Cache\n"
-+" -l --ignore-local Ignoriere lokale Dienste\n"
-+" -r --resolve Löse gefundene Dienste auf\n"
-+" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar ist\n"
-+" -p --parsable Ausgabe in parsbaren Format\n"
-
- #: ../avahi-utils/avahi-browse.c:639
- msgid ""
- " -k --no-db-lookup Don't lookup service types\n"
- " -b --dump-db Dump service type database\n"
- msgstr ""
-+" -k --no-db-lookup Schlage Dienst-Typen nicht nach\n"
-+" -b --dump-db Anzeigen der Dienst-Typen-Datenbank\n"
-
- #: ../avahi-utils/avahi-browse.c:745
- #: ../avahi-utils/avahi-resolve.c:221
- #, c-format
- msgid "Too few arguments\n"
--msgstr "Zu viele Argumente\n"
-+msgstr "Zu wenige Argumente\n"
-
- #: ../avahi-utils/avahi-browse.c:754
- #, c-format
-@@ -509,7 +522,7 @@
- #: ../avahi-utils/avahi-set-host-name.c:154
- #, c-format
- msgid "Failed to create simple poll object.\n"
--msgstr ""
-+msgstr "Fehler beim Erzeugen eines einfachen Abfrage-Objekts: \n"
-
- #: ../avahi-utils/avahi-publish.c:78
- #, c-format
-@@ -519,37 +532,37 @@
- #: ../avahi-utils/avahi-publish.c:83
- #, c-format
- msgid "Failed to register: %s\n"
--msgstr ""
-+msgstr "Registrierung fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-publish.c:96
- #, c-format
- msgid "Name collision, picking new name '%s'.\n"
--msgstr ""
-+msgstr "Namenskollision, wähle neuen Name '%s'.\n"
-
- #: ../avahi-utils/avahi-publish.c:116
- #, c-format
- msgid "Failed to create entry group: %s\n"
--msgstr ""
-+msgstr "Fehler bei der Erzeugung der Einstiegsgruppe: %s\n"
-
- #: ../avahi-utils/avahi-publish.c:126
- #, c-format
- msgid "Failed to add address: %s\n"
--msgstr ""
-+msgstr "Fehler beim Hinzufügen der Adresse: %s\n"
-
- #: ../avahi-utils/avahi-publish.c:136
- #, c-format
- msgid "Failed to add service: %s\n"
--msgstr ""
-+msgstr "Fehler beim Hinzufügen des Dienstes: %s\n"
-
- #: ../avahi-utils/avahi-publish.c:142
- #, c-format
- msgid "Failed to add subtype '%s': %s\n"
--msgstr ""
-+msgstr "Fehler beim Hinzufügen des Untertyps: '%s': %s\n"
-
- #: ../avahi-utils/avahi-publish.c:193
- #, c-format
- msgid "Host name conflict\n"
--msgstr ""
-+msgstr "Hostname-Konflikt\n"
-
- #: ../avahi-utils/avahi-publish.c:218
- #, c-format
-@@ -567,6 +580,18 @@
- " --subtype=SUBTYPE An additional subtype to register this service with\n"
- " -f --no-fail Don't fail if the daemon is not available\n"
- msgstr ""
-+"%s [options] %s []\n"
-+"%s [options] %s \n"
-+"\n"
-+" -h --help Zeigt diese Hilfe an\n"
-+" -V --version Zeigt die Version an\n"
-+" -s --service Veröffentlicht Service\n"
-+" -a --address Veröffentlicht Addresse\n"
-+" -v --verbose Aktiviert detaillierten Modus\n"
-+" -d --domain=DOMAIN Domain zum Veröffentlichen des Dienstes auf\n"
-+" -H --host=DOMAIN Host, wo sich der Service befindet\n"
-+" --subtype=SUBTYPE Ein zusätzlicher Untertyp zum Registrieren des Dienstes mit\n"
-+" -f --no-fail Schlägt nicht fehl, wenn der Daemon nicht verfügbar ist\n"
-
- #: ../avahi-utils/avahi-publish.c:300
- #: ../avahi-utils/avahi-publish.c:315
-@@ -577,7 +602,7 @@
- #: ../avahi-utils/avahi-publish.c:326
- #, c-format
- msgid "Failed to parse port number: %s\n"
--msgstr ""
-+msgstr "Parsen der Port-Nummer fehlgeschlagen: %s\n"
-
- #: ../avahi-utils/avahi-publish.c:358
- #: ../avahi-utils/avahi-resolve.c:248
-@@ -588,12 +613,12 @@
- #: ../avahi-utils/avahi-resolve.c:91
- #, c-format
- msgid "Failed to resolve host name '%s': %s\n"
--msgstr ""
-+msgstr "Fehler beim Auflösen des Hostnamens '%s': %s\n"
-
- #: ../avahi-utils/avahi-resolve.c:128
- #, c-format
- msgid "Failed to resolve address '%s': %s\n"
--msgstr ""
-+msgstr "Fehler beim Auflösen der Adresse '%s': %s\n"
-
- #: ../avahi-utils/avahi-resolve.c:159
- #, c-format
-@@ -609,22 +634,32 @@
- " -6 Lookup IPv6 address\n"
- " -4 Lookup IPv4 address\n"
- msgstr ""
-+"%s [options] %s \n"
-+"%s [options] %s \n"
-+"\n"
-+" -h --help Zeigt diese Hilfe an\n"
-+" -V --version Zeigt die Version an\n"
-+" -n --name Löst Hostname auf\n"
-+" -a --address Löst Addresse auf\n"
-+" -v --verbose Aktiviert detaillierten Modus\n"
-+" -6 Schlägt IPv6-Addresse nach\n"
-+" -4 Schlägt IPv4-Addresse nach\n"
-
- #: ../avahi-utils/avahi-resolve.c:301
- #: ../avahi-utils/avahi-set-host-name.c:183
- #, c-format
- msgid "Failed to create host name resolver: %s\n"
--msgstr ""
-+msgstr "Fehler beim Erzeugen des Hostnamen-Auflösers: %s\n"
-
- #: ../avahi-utils/avahi-resolve.c:311
- #, c-format
- msgid "Failed to parse address '%s'\n"
--msgstr ""
-+msgstr "Fehler beim Parsen der Adresse '%s'\n"
-
- #: ../avahi-utils/avahi-resolve.c:316
- #, c-format
- msgid "Failed to create address resolver: %s\n"
--msgstr ""
-+msgstr "Fehler beim Erzeugen des Adress-Auflösers: %s\n"
-
- #: ../avahi-utils/avahi-set-host-name.c:75
- #, c-format
-@@ -635,6 +670,11 @@
- " -V --version Show version\n"
- " -v --verbose Enable verbose mode\n"
- msgstr ""
-+"%s [options] \n"
-+"\n"
-+" -h --help Zeigt diese Hilfe an\n"
-+" -V --version Zeigt die Version an\n"
-+" -v --verbose Aktiviert detaillierten Modus\n"
-
- #: ../avahi-utils/avahi-set-host-name.c:116
- #, c-format
-@@ -644,5 +684,5 @@
- #: ../avahi-utils/avahi-set-host-name.c:195
- #, c-format
- msgid "Host name successfully changed to %s\n"
--msgstr ""
-+msgstr "Hostname erfolgreich geändert auf %s\n"
-
diff --git a/avahi-0.6.22-vncviewer.patch b/avahi-0.6.22-vncviewer.patch
deleted file mode 100644
index 3628ec9..0000000
--- a/avahi-0.6.22-vncviewer.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-VNC viewer binary in Fedora is vncviewer, not xvncviewer
-(Lubomir Kundrak )
-
-diff -urp avahi-0.6.22.orig/avahi-ui/bssh.c avahi-0.6.22/avahi-ui/bssh.c
---- avahi-0.6.22.orig/avahi-ui/bssh.c 2007-12-17 16:12:57.000000000 +0100
-+++ avahi-0.6.22/avahi-ui/bssh.c 2007-12-18 11:46:15.000000000 +0100
-@@ -86,8 +86,8 @@ int main(int argc, char*argv[]) {
-
- gtk_widget_destroy(d);
-
-- g_print("xvncviewer %s\n", p);
-- execlp("xvncviewer", "xvncviewer", p, NULL);
-+ g_print("vncviewer %s\n", p);
-+ execlp("vncviewer", "vncviewer", p, NULL);
-
- } else {
- char p[16];
-diff -urp avahi-0.6.22.orig/man/bssh.1 avahi-0.6.22/man/bssh.1
---- avahi-0.6.22.orig/man/bssh.1 2007-12-17 16:40:46.000000000 +0100
-+++ avahi-0.6.22/man/bssh.1 2007-12-18 11:46:56.000000000 +0100
-@@ -7,12 +7,12 @@ bssh/bvnc \- Browse for SSH/VNC servers
- bvnc
- \f1
- .SH DESCRIPTION
--bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/xvncviewer after a selection was made.
-+bssh/bvnc browses for local SSH/VNC servers on the local network, shows them in a GUI for the user to select one and finally calls ssh/vncviewer after a selection was made.
- .SH OPTIONS
- bssh/bvnc takes no command line arguments at the moment.
- .SH AUTHORS
- The Avahi Developers ; Avahi is available from \fBhttp://avahi.org/\f1
- .SH SEE ALSO
--\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBxvncviewer(1)\f1
-+\fBavahi-browse(1)\f1, \fBssh(1)\f1, \fBvncviewer(1)\f1
- .SH COMMENTS
- This man page was written using \fBxml2man(1)\f1 by Oliver Kurth.
-diff -urp avahi-0.6.22.orig/man/bssh.1.xml.in avahi-0.6.22/man/bssh.1.xml.in
---- avahi-0.6.22.orig/man/bssh.1.xml.in 2007-09-03 14:32:47.000000000 +0200
-+++ avahi-0.6.22/man/bssh.1.xml.in 2007-12-18 11:46:40.000000000 +0100
-@@ -33,7 +33,7 @@
-
- bssh/bvnc browses for local SSH/VNC servers on the local
- network, shows them in a GUI for the user to select one and
-- finally calls ssh/xvncviewer after a selection was made.
-+ finally calls ssh/vncviewer after a selection was made.
-
-
-
-@@ -50,7 +50,7 @@
-
-
-
diff --git a/avahi.spec b/avahi.spec
index ff3b6bf..91a8525 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -5,8 +5,8 @@
%define WITH_MONO 0
%endif
Name: avahi
-Version: 0.6.24
-Release: 2%{?dist}
+Version: 0.6.25
+Release: 1%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPLv2
@@ -559,6 +559,9 @@ fi
%endif
%changelog
+* Mon Apr 13 2009 Lennart Poettering - 0.6.25-1
+- New upstream release
+
* Mon Feb 23 2009 Fedora Release Engineering - 0.6.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index 2c099b5..d5f8ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-068c1d220b07037e64caf87d4a7a0504 avahi-0.6.24.tar.gz
+a83155a6e29e3988f07e5eea3287b21e avahi-0.6.25.tar.gz