[linuxtv-dvb-apps] 14/30: Imported Debian patch 1.1.1+rev1207-2

[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 f64874fc310047c474f3c97ab6cea089f42adb1f
Author: Mark Purcell <msp at debian.org>
Date:   Sun Jun 22 16:32:39 2008 +1000

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

diff --git a/debian/changelog b/debian/changelog
index 90770e2..c004dbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linuxtv-dvb-apps (1.1.1+rev1207-2) unstable; urgency=low
+
+  * Urgency medium for RC bug
+  * Package: dvb-utils - Tranistional dummy package
+    - No transitional package for dvb-utils (Closes: #494012)
+
+ -- Mark Purcell <msp at debian.org>  Sun, 22 Jun 2008 16:32:39 +1000
+
 linuxtv-dvb-apps (1.1.1+rev1207-1) unstable; urgency=low
 
   [ Mark Purcell ]
diff --git a/debian/control b/debian/control
index ef4b24a..9ceccdb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: dvb-apps
 Architecture: any
 Depends: ${shlibs:Depends}, makedev (>=2.3.1-66) | udev
 Replaces: dvb-utils
-Conflicts: dvb-utils
 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,
@@ -43,3 +42,10 @@ Description: Digitial Video Broadcasting (DVB) applications
   . lib/libucsi     - Fast MPEG2 Transport Stream SI table parsing library
   . lib/libdvben50221- Implementation of a Cenelec EN 50221 CAM stack
   . lib/libdvbmisc  - Miscellaneous utilities used by the other libraries
+
+Package: dvb-utils
+Architecture: all
+Depends: dvb-apps
+Description: transitional dummy package
+ Transitional dummy package.
+

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