r7402 - in /dvb/linuxtv-dvb-apps/trunk/debian: changelog control

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Thu Sep  4 19:48:15 2008
New Revision: 7402

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7402
Log:
* Conflict with libxbase2.0-bin, libxdb-dev because of `/usr/bin/zap' which is
  also in those packages (Closes: #492141)
* Added Tobias Grimm <tg at e-tobi.net> to uploaders

Modified:
    dvb/linuxtv-dvb-apps/trunk/debian/changelog
    dvb/linuxtv-dvb-apps/trunk/debian/control

Modified: dvb/linuxtv-dvb-apps/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/changelog?rev=7402&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog Thu Sep  4 19:48:15 2008
@@ -1,3 +1,11 @@
+linuxtv-dvb-apps (1.1.1+rev1207-3) unstable; urgency=low
+
+  * Conflict with libxbase2.0-bin, libxdb-dev because of `/usr/bin/zap' which is
+    also in those packages (Closes: #492141)
+  * Added Tobias Grimm <tg at e-tobi.net> to uploaders
+
+ -- Tobias Grimm <tg at e-tobi.net>  Thu, 04 Sep 2008 21:47:28 +0200
+
 linuxtv-dvb-apps (1.1.1+rev1207-2) unstable; urgency=low
 
   * Urgency medium for RC bug

Modified: dvb/linuxtv-dvb-apps/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/debian/control?rev=7402&op=diff
==============================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/control (original)
+++ dvb/linuxtv-dvb-apps/trunk/debian/control Thu Sep  4 19:48:15 2008
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> 
-Uploaders: Thomas Schmidt <tschmidt at debian.org>, Mark Purcell <msp at debian.org>
+Uploaders: Thomas Schmidt <tschmidt at debian.org>, Mark Purcell <msp at debian.org>, Tobias Grimm <tg at e-tobi.net>
 Build-Depends: debhelper (>> 4.0.0), cdbs, dpatch (>= 2.0.9)
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/dvb/linuxtv-dvb-apps/trunk/
@@ -13,6 +13,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>=2.3.1-66) | udev
 Replaces: dvb-utils
+Conflicts: libxbase2.0-bin, libxdb-dev
 Description: Digitial Video Broadcasting (DVB) applications
  Applications and utilities geared towards the initial setup, testing
  and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T,