xmltv/grab/uk_rt/lineups freesatfromsky.xml, 1.3, 1.4 freesathd.xml, 1.3, 1.4 freesat.xml, 1.3, 1.4 freeviewhd.xml, 1.2, 1.3 freeview.xml, 1.2, 1.3 lineups.xml, 1.4, 1.5 saorview.xml, 1.2, 1.3 skyhd.xml, 1.4, 1.5 sky.xml, 1.4, 1.5 upcirelandhd.xml, 1.2, 1.3 upcireland.xml, 1.2, 1.3 virginhd.xml, 1.3, 1.4 virgin.xml, 1.3, 1.4

Nick Morrott <[email protected]>
Newsgroups gmane.comp.tv.xmltv.cvs
Message-ID <[email protected]>
Update of /cvsroot/xmltv/xmltv/grab/uk_rt/lineups
In directory vz-cvs-3.sog:/tmp/cvs-serv20086

Modified Files:
	freesatfromsky.xml freesathd.xml freesat.xml freeviewhd.xml 
	freeview.xml lineups.xml saorview.xml skyhd.xml sky.xml 
	upcirelandhd.xml upcireland.xml virginhd.xml virgin.xml 
Log Message:
Updated lineups

Index: lineups.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/lineups.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lineups.xml	29 Apr 2012 08:54:29 -0000	1.4
--- lineups.xml	10 Jun 2012 07:38:03 -0000	1.5
***************
*** 1,5 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
! <xmltv-lineups modified="2012-04-29T09:23:16 +0100" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
    <xmltv-lineup id="freesat">
      <type>DTV</type>
--- 1,5 ----
  <?xml version="1.0" encoding="UTF-8"?>
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
! <xmltv-lineups modified="2012-06-10T08:27:12 +0100" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
    <xmltv-lineup id="freesat">
      <type>DTV</type>

Index: freeview.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/freeview.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** freeview.xml	1 May 2012 05:25:37 -0000	1.2
--- freeview.xml	10 Jun 2012 07:38:03 -0000	1.3
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freeview" modified="2012-05-01T06:07:23 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_digital_terrestrial_television_channels_(UK)" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freeview</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freeview" modified="2012-06-10T08:27:28 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_digital_terrestrial_television_channels_(UK)" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freeview</display-name>

Index: freesatfromsky.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/freesatfromsky.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** freesatfromsky.xml	11 May 2012 05:07:48 -0000	1.3
--- freesatfromsky.xml	10 Jun 2012 07:38:03 -0000	1.4
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesatfromsky" modified="2012-05-11T00:39:21 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky (Freesat from Sky)</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesatfromsky" modified="2012-06-10T08:27:22 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky (Freesat from Sky)</display-name>
***************
*** 961,964 ****
--- 961,982 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>125</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <station rfc2838="challengetv.co.uk" type="TV">
+         <name lang="en-GB">Challenge</name>
+         <short-name lang="en-GB">Challenge</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/challenge_tv.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>125</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>131</preset>
        <section>Entertainment</section>
***************
*** 1206,1213 ****
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station type="TV">
!         <name lang="en-GB">BBC One</name>
          <short-name lang="en-GB">BBC One</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/bbc_one.jpg" height="99" width="132"/>
          <commercial-free>true</commercial-free>
          <video>
--- 1224,1231 ----
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station rfc2838="northern-ireland.bbc1.bbc.co.uk" type="TV">
!         <name lang="en-GB">BBC One Northern Ireland</name>
          <short-name lang="en-GB">BBC One</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/bbc_one_northern_ireland.jpg" height="99" width="132"/>
          <commercial-free>true</commercial-free>
          <video>
***************
*** 1225,1232 ****
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station type="TV">
!         <name lang="en-GB">BBC Two</name>
          <short-name lang="en-GB">BBC Two</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/bbc2.jpg" height="99" width="132"/>
          <commercial-free>true</commercial-free>
          <video>
--- 1243,1250 ----
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station rfc2838="northern-ireland.bbc2.bbc.co.uk" type="TV">
!         <name lang="en-GB">BBC Two Northern Ireland</name>
          <short-name lang="en-GB">BBC Two</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/bbc2_northern_ireland.jpg" height="99" width="132"/>
          <commercial-free>true</commercial-free>
          <video>
