[Pkg-voip-commits] r7784 - in /mumble/trunk/debian: changelog mumble-11x.menu rules

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Wed Nov 11 18:07:09 2009
New Revision: 7784

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7784
Log:
* Also install the menu icon for the mumble-11x package.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/mumble-11x.menu
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7784&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Wed Nov 11 18:07:09 2009
@@ -4,6 +4,7 @@
   * Do not build with missing libcap2-dev on kfreebsd-*.
   * Merge 1.1.8-3 and 1.1.8-4 changelog.
   * Merge remaining changes from the 1.1.8 branch.
+  * Also install the menu icon for the mumble-11x package.
 
   [ Thorvald Natvig ]
   * New upstream release.
@@ -11,7 +12,7 @@
   * Update dependencies.
   * Let the qmake script find the celt/speex libraries on its own.
 
- -- Thorvald Natvig <slicer at users.sourceforge.net>  Wed, 11 Nov 2009 00:58:12 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Nov 2009 19:04:46 +0100
 
 mumble (1.2.0~200910141302-8af721-1) experimental; urgency=low
 

Modified: mumble/trunk/debian/mumble-11x.menu
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-11x.menu?rev=7784&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-11x.menu (original)
+++ mumble/trunk/debian/mumble-11x.menu Wed Nov 11 18:07:09 2009
@@ -1,4 +1,4 @@
 ?package(mumble-11x):needs="X11" section="Applications/Network/Communication"\
  title="Mumble (1.1.x)"\
  description="Mumble voice chat client."\
- command="/usr/bin/mumble11x" icon="/usr/share/pixmaps/mumble.xpm"
+ command="/usr/bin/mumble11x" icon="/usr/share/pixmaps/mumble11x.xpm"

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=7784&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Wed Nov 11 18:07:09 2009
@@ -79,6 +79,8 @@
 	# install mumble files that need to be renamed.
 	install -m 0644 -D ./scripts/murmur.conf $(CURDIR)/debian/mumble-server/etc/dbus-1/system.d/mumble-server.conf
 	install -m 0644 -D ./scripts/murmur.ini.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
+	# Also install an menu icon for mumble-11x.
+	install -m 0644 -D ./icons/mumble.xpm $(CURDIR)/debian/mumble-11x/usr/share/pixmaps/mumble11x.xpm
 ifeq ($(DEB_BUILD_ARCH), amd64)
 	install -m 0755 -d $(CURDIR)/debian/mumble/usr/lib32/mumble
 	cp -dp ./release-32/libmumble.so* $(CURDIR)/debian/mumble/usr/lib32/mumble/