[Pkg-utopia-commits] r1466 - in /packages/unstable/avahi/debian: changelog libavahi-ui0.install libavahi-ui0.links patches/25_avahi_fix_desktop_files.patch rules

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Thu May  3 17:08:23 2007
New Revision: 1466

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1466
Log:
* debian/rules, debian/libavahi-ui0.links: Rename zssh and zvnc to bssh and
  bvnc. Upstream will have this renaming in their next release 
  (Closes: #421473)

Added:
    packages/unstable/avahi/debian/libavahi-ui0.links
Modified:
    packages/unstable/avahi/debian/changelog
    packages/unstable/avahi/debian/libavahi-ui0.install
    packages/unstable/avahi/debian/patches/25_avahi_fix_desktop_files.patch
    packages/unstable/avahi/debian/rules

Modified: packages/unstable/avahi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/changelog?rev=1466&op=diff
==============================================================================
--- packages/unstable/avahi/debian/changelog (original)
+++ packages/unstable/avahi/debian/changelog Thu May  3 17:08:23 2007
@@ -4,8 +4,11 @@
     stopped daemon (Closes: #421928)
   * debian/avahi-daemon-check-dns.sh: Explicitly set $PATH so programs in
     /usr/bin are also found (Closes: #421360)
-
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 03 May 2007 13:11:53 +0200
+  * debian/rules, debian/libavahi-ui0.links: Rename zssh and zvnc to bssh and
+    bvnc. Upstream will have this renaming in their next release 
+    (Closes: #421473)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 03 May 2007 19:06:17 +0200
 
 avahi (0.6.18-4) unstable; urgency=low
 

Modified: packages/unstable/avahi/debian/libavahi-ui0.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/libavahi-ui0.install?rev=1466&op=diff
==============================================================================
--- packages/unstable/avahi/debian/libavahi-ui0.install (original)
+++ packages/unstable/avahi/debian/libavahi-ui0.install Thu May  3 17:08:23 2007
@@ -1,5 +1,4 @@
 debian/tmp/usr/lib/libavahi-ui.so.*
 debian/tmp/usr/bin/zssh
-debian/tmp/usr/bin/zvnc
 debian/tmp/usr/share/applications/zssh.desktop
 debian/tmp/usr/share/applications/zvnc.desktop

Added: packages/unstable/avahi/debian/libavahi-ui0.links
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/libavahi-ui0.links?rev=1466&op=file
==============================================================================
--- packages/unstable/avahi/debian/libavahi-ui0.links (added)
+++ packages/unstable/avahi/debian/libavahi-ui0.links Thu May  3 17:08:23 2007
@@ -1,0 +1,1 @@
+usr/bin/bssh usr/bin/bvnc

Modified: packages/unstable/avahi/debian/patches/25_avahi_fix_desktop_files.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/patches/25_avahi_fix_desktop_files.patch?rev=1466&op=diff
==============================================================================
--- packages/unstable/avahi/debian/patches/25_avahi_fix_desktop_files.patch (original)
+++ packages/unstable/avahi/debian/patches/25_avahi_fix_desktop_files.patch Thu May  3 17:08:23 2007
@@ -2,7 +2,12 @@
 ===================================================================
 --- avahi-ui/zssh.desktop.in	(revision 1453)
 +++ avahi-ui/zssh.desktop.in	(working copy)
-@@ -7,6 +7,6 @@
+@@ -3,10 +3,10 @@
+ Encoding=UTF-8
+ Name=Avahi SSH Server Browser
+ Comment=Browse for Zeroconf-enabled SSH Servers
+-Exec=@bindir@/zssh
++Exec=@bindir@/bssh
  Terminal=false
  Type=Application
  Icon=network-wired
@@ -14,7 +19,12 @@
 ===================================================================
 --- avahi-ui/zvnc.desktop.in	(revision 1453)
 +++ avahi-ui/zvnc.desktop.in	(working copy)
-@@ -7,6 +7,6 @@
+@@ -3,10 +3,10 @@
+ Encoding=UTF-8
+ Name=Avahi VNC Server Browser
+ Comment=Browse for Zeroconf-enabled VNC Servers
+-Exec=@bindir@/zvnc
++Exec=@bindir@/bvnc
  Terminal=false
  Type=Application
  Icon=network-wired

Modified: packages/unstable/avahi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/avahi/debian/rules?rev=1466&op=diff
==============================================================================
--- packages/unstable/avahi/debian/rules (original)
+++ packages/unstable/avahi/debian/rules Thu May  3 17:08:23 2007
@@ -62,6 +62,14 @@
 	install -D -o root -g root -m 755 debian/avahi-daemon-check-dns.sh \
 		debian/$(cdbs_curpkg)/usr/lib/avahi/avahi-daemon-check-dns.sh
 
+binary-fixup/libavahi-ui0::
+	mv debian/$(cdbs_curpkg)/usr/share/applications/zvnc.desktop \
+	  debian/$(cdbs_curpkg)/usr/share/applications/bvnc.desktop
+	mv debian/$(cdbs_curpkg)/usr/share/applications/zssh.desktop \
+	  debian/$(cdbs_curpkg)/usr/share/applications/bssh.desktop
+	mv debian/$(cdbs_curpkg)/usr/bin/zssh \
+	  debian/$(cdbs_curpkg)/usr/bin/bssh
+
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 common-install-impl::
 	mv $(DEB_DESTDIR)/etc/dhcp3/dhclient-exit-hooks.d/avahi-autoipd \