***************
*** 1314,1318 ****
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
--- 1332,1336 ----
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
***************
*** 1332,1336 ****
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
--- 1350,1354 ----
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
***************
*** 1423,1426 ****
--- 1441,1462 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>164</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <station rfc2838="tsod.plus-1.challengetv.co.uk" type="TV">
+         <name lang="en-GB">Challenge +1</name>
+         <short-name lang="en-GB">Challenge +1</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/challenge_tv_plus1.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>164</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>168</preset>
        <section>Entertainment</section>
***************
*** 1834,1837 ****
--- 1870,1891 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>225</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <station rfc2838="tsod.plus-1.itv4.itv.co.uk" type="TV">
+         <name lang="en-GB">ITV4 +1</name>
+         <short-name lang="en-GB">ITV4 +1</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv4_plus1.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>225</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>229</preset>
        <section>Entertainment</section>
***************
*** 1890,1911 ****
      </lineup-entry>
      <lineup-entry>
-       <preset>235</preset>
-       <section>Entertainment</section>
-       <package type="basic">Free-to-air</package>
-       <station type="TV">
-         <name lang="en-GB">Showcase +1</name>
-         <short-name lang="en-GB">Showcase +1</short-name>
-         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/showcase_tv_uk.jpg" height="99" width="132"/>
-         <commercial-free>false</commercial-free>
-         <video>
-           <format>SDTV</format>
-           <aspect-ratio>16:9</aspect-ratio>
-         </video>
-       </station>
-       <stb-channel>
-         <stb-preset>235</stb-preset>
-       </stb-channel>
-     </lineup-entry>
-     <lineup-entry>
        <preset>236</preset>
        <section>Entertainment</section>
--- 1944,1947 ----
***************
*** 2536,2543 ****
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.chartshow.com" type="TV">
!         <name lang="en-GB">Chart Show TV +1</name>
!         <short-name lang="en-GB">Chart Show TV +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/chart_show.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 2572,2579 ----
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station type="TV">
!         <name lang="en-GB">BuzMuzik</name>
!         <short-name lang="en-GB">BuzMuzik</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/buz_muzik.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 4109,4114 ****
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel 'S'</name>
!         <short-name lang="en-GB">Channel 'S'</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 4145,4150 ----
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel S</name>
!         <short-name lang="en-GB">Channel S</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 4140,4143 ****
--- 4176,4214 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>817</preset>
+       <section>International</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">Sahara One</name>
+         <short-name lang="en-GB">Sahara One</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/sahara_one.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>817</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
+       <preset>818</preset>
+       <section>International</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">Aaj Tak</name>
+         <short-name lang="en-GB">Aaj Tak</short-name>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>818</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>819</preset>
        <section>International</section>

Index: upcireland.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/upcireland.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** upcireland.xml	1 May 2012 05:25:37 -0000	1.2
--- upcireland.xml	10 Jun 2012 07:38:03 -0000	1.3
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="upcireland" modified="2012-05-01T06:07:45 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_UPC_Ireland" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">UPC Ireland</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="upcireland" modified="2012-06-10T08:27:51 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_UPC_Ireland" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">UPC Ireland</display-name>
***************
*** 391,396 ****
        <package type="basic">Max</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 391,396 ----
        <package type="basic">Max</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 737,742 ****
        <package type="basic">Max</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 737,742 ----
        <package type="basic">Max</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>

Index: upcirelandhd.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/upcirelandhd.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** upcirelandhd.xml	1 May 2012 05:25:37 -0000	1.2
--- upcirelandhd.xml	10 Jun 2012 07:38:03 -0000	1.3
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="upcirelandhd" modified="2012-05-01T06:07:48 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_UPC_Ireland" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">UPC Ireland HD</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="upcirelandhd" modified="2012-06-10T08:27:54 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_UPC_Ireland" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">UPC Ireland HD</display-name>
***************
*** 391,396 ****
        <package type="basic">Max</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 391,396 ----
        <package type="basic">Max</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 800,805 ****
        <package type="basic">Max</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 800,805 ----
        <package type="basic">Max</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>

Index: sky.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/sky.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sky.xml	14 May 2012 02:51:15 -0000	1.4
--- sky.xml	10 Jun 2012 07:38:03 -0000	1.5
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="sky" modified="2012-05-14T03:41:08 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="sky" modified="2012-06-10T08:27:40 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky</display-name>
***************
*** 947,952 ****
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 947,952 ----
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 1216,1220 ****
        <preset>125</preset>
        <section>Entertainment</section>
!       <package type="subscription">Entertainment Pack</package>
        <station rfc2838="challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge</name>
--- 1216,1220 ----
        <preset>125</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge</name>
