[SCM] xbmc-pvr-addons/master: Convert binary packages to transitional ones to Kodi PVR addons

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Fri Dec 18 20:20:21 UTC 2015


The following commit has been merged in the master branch:
commit 6a350788ad80321740a2105639cbbf08fa619474
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Dec 18 21:10:15 2015 +0100

    Convert binary packages to transitional ones to Kodi PVR addons
    
    Closes: #800058

diff --git a/debian/control b/debian/control
index b8728e0..853dd21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ 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, libtinyxml-dev (>= 2.6.2), libtinyxml2-dev, libjsoncpp-dev, xbmc-addons-dev (>= 2:13.1~beta2+dfsg1~), xbmc-bin
+Build-Depends: debhelper (>= 9~),
+               kodi-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
@@ -11,88 +12,66 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xbmc-pvr-addons.
 
 Package: xbmc-pvr-mythtv-cmyth
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}, libmysqlclient19 | libmysqlclient18 | libmysqlclient17 | libmysqlclient16 | libmysqlclient15 | libmysqlclient14
-Description: XBMC PVR Addon MythTv - Cmyth
- This package contains the Cmyth PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and entertainment
- hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-mythtv
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-vuplus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Vuplus
- This package contains the Vuplus PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and entertainment
- hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-vuplus
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-vdr-vnsi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon VDR Vnsi
- This package contains the VDR Vnsi PVR (Personal Video Recorder) Addon for
- XBMC, the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-vdr-vnsi
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-njoy
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Njoy
- This package contains the Njoy PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-njoy
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-nextpvr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon NextPvr
- This package contains the NextPvr PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and entertainment
- hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-nextpvr
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-mediaportal-tvserver
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Mediaportal Tvserver
- This package contains the Mediaportal PVR (Personal Video Recorder) Addon for
- XBMC, the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-mediaportal-tvserver
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-wmc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Windows Media Center
- This package contains the Windows Media Center Addon for
- XBMC, the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-wmc
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-tvheadend-hts
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon TvHeadend Hts
- This package contains the TvHeadend PVR (Personal Video Recorder) Addon for
- XBMC, the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-hts
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-dvbviewer
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Dvbviewer
- This package contains the Dvbviewer PVR (Personal Video Recorder) Addon for
- XBMC, the award winning free and open source software media-player and
- entertainment hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-dvbviewer
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-argustv
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Addon Argustv
- This package contains the Argustv PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and entertainment
- hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-argustv
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
 
 Package: xbmc-pvr-iptvsimple
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xbmc-addons-abi:Depends}
-Description: XBMC PVR Iptv Addon
- This package contains the Iptv PVR (Personal Video Recorder) Addon for XBMC,
- the award winning free and open source software media-player and entertainment
- hub for all your digital media
+Depends: ${misc:Depends}, kodi-pvr-iptvsimple
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index c89813c..9228767 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,6 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
-CPPFLAGS +=-I/usr/include/libavcodec -I/usr/include/xbmc
-XBMC_VERSION = $(shell dpkg-query -W -f='$${Version}' xbmc-addons-dev)
-
 %:
 	dh $@ --parallel
 
@@ -32,22 +28,11 @@ override_dh_clean:
 	 \) -exec rm -f "{}" \;
 
 override_dh_auto_configure:
-	./bootstrap
-	./configure --prefix=/usr --enable-addons-with-dependencies --enable-release
-
-override_dh_gencontrol:
-	for i in $(CURDIR)/debian/substvars $(CURDIR)/debian/xbmc-*.substvars ; do echo "xbmc-addons-abi:Depends=xbmc (>= $(XBMC_VERSION))" >> $$i; done
-	dh_gencontrol
-
-override_dh_shlibdeps:
-	dh_shlibdeps
-	chmod -x $(CURDIR)/debian/xbmc-pvr-*/usr/lib/xbmc/addons/pvr.*/*.pvr
+	# noop
 
-override_dh_install:
-	 dh_install -XLICENSE.txt
+override_dh_auto_build:
+	# noop
 
 override_dh_auto_install:
-	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
+	# noop
 
diff --git a/debian/xbmc-pvr-argustv.install b/debian/xbmc-pvr-argustv.install
deleted file mode 100644
index e0996fe..0000000
--- a/debian/xbmc-pvr-argustv.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.argustv/XBMC_ArgusTV.pvr
-usr/share/xbmc/addons/pvr.argustv
diff --git a/debian/xbmc-pvr-dvbviewer.install b/debian/xbmc-pvr-dvbviewer.install
deleted file mode 100644
index e10d684..0000000
--- a/debian/xbmc-pvr-dvbviewer.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.dvbviewer/XBMC_dvbviewer.pvr
-usr/share/xbmc/addons/pvr.dvbviewer
diff --git a/debian/xbmc-pvr-iptvsimple.install b/debian/xbmc-pvr-iptvsimple.install
deleted file mode 100644
index 307157a..0000000
--- a/debian/xbmc-pvr-iptvsimple.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.iptvsimple/XBMC_IPTV_Simple.pvr
-usr/share/xbmc/addons/pvr.iptvsimple
diff --git a/debian/xbmc-pvr-mediaportal-tvserver.install b/debian/xbmc-pvr-mediaportal-tvserver.install
deleted file mode 100644
index 844122d..0000000
--- a/debian/xbmc-pvr-mediaportal-tvserver.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.mediaportal.tvserver/XBMC_Mediaportal.pvr
-usr/share/xbmc/addons/pvr.mediaportal.tvserver
diff --git a/debian/xbmc-pvr-mythtv-cmyth.install b/debian/xbmc-pvr-mythtv-cmyth.install
deleted file mode 100644
index 38cfd37..0000000
--- a/debian/xbmc-pvr-mythtv-cmyth.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.mythtv.cmyth/XBMC_MythTV_cmyth.pvr
-usr/share/xbmc/addons/pvr.mythtv.cmyth
diff --git a/debian/xbmc-pvr-nextpvr.install b/debian/xbmc-pvr-nextpvr.install
deleted file mode 100644
index 239be89..0000000
--- a/debian/xbmc-pvr-nextpvr.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.nextpvr/XBMC_NextPVR.pvr
-usr/share/xbmc/addons/pvr.nextpvr
diff --git a/debian/xbmc-pvr-njoy.install b/debian/xbmc-pvr-njoy.install
deleted file mode 100644
index dbb5c55..0000000
--- a/debian/xbmc-pvr-njoy.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.njoy/XBMC_Njoy.pvr
-usr/share/xbmc/addons/pvr.njoy
diff --git a/debian/xbmc-pvr-tvheadend-hts.install b/debian/xbmc-pvr-tvheadend-hts.install
deleted file mode 100644
index e0ccc5c..0000000
--- a/debian/xbmc-pvr-tvheadend-hts.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.hts/XBMC_Tvheadend.pvr
-usr/share/xbmc/addons/pvr.hts
diff --git a/debian/xbmc-pvr-vdr-vnsi.install b/debian/xbmc-pvr-vdr-vnsi.install
deleted file mode 100644
index c37c58f..0000000
--- a/debian/xbmc-pvr-vdr-vnsi.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.vdr.vnsi/XBMC_VDR_vnsi.pvr
-usr/share/xbmc/addons/pvr.vdr.vnsi
diff --git a/debian/xbmc-pvr-vuplus.install b/debian/xbmc-pvr-vuplus.install
deleted file mode 100644
index f794e2b..0000000
--- a/debian/xbmc-pvr-vuplus.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.vuplus/XBMC_vuplus.pvr
-usr/share/xbmc/addons/pvr.vuplus
diff --git a/debian/xbmc-pvr-wmc.install b/debian/xbmc-pvr-wmc.install
deleted file mode 100644
index 899734d..0000000
--- a/debian/xbmc-pvr-wmc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/xbmc/addons/pvr.wmc/XBMC_WMC.pvr
-usr/share/xbmc/addons/pvr.wmc

-- 
xbmc-pvr-addons packaging



More information about the pkg-multimedia-commits mailing list