[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.22-1_ctvdr2

[etobi]

The following commit has been merged in the e-tobi branch:
commit 15cdfa5322e075f7916f6e48cf0ffa8b3fb202a7
Author: etobi <git at e-tobi.net>
Date:   Sat Dec 17 14:23:30 2011 +0100

    Added installation of the dvbhddevice plugin

diff --git a/debian/changelog b/debian/changelog
index d1a08db..c9cb3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ vdr (1.7.22-1) unstable; urgency=low
     anymore! To build VDR with a different set of patches, grab the
     appropriate branch from the Git.
   * Added build-arch, build-indep targets
+  * Added installation of the dvbhddevice plugin
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 10 Dec 2011 21:51:31 +0100
 
diff --git a/debian/control b/debian/control
index e0dac72..d7972b2 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Description: Debuggable version of the VDR Video Disk Recorder
 Package: vdr-plugin-dvbsddevice
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version})
-Description: Plugin that adds support for full featured DVB cards to VDR
+Description: Plugin that adds support for full featured SD-DVB cards to VDR
  Video Disk Recorder (VDR) is a digital sat-receiver program using
  Linux and DVB technologies. It allows one to record MPEG2 streams,
  as well as output the stream to TV.
@@ -66,6 +66,17 @@ Description: Plugin that adds support for full featured DVB cards to VDR
  output device for the "Full Featured" DVB cards based on the
  TechnoTrend/Fujitsu-Siemens design.
 
+Package: vdr-plugin-dvbhddevice
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version})
+Description: Plugin that adds support for full featured HD-DVB cards to VDR
+ Video Disk Recorder (VDR) is a digital sat-receiver program using
+ Linux and DVB technologies. It allows one to record MPEG2 streams,
+ as well as output the stream to TV.
+ .
+ This package contains the dvbhddevice-plugin, which implements the output
+ device for the "Full Featured TechnoTrend S2-6400" DVB cards.
+
 Package: vdr-plugin-examples
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, vdr (= ${binary:Version})
diff --git a/debian/rules b/debian/rules
index a1b6f61..9c275bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,6 @@ build-arch-stamp: configure-stamp
 	# Backup po files
 	find PLUGINS po -name "*.po" -exec test ! -f {}.backup \; -exec cp {} {}.backup \;
 
-	# disable dvbhddevice
-	-mv PLUGINS/src/dvbhddevice PLUGINS/src/_dvbhddevice
-
 	# build unoptimized vdr with debugging symbols
 	$(MAKE) all $(MAKE_OPTIONS) VDRDEBUG=yes DEB_BUILD_OPTIONS=nostrip,noopt
 	cp vdr vdr-dbg
@@ -90,9 +87,6 @@ clean:
 	rm -f debian/patchinfo
 	rm -f $(MANPAGES) $(TXT2MANPAGES)
 
-	# Restore dvbhddevice
-	-mv PLUGINS/src/_dvbhddevice PLUGINS/src/dvbhddevice
-
 	# Restore po files
 	find PLUGINS po -name "*.po" -exec test -f {}.backup \; -exec mv {}.backup {} \;
 
@@ -161,6 +155,7 @@ binary-arch: build install
 #	dh_undocumented -a
 	dh_installchangelogs -pvdr HISTORY
 	dh_installchangelogs -pvdr-plugin-dvbsddevice PLUGINS/src/dvbsddevice/HISTORY
+	dh_installchangelogs -pvdr-plugin-dvbhddevice PLUGINS/src/dvbhddevice/HISTORY
 	dh_installchangelogs -pvdr-plugin-examples
 	dh_link -a
 	dh_strip -a -Xvdr-dbg
diff --git a/debian/vdr-plugin-dvbhddevice.docs b/debian/vdr-plugin-dvbhddevice.docs
new file mode 100644
index 0000000..21cb4a9
--- /dev/null
+++ b/debian/vdr-plugin-dvbhddevice.docs
@@ -0,0 +1 @@
+PLUGINS/src/dvbhddevice/README
diff --git a/debian/vdr-plugin-dvbhddevice.install b/debian/vdr-plugin-dvbhddevice.install
new file mode 100644
index 0000000..2ffde56
--- /dev/null
+++ b/debian/vdr-plugin-dvbhddevice.install
@@ -0,0 +1 @@
+PLUGINS/lib/libvdr-dvbhddevice.so.*  usr/lib/vdr/plugins/

-- 
vdr packaging repository