***************
*** 1534,1539 ****
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1534,1539 ----
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 1955,1959 ****
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
--- 1955,1959 ----
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
***************
*** 1973,1977 ****
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
--- 1973,1977 ----
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
***************
*** 2174,2178 ****
        <preset>164</preset>
        <section>Entertainment</section>
!       <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge +1</name>
--- 2174,2178 ----
        <preset>164</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge +1</name>
***************
*** 2727,2730 ****
--- 2727,2748 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>225</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <station rfc2838="tsod.plus-1.itv4.itv.co.uk" type="TV">
+         <name lang="en-GB">ITV4 +1</name>
+         <short-name lang="en-GB">ITV4 +1</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv4_plus1.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>225</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>229</preset>
        <section>Entertainment</section>
***************
*** 2783,2804 ****
      </lineup-entry>
      <lineup-entry>
-       <preset>235</preset>
-       <section>Entertainment</section>
-       <package type="basic">Free-to-air</package>
-       <station type="TV">
-         <name lang="en-GB">Showcase +1</name>
-         <short-name lang="en-GB">Showcase +1</short-name>
-         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/showcase_tv_uk.jpg" height="99" width="132"/>
-         <commercial-free>false</commercial-free>
-         <video>
-           <format>SDTV</format>
-           <aspect-ratio>16:9</aspect-ratio>
-         </video>
-       </station>
-       <stb-channel>
-         <stb-preset>235</stb-preset>
-       </stb-channel>
-     </lineup-entry>
-     <lineup-entry>
        <preset>236</preset>
        <section>Entertainment</section>
--- 2801,2804 ----
***************
*** 4256,4263 ****
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.chartshow.com" type="TV">
!         <name lang="en-GB">Chart Show TV +1</name>
!         <short-name lang="en-GB">Chart Show TV +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/chart_show.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 4256,4263 ----
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station type="TV">
!         <name lang="en-GB">BuzMuzik</name>
!         <short-name lang="en-GB">BuzMuzik</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/buz_muzik.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 6833,6839 ****
        <package type="subscription">Entertainment Pack</package>
        <station type="TV">
!         <name lang="en-GB">STAR One</name>
!         <short-name lang="en-GB">STAR One</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_one.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 6833,6839 ----
        <package type="subscription">Entertainment Pack</package>
        <station type="TV">
!         <name lang="en-GB">Star Life OK</name>
!         <short-name lang="en-GB">Star Life OK</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ll/life_ok_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 7201,7208 ****
        <section>International</section>
        <package type="subscription">Entertainment Extra Pack</package>
!       <station rfc2838="star-news.startv.com" type="TV">
!         <name lang="en-GB">STAR News</name>
!         <short-name lang="en-GB">STAR News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_news.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 7201,7208 ----
        <section>International</section>
        <package type="subscription">Entertainment Extra Pack</package>
!       <station rfc2838="abpnews.in" type="TV">
!         <name lang="en-GB">ABP News</name>
!         <short-name lang="en-GB">ABP News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/aa/abp_news_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 7272,7277 ****
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel 'S'</name>
!         <short-name lang="en-GB">Channel 'S'</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 7272,7277 ----
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel S</name>
!         <short-name lang="en-GB">Channel S</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 7323,7327 ****
        <preset>817</preset>
        <section>International</section>
!       <package type="subscription">Premium</package>
        <station type="TV">
          <name lang="en-GB">Sahara One</name>
--- 7323,7327 ----
        <preset>817</preset>
        <section>International</section>
!       <package type="basic">Free-to-air</package>
        <station type="TV">
          <name lang="en-GB">Sahara One</name>
***************
*** 7341,7345 ****
        <preset>818</preset>
        <section>International</section>
!       <package type="subscription">Premium</package>
        <station type="TV">
          <name lang="en-GB">Aaj Tak</name>
--- 7341,7345 ----
        <preset>818</preset>
        <section>International</section>
!       <package type="basic">Free-to-air</package>
        <station type="TV">
          <name lang="en-GB">Aaj Tak</name>

Index: freeviewhd.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/freeviewhd.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** freeviewhd.xml	1 May 2012 05:25:37 -0000	1.2
--- freeviewhd.xml	10 Jun 2012 07:38:03 -0000	1.3
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freeviewhd" modified="2012-05-01T06:07:25 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_digital_terrestrial_television_channels_(UK)" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freeview HD</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freeviewhd" modified="2012-06-10T08:27:31 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_digital_terrestrial_television_channels_(UK)" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freeview HD</display-name>

