diff options
| author | Mark Purcell <msp@debian.org> | 2008-09-05 19:49:21 +1000 |
|---|---|---|
| committer | etobi <git@e-tobi.net> | 2013-09-03 09:48:43 +0200 |
| commit | 174c5adb5812a68a12292e86e662ee0fadb58b72 (patch) | |
| tree | 94a9b0abc30bef900d56642e83a1806236656228 | |
| parent | f64874fc310047c474f3c97ab6cea089f42adb1f (diff) | |
| download | linux-dvb-apps-174c5adb5812a68a12292e86e662ee0fadb58b72.tar.gz | |
Imported Debian patch 1.1.1+rev1207-3debian/1.1.1+rev1207-3
Diffstat (limited to '')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | 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@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@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@lists.alioth.debian.org> -Uploaders: Thomas Schmidt <tschmidt@debian.org>, Mark Purcell <msp@debian.org> +Uploaders: Thomas Schmidt <tschmidt@debian.org>, Mark Purcell <msp@debian.org>, Tobias Grimm <tg@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. |