xmltv/grab/no_gfeed test.conf,1.9,1.10

Update of /cvsroot/xmltv/xmltv/grab/no_gfeed
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10257

Modified Files:
	test.conf 
Log Message:
(nightly tester) replace channels no longer in feed

Index: test.conf
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/no_gfeed/test.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test.conf	28 Feb 2014 22:30:28 -0000	1.9
--- test.conf	19 Jun 2015 17:50:55 -0000	1.10
***************
*** 1,58 ****
  root-url=http://data.epg.no/xmltv/channels.xml.gz
  cachedir=/tmp/.xmltv/cache
! channel=ab.tv8norge.no
  channel!action.film.viasat.no
  channel!animalplanet.discovery.no
  channel!bbcworldnews.com
  channel!bliss.tv2.no
! channel!canal9.no
  channel!classic.film.viasat.no
  channel!dance.mtv.no
! channel!discovery.no
  channel!drama.film.viasat.no
  channel!explorer.viasat.no
  channel!family.film.viasat.no
  channel=fem.no
! channel=film.tv2.no
  channel!film.viasat.no
! channel=follo.tv8norge.no
  channel!fotball.viasat.no
  channel!golf.viasat.no
  channel!hd.animalplanet.discovery.no
  channel!hd.discovery.no
  channel!history.viasat.no
  channel!hits.mtv.no
  channel!hockey.viasat.no
  channel!investigation.discovery.no
  channel!max.no
  channel!motor.viasat.no
  channel!mtv.no
  channel!natgeo.no
  channel!nature.viasat.no
  channel!nickelodeon.no
  channel!no.eonline.com
  channel!no.hbonordic.tv
! channel!nordic.film.viasat.no
  channel!nrk1.nrk.no
  channel!nrk2.nrk.no
  channel!nrk3.nrk.no
! channel!oslo.tv8norge.no
! channel!ostfold.tv8norge.no
  channel!p1.nrk.no
  channel!p2.nrk.no
  channel!rocks.mtv.no
! channel!romerike.tv8norge.no
  channel!science.discovery.no
! channel!sf-kanalen.cmore.se
  channel!sport.tv2.no
  channel!sport.viasat.no
  channel!supertv.nrk.no
  channel!tlc.discovery.no
  channel!tv2.no
  channel!tv3.no
  channel!tv6norge.no
  channel!tvnorge.no
  channel!viasat4.no
  channel!voxtv.no
  channel!world.discovery.no
  channel!zebra.tv2.no
--- 1,223 ----
  root-url=http://data.epg.no/xmltv/channels.xml.gz
  cachedir=/tmp/.xmltv/cache
! channel=16.viasat.no
! channel!1tvrus.com
! channel!360tunebox.spi.pl
! channel!3sat.de
! channel=action.cmore.no
  channel!action.film.viasat.no
+ channel!adultchannel.co.uk
+ channel!aljazeera.net
+ channel!animalplanet.discovery.eu
  channel!animalplanet.discovery.no
+ channel!animalplanethd.discovery.eu
+ channel!ar.france24.com
+ channel!arab.aljazeera.net
+ channel!arte.de
+ channel!arthouse.spi.pl
+ channel! bandit.no
  channel!bbcworldnews.com
+ channel!bergen.p5.no
  channel!bliss.tv2.no
! channel!boomerangtv.no
! channel!brazzerstveurope.com
! channel!cartoonnetwork.no
! channel!cbsreality.tv
  channel!classic.film.viasat.no
+ channel!classic.vh1.se
+ channel!cnn.com
+ channel!comedy.film.viasat.no
+ channel!comedycentral.no
  channel!dance.mtv.no
! channel!daserste.de
! channel=discovery.no
! channel!disneychannel.no
! channel!docubox.spi.pl
! channel!dr1.dr.dk
! channel!dr2.dr.dk
! channel!dr3.dr.dk
  channel!drama.film.viasat.no
+ channel!dw.de
+ channel!emotion.cmore.no
+ channel!en.discovery.no
+ channel!en.tlc.discovery.no
+ channel!eu.eonline.com
+ channel!euronews.com
+ channel!europe.bluehustler.com
+ channel!europe.cnbc.com
+ channel!europe.daringtv.com
+ channel!europe.hustlertv.com
+ channel!europe.playboytv.com
+ channel!eurosport.no
+ channel!eurosport2.no
  channel!explorer.viasat.no
+ channel!extreme.cmore.no
+ channel!extremesports.com
  channel!family.film.viasat.no
+ channel!fashionbox.spi.pl
+ channel!fastandfun.spi.pl
  channel=fem.no
! channel!fightbox.spi.pl
  channel!film.viasat.no
! channel!finelivingnetwork.com
! channel!first.cmore.no
! channel!foodnetworktv.com
! channel!fotball.cmore.no
  channel!fotball.viasat.no
+ channel!foxtv.no
+ channel!fr.france24.com
+ channel!france24.com
+ channel!frikanalen.tv
+ channel!ftv.com
+ channel!fuel.tv
+ channel!ginx.tv
+ channel!god.tv
  channel!golf.viasat.no
+ channel!gospel.tv
+ channel!h2.historytv.no
  channel!hd.animalplanet.discovery.no