Index: skyhd.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/skyhd.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** skyhd.xml	14 May 2012 02:51:15 -0000	1.4
--- skyhd.xml	10 Jun 2012 07:38:03 -0000	1.5
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="skyhd" modified="2012-05-14T03:41:16 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky HD</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="skyhd" modified="2012-06-10T08:27:48 +0100" source-info-url="http://en.wikipedia.org/wiki/List of channels on Sky" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Sky HD</display-name>
***************
*** 452,462 ****
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station rfc2838="two.rte.ie" type="TV">
!         <name lang="en-GB">RTÉ Two</name>
!         <short-name lang="en-GB">RTÉ Two</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
!           <format>SDTV</format>
            <aspect-ratio>16:9</aspect-ratio>
          </video>
--- 452,462 ----
        <package type="basic">Free-to-air</package>
        <availability area="country">Ireland</availability>
!       <station rfc2838="hd.two.rte.ie" type="TV">
!         <name lang="en-GB">RTÉ Two HD</name>
!         <short-name lang="en-GB">RTÉ Two HD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
!           <format>HDTV</format>
            <aspect-ratio>16:9</aspect-ratio>
          </video>
***************
*** 947,952 ****
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 947,952 ----
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 1216,1220 ****
        <preset>125</preset>
        <section>Entertainment</section>
!       <package type="subscription">Entertainment Pack</package>
        <station rfc2838="challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge</name>
--- 1216,1220 ----
        <preset>125</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge</name>
***************
*** 1534,1539 ****
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1534,1539 ----
        <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 2010,2014 ****
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
--- 2010,2014 ----
        <preset>152</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV</name>
***************
*** 2028,2032 ****
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-view</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
--- 2028,2032 ----
        <preset>153</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.sky-three.sky.com" type="TV">
          <name lang="en-GB">Pick TV +1</name>
***************
*** 2193,2203 ****
        <package type="basic">Free-to-air</package>
        <availability area="country">Northern Ireland</availability>
!       <station rfc2838="two.rte.ie" type="TV">
!         <name lang="en-GB">RTÉ Two</name>
!         <short-name lang="en-GB">RTÉ Two</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
!           <format>SDTV</format>
            <aspect-ratio>16:9</aspect-ratio>
          </video>
--- 2193,2203 ----
        <package type="basic">Free-to-air</package>
        <availability area="country">Northern Ireland</availability>
!       <station rfc2838="hd.two.rte.ie" type="TV">
!         <name lang="en-GB">RTÉ Two HD</name>
!         <short-name lang="en-GB">RTÉ Two HD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
!           <format>HDTV</format>
            <aspect-ratio>16:9</aspect-ratio>
          </video>
***************
*** 2229,2233 ****
        <preset>164</preset>
        <section>Entertainment</section>
!       <package type="subscription">Entertainment Pack</package>
        <station rfc2838="tsod.plus-1.challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge +1</name>
--- 2229,2233 ----
        <preset>164</preset>
        <section>Entertainment</section>
!       <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.challengetv.co.uk" type="TV">
          <name lang="en-GB">Challenge +1</name>
***************
*** 3119,3126 ****
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="itv2.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV2</name>
!         <short-name lang="en-GB">ITV2</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv2.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 3119,3126 ----
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.itv4.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV4 +1</name>
!         <short-name lang="en-GB">ITV4 +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv4_plus1.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 3137,3144 ****
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="itv3.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV3</name>
!         <short-name lang="en-GB">ITV3</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv3.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 3137,3144 ----
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="itv2.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV2</name>
!         <short-name lang="en-GB">ITV2</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv2.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 3155,3162 ****
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="itv4.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV4</name>
!         <short-name lang="en-GB">ITV4</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv4.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 3155,3162 ----
        <section>Entertainment</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="itv3.itv.co.uk" type="TV">
!         <name lang="en-GB">ITV3</name>
!         <short-name lang="en-GB">ITV3</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv3.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 3281,3302 ****
      </lineup-entry>
      <lineup-entry>
-       <preset>235</preset>
-       <section>Entertainment</section>
-       <package type="basic">Free-to-air</package>
-       <station type="TV">
-         <name lang="en-GB">Showcase +1</name>
-         <short-name lang="en-GB">Showcase +1</short-name>
-         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/showcase_tv_uk.jpg" height="99" width="132"/>
-         <commercial-free>false</commercial-free>
-         <video>
-           <format>SDTV</format>
-           <aspect-ratio>16:9</aspect-ratio>
-         </video>
-       </station>
-       <stb-channel>
-         <stb-preset>235</stb-preset>
-       </stb-channel>
-     </lineup-entry>
-     <lineup-entry>
        <preset>236</preset>
        <section>Entertainment</section>
