r8808 - /vdr/vdr-plugin-xineliboutput/trunk/debian/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sun Dec 5 00:51:14 UTC 2010 

Author: tiber-guest
Date: Sun Dec  5 00:51:13 2010
New Revision: 8808

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8808
Log:
* New Upstream Snapshot
* Switched to debhelper 7 and dropped cdbs
* Install doc dir as symlink to libxine1-xvdr where possible
* Updated README.Debian and install it only with the plugin package

Added:
    vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.docs
    vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.install
    vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.README.Debian
      - copied, changed from r8765, vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian
    vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.docs
Removed:
    vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian
    vdr/vdr-plugin-xineliboutput/trunk/debian/docs
Modified:
    vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
    vdr/vdr-plugin-xineliboutput/trunk/debian/compat
    vdr/vdr-plugin-xineliboutput/trunk/debian/control
    vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-fbfe.install
    vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-sxfe.install
    vdr/vdr-plugin-xineliboutput/trunk/debian/rules
    vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.install
    vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-fbfe.install
    vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-sxfe.install

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/changelog?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/changelog Sun Dec  5 00:51:13 2010
@@ -1,3 +1,12 @@
+vdr-plugin-xineliboutput (1.0.6+cvs20101204.1657-1) unstable; urgency=low
+
+  * New Upstream Snapshot
+  * Switched to debhelper 7 and dropped cdbs
+  * Install doc dir as symlink to libxine1-xvdr where possible
+  * Updated README.Debian and install it only with the plugin package
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 04 Dec 2010 17:57:39 +0100
+
 vdr-plugin-xineliboutput (1.0.6+cvs20101019.1826-1) unstable; urgency=low
 
   * New Upstream Snapshot

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/compat?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/compat (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/compat Sun Dec  5 00:51:13 2010
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/control?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/control (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/control Sun Dec  5 00:51:13 2010
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, gettext, txt2man,
+Build-Depends: debhelper (>= 7.0.50~), gettext, txt2man,
  vdr-dev (>= 1.6.0-16),
  x11proto-core-dev,
  libxine-dev (>= 1.1.12),

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.docs
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.docs?rev=8808&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.docs (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.docs Sun Dec  5 00:51:13 2010
@@ -1,0 +1,1 @@
+README

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.install?rev=8808&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.install (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/libxine1-xvdr.install Sun Dec  5 00:51:13 2010
@@ -1,0 +1,1 @@
+usr/lib/xine

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-fbfe.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-fbfe.install?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-fbfe.install (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-fbfe.install Sun Dec  5 00:51:13 2010
@@ -1,1 +1,1 @@
-libxineliboutput-fbfe.so.*    usr/lib/vdr/plugins/
+lib/libxineliboutput-fbfe.so.*    usr/lib/vdr/plugins/

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-sxfe.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-sxfe.install?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-sxfe.install (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/libxineliboutput-sxfe.install Sun Dec  5 00:51:13 2010
@@ -1,1 +1,1 @@
-libxineliboutput-sxfe.so.*    usr/lib/vdr/plugins/
+lib/libxineliboutput-sxfe.so.*    usr/lib/vdr/plugins/

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/rules?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/rules (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/rules Sun Dec  5 00:51:13 2010
@@ -1,44 +1,42 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
-
-# install target directory for xine plugins
-XINEPLUGINDIR = libxine1-xvdr/$(shell xine-config --plugindir)
-
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
-               LOCALEDIR=debian/tmp/usr/share/locale \
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=lib LOCALEDIR=debian/tmp/usr/share/locale \
                NOSIGNAL_IMAGE_FILE=/usr/share/libxine1-xvdr/nosignal.mpg
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+%:
+	dh $@
 
-clean::
+override_dh_auto_configure:
+	./configure
+
+override_dh_auto_build:
+	test -d lib || mkdir lib
+	dh_auto_build -- all $(MAKE_OPTIONS)
+	txt2man -s 1 -t vdr-sxfe -v "Remote X-Server frontend for vdr-plugin-xineliboutput" debian/vdr-sxfe.1.txt >vdr-sxfe.1
+	txt2man -s 1 -t vdr-fbfe -v "Remote Framebuffer frontend for vdr-plugin-xineliboutput" debian/vdr-fbfe.1.txt >vdr-fbfe.1
+
+override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
+	rm -rf lib
 	rm -f vdr-sxfe.1 vdr-fbfe.1
 
-common-binary-predeb-arch::
+override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
 	dpkg -p libxine-dev | sed -re '/^Version:/! d; s/^Version: (([0-9]+\.){2}[0-9]+).*$$/xine:Depends=libxine1 (>= \1)/' \
 	>> debian/libxine1-xvdr.substvars
+	dh_gencontrol
 
-install/vdr-plugin-xineliboutput::
-	install -d debian/$(XINEPLUGINDIR)/post/
-	install xineplug_inp_xvdr.so debian/$(XINEPLUGINDIR)/
-	install xineplug_post_*.so debian/$(XINEPLUGINDIR)/post/
-
-install/xineliboutput-sxfe:: manpages
+override_dh_auto_install:
+	dh_auto_install -- $(MAKE_OPTIONS)
 	install -m 644 -D debian/icon.svg debian/xineliboutput-sxfe/usr/share/icons/xineliboutput-sxfe.svg
-
-install/xineliboutput-fbfe:: manpages
 	install -m 644 -D debian/icon.svg debian/xineliboutput-sxfe/usr/share/icons/xineliboutput-fbfe.svg
 
-manpages:
-	txt2man -s 1 -t vdr-sxfe -v "Remote X-Server frontend for vdr-plugin-xineliboutput" debian/vdr-sxfe.1.txt >vdr-sxfe.1
-	txt2man -s 1 -t vdr-fbfe -v "Remote Framebuffer frontend for vdr-plugin-xineliboutput" debian/vdr-fbfe.1.txt >vdr-fbfe.1
+override_dh_installdocs:
+	dh_installdocs -plibxineliboutput-fbfe -plibxineliboutput-sxfe -pxineliboutput-fbfe -pxineliboutput-sxfe --link-doc=libxine1-xvdr
+	dh_installdocs --remaining-packages
 
 VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
 VERSION_ID = 1.0.6+cvs$(VERSION_DATE)

Copied: vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.README.Debian (from r8765, vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.README.Debian?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/README.Debian (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.README.Debian Sun Dec  5 00:51:13 2010
@@ -11,8 +11,9 @@
 --------------
 
 To allow remote clients to connect over the network you must configure the
-allowed network clients or network segments in  /etc/vdr/svdrphosts.conf and
-set "--remote=37890" in /etc/vdr/plugins/plugin.xineliboutput.conf.
+allowed network clients or network segments in:
+
+  /etc/vdr/plugins/xineliboutput/allowed_hosts.conf
 
 
 Configuration options

Added: vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.docs
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.docs?rev=8808&op=file
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.docs (added)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.docs Sun Dec  5 00:51:13 2010
@@ -1,0 +1,1 @@
+README

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.install?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.install (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/vdr-plugin-xineliboutput.install Sun Dec  5 00:51:13 2010
@@ -1,4 +1,4 @@
-libvdr-xineliboutput.so.*           usr/lib/vdr/plugins/
+lib/libvdr-xineliboutput.so.*       usr/lib/vdr/plugins/
 examples/allowed_hosts.conf         etc/vdr/plugins/xineliboutput/
 debian/plugin.xineliboutput.conf    etc/vdr/plugins/
 debian/tmp/usr/share/locale

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-fbfe.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-fbfe.install?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-fbfe.install (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-fbfe.install Sun Dec  5 00:51:13 2010
@@ -1,2 +1,2 @@
-vdr-fbfe                    usr/bin/
-debian/vdr-fbfe.desktop     usr/share/applications/
+usr/bin/vdr-fbfe
+debian/vdr-fbfe.desktop    usr/share/applications/

Modified: vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-sxfe.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-sxfe.install?rev=8808&op=diff
==============================================================================
--- vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-sxfe.install (original)
+++ vdr/vdr-plugin-xineliboutput/trunk/debian/xineliboutput-sxfe.install Sun Dec  5 00:51:13 2010
@@ -1,3 +1,2 @@
-vdr-sxfe                      usr/bin/
-debian/vdr-sxfe.desktop       usr/share/applications/
-
+usr/bin/vdr-sxfe
+debian/vdr-sxfe.desktop    usr/share/applications/

More information about the pkg-vdr-dvb-changes mailing list