+ channel!hd.daserste.de
+ channel!hd.discovery.eu
  channel!hd.discovery.no
+ channel!hd.first.cmore.no
+ channel!hd.fotball.cmore.no
+ channel!hd.ftv.com
+ channel!hd.hits.cmore.no
+ channel!hd.hockey.cmore.no
+ channel!hd.live.cmore.no
+ channel!hd.live2.cmore.no
+ channel!hd.live3.cmore.no
+ channel!hd.live4.cmore.no
+ channel!hd.mezzo.tv
+ channel!hd.mtv.se
+ channel!hd.series.cmore.no
+ channel!hd.zdf.de
+ channel!hightv.tv
  channel!history.viasat.no
+ channel!historytv.no
+ channel!hits.cmore.no
  channel!hits.mtv.no
+ channel!hits.p5.no
+ channel!hockey.cmore.no
  channel!hockey.viasat.no
+ channel!hockeyfinland.viasat.fi
+ channel!horseandcountry.tv
+ channel!htv1.hrt.hr
+ channel!htv2.hrt.hr
+ channel!htv3.hrt.hr
+ channel!htv4.hrt.hr
+ channel!humor.tv2.no
+ channel!int.kinopolska.pl
+ channel!int.kinopolskamuzyka.pl
+ channel!international.rt.com
+ channel!international.skynews.com
  channel!investigation.discovery.no
+ channel!junior.disneychannel.no
+ channel!kabel1.de
+ channel!kanal10.no
+ channel!live.cmore.no
+ channel!live2.cmore.no
+ channel!live3.cmore.no
+ channel!live4.cmore.no
+ channel!luxe.tv
  channel!max.no
+ channel!mezzo.tv
  channel!motor.viasat.no
+ channel!motorstv.com
  channel!mtv.no
+ channel!music24.mtv.no
  channel!natgeo.no
  channel!nature.viasat.no
+ channel!nauticalchannel.net
+ channel!news.tv2.no
+ channel!nickdk-mtvhits.sat.viasat.dk
  channel!nickelodeon.no
+ channel!nickjr.no
+ channel!nickno-vh1classic.sat.viasat.no
+ channel!no.bbcentertainment.no
+ channel!no.bbchd.no
+ channel!no.bbcknowledge.no
+ channel!no.bbclifestyle.no
  channel!no.eonline.com
  channel!no.hbonordic.tv
! channel!no.showtime.nonstop.tv
! channel!no.silver.nonstop.tv
! channel!no.tcmeurope.com
! channel!nonstophits.p5.no
! channel!nrj.no
  channel!nrk1.nrk.no
  channel!nrk2.nrk.no
  channel!nrk3.nrk.no
! channel!nrk3super.nrk.no
! channel!orf2.orf.at
! channel!outdoorchannel.com
  channel!p1.nrk.no
+ channel!p10mix.p4.no
  channel!p2.nrk.no
+ channel!p4.no
+ channel!p6rock.p4.no
+ channel!p7klem.p4.no
+ channel!p8pop.p4.no
+ channel!p9retro.p4.no
+ channel!phoenixtv.com.cn
+ channel!pl1.tv2.no
+ channel!pl2.tv2.no
+ channel!pl3.tv2.no
+ channel!polonia.tvp.pl
+ channel!prosieben.de
+ channel!protv.ro
+ channel!radio1.radioplay.no
+ channel!radiocountry.p4.no
+ channel!radionorge.radioplay.no
+ channel!radiorock.radioplay.no
+ channel!radioseven.se
+ channel!rockklassiker.radioplay.no
  channel!rocks.mtv.no
! channel!rtl2.de
! channel!russia.rt.com
! channel!sat1.de
  channel!science.discovery.no
! channel!series.cmore.no
! channel!sf-kanalen.cmore.no
! channel!skysportsnews.radioplay.no
  channel!sport.tv2.no
  channel!sport.viasat.no
+ channel!star.nonstop.tv
+ channel!stavanger.p5.no
  channel!supertv.nrk.no
+ channel!svt1.svt.se
+ channel!svt2.svt.se
+ channel!svt24.svt.se
+ channel!svtb-svt24.svt.se
+ channel!svtworld.svt.se
+ channel!tennis.cmore.no
+ channel!thevoice.radioplay.no
  channel!tlc.discovery.no
+ channel!tnt-tv.no
+ channel!travelchanneltv.se
+ channel!trondheim.p5.no
+ channel!tv1.rai.it
+ channel!tv2.dk
  channel!tv2.no
+ channel!tv2.rai.it
+ channel!tv2nyhetskanalen.radioplay.no
  channel!tv3.no
+ channel!tv3.rai.it
+ channel!tv3.se
+ channel!tv4.se
+ channel!tv5monde.org
  channel!tv6norge.no
+ channel!tvchile.cl
+ channel!tvfinland.yle.fi
  channel!tvnorge.no
+ channel!vh1.no
  channel!viasat4.no
+ channel!visjonnorge.com
  channel!voxtv.no
+ channel!wild.natgeo.no
+ channel!wildtv.ca
+ channel!world.discovery.eu
  channel!world.discovery.no
+ channel!xd.disneychannel.no
+ channel!zdf.de
  channel!zebra.tv2.no


------------------------------------------------------------------------------