--- 3281,3284 ----
***************
*** 3855,3858 ****
--- 3837,3896 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>294</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <availability area="country">Ireland</availability>
+       <station rfc2838="two.rte.ie" type="TV">
+         <name lang="en-GB">RTÉ Two</name>
+         <short-name lang="en-GB">RTÉ Two</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>294</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
+       <preset>294</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <availability area="country">Northern Ireland</availability>
+       <station rfc2838="two.rte.ie" type="TV">
+         <name lang="en-GB">RTÉ Two</name>
+         <short-name lang="en-GB">RTÉ Two</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/rte_two.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>294</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
+       <preset>295</preset>
+       <section>Entertainment</section>
+       <package type="basic">Free-to-air</package>
+       <station rfc2838="itv4.itv.co.uk" type="TV">
+         <name lang="en-GB">ITV4</name>
+         <short-name lang="en-GB">ITV4</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/itv4.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>295</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>301</preset>
        <section>Movies</section>
***************
*** 5043,5050 ****
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.chartshow.com" type="TV">
!         <name lang="en-GB">Chart Show TV +1</name>
!         <short-name lang="en-GB">Chart Show TV +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/chart_show.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 5081,5088 ----
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station type="TV">
!         <name lang="en-GB">BuzMuzik</name>
!         <short-name lang="en-GB">BuzMuzik</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/buz_muzik.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 8051,8057 ****
        <package type="subscription">Entertainment Pack</package>
        <station type="TV">
!         <name lang="en-GB">STAR One</name>
!         <short-name lang="en-GB">STAR One</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_one.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 8089,8095 ----
        <package type="subscription">Entertainment Pack</package>
        <station type="TV">
!         <name lang="en-GB">Star Life OK</name>
!         <short-name lang="en-GB">Star Life OK</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ll/life_ok_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 8419,8426 ****
        <section>International</section>
        <package type="subscription">Entertainment Extra Pack</package>
!       <station rfc2838="star-news.startv.com" type="TV">
!         <name lang="en-GB">STAR News</name>
!         <short-name lang="en-GB">STAR News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_news.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 8457,8464 ----
        <section>International</section>
        <package type="subscription">Entertainment Extra Pack</package>
!       <station rfc2838="abpnews.in" type="TV">
!         <name lang="en-GB">ABP News</name>
!         <short-name lang="en-GB">ABP News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/aa/abp_news_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 8490,8495 ****
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel 'S'</name>
!         <short-name lang="en-GB">Channel 'S'</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 8528,8533 ----
        <package type="basic">Free-to-air</package>
        <station rfc2838="chsuk.tv" type="TV">
!         <name lang="en-GB">Channel S</name>
!         <short-name lang="en-GB">Channel S</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/cc/channel_s.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 8541,8545 ****
        <preset>817</preset>
        <section>International</section>
!       <package type="subscription">Premium</package>
        <station type="TV">
          <name lang="en-GB">Sahara One</name>
--- 8579,8583 ----
        <preset>817</preset>
        <section>International</section>
!       <package type="basic">Free-to-air</package>
        <station type="TV">
          <name lang="en-GB">Sahara One</name>
***************
*** 8559,8563 ****
        <preset>818</preset>
        <section>International</section>
!       <package type="subscription">Premium</package>
        <station type="TV">
          <name lang="en-GB">Aaj Tak</name>
--- 8597,8601 ----
        <preset>818</preset>
        <section>International</section>
!       <package type="basic">Free-to-air</package>
        <station type="TV">
          <name lang="en-GB">Aaj Tak</name>

Index: virgin.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/virgin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** virgin.xml	14 May 2012 02:51:15 -0000	1.3
--- virgin.xml	10 Jun 2012 07:38:03 -0000	1.4
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="virgin" modified="2012-05-14T03:41:27 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Virgin_TV" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Virgin TV</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="virgin" modified="2012-06-10T08:27:58 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Virgin_TV" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Virgin TV</display-name>
***************
*** 1424,1429 ****
        <package type="basic">XL</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1424,1429 ----
        <package type="basic">XL</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 1443,1448 ****
        <package type="basic">XL</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1443,1448 ----
        <package type="basic">XL</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 3556,3562 ****
        <package type="subscription">Pay-per-view</package>
        <station type="TV">
!         <name lang="en-GB">Red Hot Fetish Nightly</name>
!         <short-name lang="en-GB">Red Hot Fetish Nightly</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/red_hot_fetish.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 3556,3562 ----
        <package type="subscription">Pay-per-view</package>
        <station type="TV">
