[SCM] xbmc-pvr-addons/master: Stop shipping vdr-plugin-vnsiserver

Fri May 23 19:13:28 UTC 2014

The following commit has been merged in the master branch:
commit 49b84a4e8445ac0b416509d7fbab3233b9cb1f49
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Thu May 22 12:25:14 2014 +0200

    Stop shipping vdr-plugin-vnsiserver

diff --git a/debian/control b/debian/control
index 7e13792..1762dfb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: video
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, vdr-dev (>= 1.7.17), libtinyxml-dev (>= 2.6.2), libjsoncpp-dev,  libavcodec-dev, xbmc-addons-dev, xbmc-bin
+Build-Depends: debhelper (>= 9), autoconf, autopoint | gettext, automake, libtool, libboost-thread-dev, libmysqlclient-dev, pkg-config, libtinyxml-dev (>= 2.6.2), libjsoncpp-dev,  libavcodec-dev, xbmc-addons-dev, xbmc-bin
 Standards-Version: 3.9.5
 Homepage: https://github.com/opdenkamp/xbmc-pvr-addons.git
 Vcs-Git: git://git.debian.org/pkg-multimedia/xbmc-pvr-addons.git
@@ -33,13 +33,6 @@ Description: XBMC PVR Addon VDR Vnsi
  XBMC, the award winning free and open source software media-player and
  entertainment hub for all your digital media
 
-Package: vdr-plugin-vnsiserver
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${vdr:Depends}
-Suggests: xbmc (>= 2:12)
-Description: VDR-Network-Streaming-Interface
- VDR-Network-Streaming-Interface plugin for VDR
-
 Package: xbmc-pvr-njoy
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
diff --git a/debian/plugin.vnsiserver.conf b/debian/plugin.vnsiserver.conf
deleted file mode 100644
index f942799..0000000
--- a/debian/plugin.vnsiserver.conf
+++ /dev/null
@@ -1 +0,0 @@
--t 10
diff --git a/debian/rules b/debian/rules
index 82b788f..82cab85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,9 +28,8 @@ override_dh_clean:
 	find . \( -name "*.pvr" -o -name "config.status" -o -name "config.cache" -o -name "config.log" \
 	-o -name "config.guess" -o -name "config.sub" -o -name "Makefile.in" -o -name "INSTALL" \
 	-o -name "aclocal.m4" -o -name "configure" -o -name "depcomp" -o -name "install-sh"  \
-	-o -name "ltmain.sh" -o -name "missing" -o -name "libvdr-*.so.*" \
+	-o -name "ltmain.sh" -o -name "missing" \
 	 \) -exec rm -f "{}" \;
-	$(MAKE) clean -C addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
 
 override_dh_auto_configure:
 	rm lib/tinyxml/tiny*
@@ -39,8 +38,6 @@ override_dh_auto_configure:
 	./configure --prefix=/usr --enable-addons-with-dependencies --enable-release
 
 override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	sed -i 's/^vdr:Depends/# vdr:Depends/' $(CURDIR)/debian/xbmc-*.substvars
 	for i in $(CURDIR)/debian/substvars $(CURDIR)/debian/xbmc-*.substvars ; do echo "xbmc-addons-abi:Depends=xbmc (>= $(XBMC_VERSION))" >> $$i; done
 	dh_gencontrol
 
@@ -48,16 +45,10 @@ override_dh_shlibdeps:
 	dh_shlibdeps
 	chmod -x $(CURDIR)/debian/xbmc-pvr-*/usr/lib/xbmc/addons/pvr.*/*.pvr
 
-override_dh_auto_build:
-	#cd addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
-	VDRDIR=/usr/include/vdr LIBDIR=$(CURDIR)/debian/vdr-plugin-vnsiserver/usr/lib/vdr/plugins LOCALEDIR=locale $(MAKE) CXXFLAGS="$(CXXFLAGS) -fPIC" CFLAGS="$(CFLAGS)" compile -C addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
-	dh_auto_build
-
 override_dh_install:
 	 dh_install -XLICENSE.txt
 
 override_dh_auto_install:
-	VDRDIR=/usr/include/vdr LIBDIR=$(CURDIR)/debian/vdr-plugin-vnsiserver/usr/lib/vdr/plugins LOCALEDIR=locale $(MAKE) install-lib -C addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver
 	dh_auto_install
 	find $(CURDIR)/debian/tmp/usr/share/xbmc $(CURDIR)/debian/tmp/usr/lib/xbmc -type f -exec chmod 644 "{}" \;
 	chmod +x $(CURDIR)/debian/tmp/usr/lib/xbmc/addons/pvr.*/*.pvr
diff --git a/debian/vdr-plugin-vnsiserver.dirs b/debian/vdr-plugin-vnsiserver.dirs
deleted file mode 100644
index 4f477cb..0000000
--- a/debian/vdr-plugin-vnsiserver.dirs
+++ /dev/null
@@ -1 +0,0 @@
-var/lib/vdr/plugins/vnsiserver
\ No newline at end of file
diff --git a/debian/vdr-plugin-vnsiserver.install b/debian/vdr-plugin-vnsiserver.install
deleted file mode 100644
index 29bad02..0000000
--- a/debian/vdr-plugin-vnsiserver.install
+++ /dev/null
@@ -1,2 +0,0 @@
-addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver/vnsiserver/allowed_hosts.conf etc/vdr/plugins/vnsiserver
-debian/plugin.vnsiserver.conf etc/vdr/plugins
diff --git a/debian/vdr-plugin-vnsiserver.postinst b/debian/vdr-plugin-vnsiserver.postinst
deleted file mode 100644
index e910e5c..0000000
--- a/debian/vdr-plugin-vnsiserver.postinst
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# postinst script for vdr-plugin-vnsiserver
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-        chown -R vdr:vdr /var/lib/vdr/plugins/vnsiserver
-	[ -h /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf ] || ln -s /etc/vdr/plugins/vnsiserver/allowed_hosts.conf /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-	[ -h /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf ] && rm /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/vdr-plugin-vnsiserver.postrm b/debian/vdr-plugin-vnsiserver.postrm
deleted file mode 100644
index 3331b69..0000000
--- a/debian/vdr-plugin-vnsiserver.postrm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# postrm script for vdr-plugin-vnsiserver
-#
-# see: dh_installdeb(1)
-
-set -e
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	[ -h /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf ] && rm /var/lib/vdr/plugins/vnsiserver/allowed_hosts.conf
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

-- 
xbmc-pvr-addons packaging

