[linuxtv-dvb-apps] 15/30: Imported Debian patch 1.1.1+rev1207-3

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.

commit 174c5adb5812a68a12292e86e662ee0fadb58b72
Author: Mark Purcell <msp at debian.org>
Date:   Fri Sep 5 19:49:21 2008 +1000

    Imported Debian patch 1.1.1+rev1207-3
---
 debian/changelog |   15 +++++++++++++++
 debian/control   |    8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c004dbe..3699abc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+linuxtv-dvb-apps (1.1.1+rev1207-3) unstable; urgency=medium
+
+  [ Tobias Grimm ]
+  * 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
+  * Urgency medium for RC bug
+
+  [ Mark Purcell ]
+  * dvb-utils Decsription: mention etch to lenny transitions
+  * Conflicts: me-tv (<< 0.5.33-2)
+    - must conflict against me-tv (<< 0.5.33-2) (Closes: #496557)
+
+ -- Mark Purcell <msp at debian.org>  Fri, 05 Sep 2008 19:49:21 +1000
+
 linuxtv-dvb-apps (1.1.1+rev1207-2) unstable; urgency=low
 
   * Urgency medium for RC bug
diff --git a/debian/control b/debian/control
index 9ceccdb..792995c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: linuxtv-dvb-apps
 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 @@ Package: dvb-apps
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>=2.3.1-66) | udev
 Replaces: dvb-utils
+Conflicts: libxbase2.0-bin, libxdb-dev, me-tv (<< 0.5.33-2)
 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,
@@ -46,6 +47,7 @@ Description: Digitial Video Broadcasting (DVB) applications
 Package: dvb-utils
 Architecture: all
 Depends: dvb-apps
-Description: transitional dummy package
- Transitional dummy package.
+Description: transitional dummy package for Debian etch
+ This package is provided to smooth upgrades from Debian 4.0 ("etch") to Debian
+ lenny. It may be safely removed from your system.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/linuxtv-dvb-apps.git