!         <name lang="en-GB">Red Hot 18s Nightly</name>
!         <short-name lang="en-GB">Red Hot 18s Nightly</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/red_hot_tv_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 4755,4762 ****
        <package type="subscription">Asian Mela</package>
        <package type="subscription">STAR Bundle</package>
!       <station rfc2838="star-news.startv.com" type="TV">
!         <name lang="en-GB">STAR News</name>
!         <short-name lang="en-GB">STAR News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_news.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 4755,4762 ----
        <package type="subscription">Asian Mela</package>
        <package type="subscription">STAR Bundle</package>
!       <station rfc2838="abpnews.in" type="TV">
!         <name lang="en-GB">ABP News</name>
!         <short-name lang="en-GB">ABP News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/aa/abp_news_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>

Index: freesathd.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/freesathd.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** freesathd.xml	11 May 2012 05:07:48 -0000	1.3
--- freesathd.xml	10 Jun 2012 07:38:03 -0000	1.4
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesathd" modified="2012-05-11T00:39:24 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Freesat" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freesat HD</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesathd" modified="2012-06-10T08:27:26 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Freesat" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freesat HD</display-name>
***************
*** 2593,2600 ****
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.chartshow.com" type="TV">
!         <name lang="en-GB">Chart Show TV +1</name>
!         <short-name lang="en-GB">Chart Show TV +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/chart_show.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 2593,2600 ----
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station type="TV">
!         <name lang="en-GB">BuzMuzik</name>
!         <short-name lang="en-GB">BuzMuzik</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/buz_muzik.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 2607,2611 ****
          <service-id>53335</service-id>
          <lcn>516</lcn>
!         <service-name>Chart Show+1</service-name>
          <encrypted>false</encrypted>
        </dvb-channel>
--- 2607,2611 ----
          <service-id>53335</service-id>
          <lcn>516</lcn>
!         <service-name>BuzMuzik</service-name>
          <encrypted>false</encrypted>
        </dvb-channel>
***************
*** 2854,2857 ****
--- 2854,2879 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>660</preset>
+       <section>Special interest</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">SAB TV</name>
+         <short-name lang="en-GB">SAB TV</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/sony_sab_tv.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <dvb-channel>
+         <original-network-id>2</original-network-id>
+         <service-id>54107</service-id>
+         <lcn>660</lcn>
+         <service-name>SAB TV</service-name>
+         <encrypted>false</encrypted>
+       </dvb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>690</preset>
        <section>Special interest</section>
***************
*** 3911,3914 ****
--- 3933,3958 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>811</preset>
+       <section>Shopping</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">Ideal &amp; More</name>
+         <short-name lang="en-GB">Ideal &amp; More</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/ideal_and_more.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <dvb-channel>
+         <original-network-id>2</original-network-id>
+         <service-id>52235</service-id>
+         <lcn>811</lcn>
+         <service-name>Ideal &amp; More</service-name>
+         <encrypted>false</encrypted>
+       </dvb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>812</preset>
        <section>Shopping</section>

Index: saorview.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/saorview.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** saorview.xml	1 May 2012 05:25:37 -0000	1.2
--- saorview.xml	10 Jun 2012 07:38:03 -0000	1.3
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="saorview" modified="2012-05-01T06:07:27 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Saorview" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Saorview</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="saorview" modified="2012-06-10T08:27:33 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Saorview" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Saorview</display-name>
***************
*** 8,12 ****
      <lineup-entry>
        <preset>1</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="one.rte.ie" type="TV">
--- 8,12 ----
      <lineup-entry>
        <preset>1</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="one.rte.ie" type="TV">
***************
*** 30,34 ****
      <lineup-entry>
        <preset>2</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="hd.two.rte.ie" type="TV">
--- 30,34 ----
      <lineup-entry>
        <preset>2</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="hd.two.rte.ie" type="TV">
***************
*** 52,56 ****
      <lineup-entry>
        <preset>3</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tv3.ie" type="TV">
--- 52,56 ----
      <lineup-entry>
        <preset>3</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tv3.ie" type="TV">
***************
*** 74,78 ****
      <lineup-entry>
        <preset>4</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tg4.ie" type="TV">
--- 74,78 ----
      <lineup-entry>
        <preset>4</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tg4.ie" type="TV">
***************
*** 96,100 ****
      <lineup-entry>
        <preset>6</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="3e.tv3.ie" type="TV">
