[Pkg-voip-commits] r8874 - in /mumble/trunk/debian: changelog control mumble-11x.install mumble-11x.manpages mumble-11x.menu patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch patches/0002-remove-opengl-for-client patches/series rules

[thorvald at alioth.debian.org]

Author: thorvald
Date: Fri Apr 15 05:35:00 2011
New Revision: 8874

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8874
Log:
* Experimental upstream release.
* Remove 11x package, as source no longer contains it.

Removed:
    mumble/trunk/debian/mumble-11x.install
    mumble/trunk/debian/mumble-11x.manpages
    mumble/trunk/debian/mumble-11x.menu
    mumble/trunk/debian/patches/0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
    mumble/trunk/debian/patches/0002-remove-opengl-for-client
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/patches/series
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=8874&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Fri Apr 15 05:35:00 2011
@@ -1,3 +1,10 @@
+mumble (1.2.3-91-g05d91c1-1) UNRELEASED; urgency=low
+
+  * Experimental upstream release.
+  * Remove 11x package, as source no longer contains it.
+
+ -- Thorvald Natvig <thorvald at debian.org>  Fri, 15 Apr 2011 06:35:05 +0200
+
 mumble (1.2.3-2) unstable; urgency=low
 
   * Prefer libboost1.46-dev to libboost-dev.

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=8874&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Fri Apr 15 05:35:00 2011
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 7.0.8), po-debconf,
  libboost1.46-dev | libboost-dev (>= 1.42.0),
  libboost-python1.46-dev | libboost-python-dev (>= 1.42.0),
- libqt4-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0),
+ libqt4-dev (>= 4.5.0), 
+ libgl1-mesa-dev | libgl-dev,
  libasound2-dev, libpulse-dev [!hurd-i386],
  libogg-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev (>= 0.7.0), libsndfile1-dev,
  libssl-dev,
@@ -27,7 +28,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcelt0 (>= 0.7.0) | libcelt0-0 (>= 0.7.1~), libqt4-sql-sqlite, lsb-release
 Recommends: speech-dispatcher
-Suggests: mumble-server, mumble-11x
+Suggests: mumble-server
 Description: Low latency VoIP client
  Mumble is a low-latency, high quality voice chat program for gaming. It
  features noise suppression, automatic gain control and low latency audio
@@ -36,21 +37,6 @@
  Mumble is just a client and uses a non-standard protocol. You will need
  a dedicated server to talk to other users. Server functionality is
  provided by the package "mumble-server".
-
-Package: mumble-11x
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, lsb-release, mumble (= ${binary:Version})
-Description: Low latency VoIP client (1.1.x)
- Mumble is a low-latency, high quality voice chat program for gaming. It
- features noise suppression, automatic gain control and low latency audio
- with support for multiple audio standards. Mumble includes an in-game
- overlay compatible with most open-source and commercial 3D applications.
- Mumble is just a client and uses a non-standard protocol. You will need
- a dedicated server to talk to other users. Server functionality is
- provided by the package "mumble-server".
- .
- This is the 1.1.x compatible client for Mumble, used to connect to older
- servers.
 
 Package: mumble-server
 Architecture: any

Modified: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=8874&op=diff
==============================================================================
--- mumble/trunk/debian/patches/series (original)
+++ mumble/trunk/debian/patches/series Fri Apr 15 05:35:00 2011
@@ -1,2 +1,0 @@
-0001-Set-the-correct-pulse-audio-properties-for-the-icon-.patch
-0002-remove-opengl-for-client

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=8874&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Fri Apr 15 05:35:00 2011
@@ -81,8 +81,6 @@
 	# 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/