[Pkg-voip-commits] r7535 - in /mumble-django/trunk/debian: changelog control

[svedrin-guest at alioth.debian.org]

Author: svedrin-guest
Date: Tue Aug 18 21:45:47 2009
New Revision: 7535

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7535
Log:
Add "Conflicts:" entry for mumble-server-web <1.2.0 due to an URL clash that
has been fixed in 1.2.0.

Modified:
    mumble-django/trunk/debian/changelog
    mumble-django/trunk/debian/control

Modified: mumble-django/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/changelog?rev=7535&op=diff
==============================================================================
--- mumble-django/trunk/debian/changelog (original)
+++ mumble-django/trunk/debian/changelog Tue Aug 18 21:45:47 2009
@@ -6,8 +6,10 @@
   [ Michael Ziegler ]
   * Add translation files
   * Add Munin plugin
+  * Add "Conflicts:" entry for mumble-server-web <1.2.0 due to an URL clash that
+    has been fixed in 1.2.0.
 
- -- Michael Ziegler <diese-addy at funzt-halt.net>  Mon, 17 Aug 2009 19:41:45 +0200
+ -- Michael Ziegler <diese-addy at funzt-halt.net>  Tue, 18 Aug 2009 23:45:00 +0200
 
 mumble-django (0.9-1) unstable; urgency=low
 

Modified: mumble-django/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble-django/trunk/debian/control?rev=7535&op=diff
==============================================================================
--- mumble-django/trunk/debian/control (original)
+++ mumble-django/trunk/debian/control Tue Aug 18 21:45:47 2009
@@ -32,6 +32,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-django (>= 1.0), libapache2-mod-wsgi (>= 2.3), python-django-registration (>= 0.7), python-django-mumble (>= 0.9)
 Suggests: munin-node
+Conflicts: mumble-server-web (< 1.2.0)
 Description: A Mumble-Server web interface
  mumble-django is a Django web interface application that configures a
  Murmur server. It is able to create and remove vservers, start/stop them,