--- 96,100 ----
      <lineup-entry>
        <preset>6</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="3e.tv3.ie" type="TV">
***************
*** 118,122 ****
      <lineup-entry>
        <preset>7</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="rtejr.rte.ie" type="TV">
--- 118,122 ----
      <lineup-entry>
        <preset>7</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="rtejr.rte.ie" type="TV">
***************
*** 140,144 ****
      <lineup-entry>
        <preset>8</preset>
!       <section>General entertainment</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.one.rte.ie" type="TV">
--- 140,144 ----
      <lineup-entry>
        <preset>8</preset>
!       <section>TV</section>
        <package type="basic">Free-to-air</package>
        <station rfc2838="tsod.plus-1.one.rte.ie" type="TV">
***************
*** 162,166 ****
      <lineup-entry>
        <preset>200</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 162,166 ----
      <lineup-entry>
        <preset>200</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 179,183 ****
      <lineup-entry>
        <preset>201</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 179,183 ----
      <lineup-entry>
        <preset>201</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 196,200 ****
      <lineup-entry>
        <preset>202</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 196,200 ----
      <lineup-entry>
        <preset>202</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 213,217 ****
      <lineup-entry>
        <preset>203</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 213,217 ----
      <lineup-entry>
        <preset>203</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 230,234 ****
      <lineup-entry>
        <preset>204</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 230,234 ----
      <lineup-entry>
        <preset>204</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 247,251 ****
      <lineup-entry>
        <preset>205</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 247,251 ----
      <lineup-entry>
        <preset>205</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 264,268 ****
      <lineup-entry>
        <preset>206</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 264,268 ----
      <lineup-entry>
        <preset>206</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 281,285 ****
      <lineup-entry>
        <preset>207</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 281,285 ----
      <lineup-entry>
        <preset>207</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 298,302 ****
      <lineup-entry>
        <preset>208</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 298,302 ----
      <lineup-entry>
        <preset>208</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 315,319 ****
      <lineup-entry>
        <preset>209</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 315,319 ----
      <lineup-entry>
        <preset>209</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
***************
*** 332,336 ****
      <lineup-entry>
        <preset>209</preset>
!       <section>Radio stations</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">
--- 332,336 ----
      <lineup-entry>
        <preset>209</preset>
!       <section>Radio</section>
        <package type="basic">Free-to-air</package>
        <station type="Radio">

Index: freesat.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/freesat.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** freesat.xml	11 May 2012 05:07:48 -0000	1.3
--- freesat.xml	10 Jun 2012 07:38:03 -0000	1.4
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesat" modified="2012-05-11T00:39:15 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Freesat" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freesat</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="freesat" modified="2012-06-10T08:27:16 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Freesat" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>DTV</type>
      <display-name lang="en-GB">Freesat</display-name>
***************
*** 2460,2467 ****
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station rfc2838="tsod.plus-1.chartshow.com" type="TV">
!         <name lang="en-GB">Chart Show TV +1</name>
!         <short-name lang="en-GB">Chart Show TV +1</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/cc/chart_show.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 2460,2467 ----
        <section>Music</section>
        <package type="basic">Free-to-air</package>
!       <station type="TV">
!         <name lang="en-GB">BuzMuzik</name>
!         <short-name lang="en-GB">BuzMuzik</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/bb/buz_muzik.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 2474,2478 ****
          <service-id>53335</service-id>
          <lcn>516</lcn>
!         <service-name>Chart Show+1</service-name>
          <encrypted>false</encrypted>
        </dvb-channel>
--- 2474,2478 ----
          <service-id>53335</service-id>
          <lcn>516</lcn>
!         <service-name>BuzMuzik</service-name>
          <encrypted>false</encrypted>
        </dvb-channel>
***************
*** 2721,2724 ****
--- 2721,2746 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>660</preset>
+       <section>Special interest</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">SAB TV</name>
+         <short-name lang="en-GB">SAB TV</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/sony_sab_tv.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <dvb-channel>
+         <original-network-id>2</original-network-id>
+         <service-id>54107</service-id>
+         <lcn>660</lcn>
+         <service-name>SAB TV</service-name>
+         <encrypted>false</encrypted>
+       </dvb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>690</preset>
        <section>Special interest</section>
