mythbuntu-dev team mailing list archive

[Gerald Barker <geraldbarker@xxxxxxxxx>]

Gerald Barker has proposed merging lp:~geraldbarker/mythtv/mythtv-trunk.mythnetvisionfix into lp:~mythbuntu/mythtv/mythtv-trunk.

Requested reviews:
  mythbuntu-dev (mythbuntu-dev)


This change fixes mythnetvision on the trunk builds

It copies the internetcontent folder to /usr/share/mythtv during the mythbackend install so the  backend can send to the frontends when they request the installed scripts

This change is part of 'make install' for mythtv, is is just missed as part of the packaging  
-- 
https://code.launchpad.net/~geraldbarker/mythtv/mythtv-trunk.mythnetvisionfix/+merge/28063
Your team mythbuntu-dev is requested to review the proposed merge of lp:~geraldbarker/mythtv/mythtv-trunk.mythnetvisionfix into lp:~mythbuntu/mythtv/mythtv-trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2010-06-21 00:40:50 +0000
+++ debian/changelog	2010-06-21 15:02:25 +0000
@@ -1,4 +1,15 @@
+<<<<<<< TREE
 mythtv (0.24.0~trunk25146-0ubuntu1) UNRELEASED; urgency=low
+=======
+mythtv (0.24.0~trunk24856-0ubuntu2) lucid; urgency=low
+
+  * Copy 'internetcontent' scripts to /usr/share/mythtv/ as part of
+    mythbackend install so they can be requeted by MythNetvision
+
+ -- Gerald Barker <geraldbarker@xxxxxxxxx>  Sun, 20 Jun 2010 14:21:24 +0100
+
+mythtv (0.24.0~trunk24856-0ubuntu1) UNRELEASED; urgency=low
+>>>>>>> MERGE-SOURCE
 
   [ Mario Limonciello ]
   * Drop 36_setgroups.  Been merged upstream.

=== modified file 'debian/mythtv-backend.install'
--- debian/mythtv-backend.install	2010-03-26 22:21:43 +0000
+++ debian/mythtv-backend.install	2010-06-21 15:02:25 +0000
@@ -4,6 +4,7 @@
 usr/bin/mythfilldatabase
 usr/bin/mythjobqueue
 usr/bin/mythtv-setup.real
+usr/share/mythtv/internetcontent
 
 #Copied in from debian/
 debian/mythtv-setup.desktop 			usr/share/applications