***************
*** 3778,3781 ****
--- 3800,3825 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>811</preset>
+       <section>Shopping</section>
+       <package type="basic">Free-to-air</package>
+       <station type="TV">
+         <name lang="en-GB">Ideal &amp; More</name>
+         <short-name lang="en-GB">Ideal &amp; More</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ii/ideal_and_more.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>SDTV</format>
+           <aspect-ratio>4:3</aspect-ratio>
+         </video>
+       </station>
+       <dvb-channel>
+         <original-network-id>2</original-network-id>
+         <service-id>52235</service-id>
+         <lcn>811</lcn>
+         <service-name>Ideal &amp; More</service-name>
+         <encrypted>false</encrypted>
+       </dvb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>812</preset>
        <section>Shopping</section>

Index: virginhd.xml
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/lineups/virginhd.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** virginhd.xml	14 May 2012 02:51:15 -0000	1.3
--- virginhd.xml	10 Jun 2012 07:38:03 -0000	1.4
***************
*** 2,6 ****
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="virginhd" modified="2012-05-14T03:41:31 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Virgin_TV" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Virgin TV HD</display-name>
--- 2,6 ----
  <?xml-stylesheet href="xmltv-lineups.xsl" type="application/xml"?>
  <xmltv-lineups>
!   <xmltv-lineup id="virginhd" modified="2012-06-10T08:28:02 +0100" source-info-url="http://en.wikipedia.org/wiki/List_of_channels_on_Virgin_TV" generator-info-name="XMLTV lineup generator for UK &amp; Eire" generator-info-url="https://github.com/knowledgejunkie/">
      <type>STB</type>
      <display-name lang="en-GB">Virgin TV HD</display-name>
***************
*** 1675,1680 ****
        <package type="basic">XL</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD</name>
!         <short-name lang="en-GB">GOLD</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1675,1680 ----
        <package type="basic">XL</package>
        <station rfc2838="gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold</name>
!         <short-name lang="en-GB">Gold</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 1694,1699 ****
        <package type="basic">XL</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">GOLD +1</name>
!         <short-name lang="en-GB">GOLD +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
--- 1694,1699 ----
        <package type="basic">XL</package>
        <station rfc2838="tsod.plus-1.gold.uktv.co.uk" type="TV">
!         <name lang="en-GB">Gold +1</name>
!         <short-name lang="en-GB">Gold +1</short-name>
          <logo url="http://www.lyngsat-logo.com/logo/tv/gg/gold_tv.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
***************
*** 4282,4288 ****
        <package type="subscription">Pay-per-view</package>
        <station type="TV">
!         <name lang="en-GB">Red Hot Fetish Nightly</name>
!         <short-name lang="en-GB">Red Hot Fetish Nightly</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/red_hot_fetish.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 4282,4288 ----
        <package type="subscription">Pay-per-view</package>
        <station type="TV">
!         <name lang="en-GB">Red Hot 18s Nightly</name>
!         <short-name lang="en-GB">Red Hot 18s Nightly</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/rr/red_hot_tv_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
***************
*** 4588,4591 ****
--- 4588,4611 ----
      </lineup-entry>
      <lineup-entry>
+       <preset>523</preset>
+       <section>Sport</section>
+       <package type="basic">M+</package>
+       <package type="basic">L</package>
+       <package type="basic">XL</package>
+       <station type="TV">
+         <name lang="en-GB">Eurosport 3D</name>
+         <short-name lang="en-GB">Eurosport 3D</short-name>
+         <logo url="http://www.lyngsat-logo.com/logo/tv/ee/eurosport_3d.jpg" height="99" width="132"/>
+         <commercial-free>false</commercial-free>
+         <video>
+           <format>HDTV</format>
+           <aspect-ratio>16:9</aspect-ratio>
+         </video>
+       </station>
+       <stb-channel>
+         <stb-preset>523</stb-preset>
+       </stb-channel>
+     </lineup-entry>
+     <lineup-entry>
        <preset>525</preset>
        <section>Sport</section>
***************
*** 5539,5546 ****
        <section>International</section>
        <package type="subscription">Subscription channel</package>
!       <station rfc2838="star-news.startv.com" type="TV">
!         <name lang="en-GB">STAR News</name>
!         <short-name lang="en-GB">STAR News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/ss/star_news.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>
--- 5559,5566 ----
        <section>International</section>
        <package type="subscription">Subscription channel</package>
!       <station rfc2838="abpnews.in" type="TV">
!         <name lang="en-GB">ABP News</name>
!         <short-name lang="en-GB">ABP News</short-name>
!         <logo url="http://www.lyngsat-logo.com/logo/tv/aa/abp_news_uk.jpg" height="99" width="132"/>
          <commercial-free>false</commercial-free>
          <video>

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/

_______________________________________________
xmltv-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xmltv-commit
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.