New upstream release.

diff --git a/ChangeLog b/ChangeLog
index 0bce057dff2ad3083bdc079ca73224ab32ce57dd..ad69647033633368131bc79ca0074fdb2bbbbdac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r512 | gregoa | 2008-03-28 23:24:47 +0100 (Fri, 28 Mar 2008) | 1 line
+Changed paths:
+   M /teleschorsch/trunk/teleschorschrc
+
+add ZIB20 and ZIB24
+------------------------------------------------------------------------
 r481 | gregoa | 2007-11-03 19:22:17 +0100 (Sat, 03 Nov 2007) | 1 line
 Changed paths:
    M /teleschorsch/trunk/makedist

diff --git a/debian/changelog b/debian/changelog
index e0832e80a7369f0f81da958ee88b92b6d52355ba..74a9f0a75085dee0282fcd239efd9d2bebcb4869 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-teleschorsch (0.2.1-2) UNRELEASED; urgency=low
+teleschorsch (0.2.2-1) UNRELEASED; urgency=low
 
   * Set Standards-Version to 3.7.3 (no changes required).
   * Clean up debian/rules.
@@ -6,8 +6,10 @@ teleschorsch (0.2.1-2) UNRELEASED; urgency=low
   * Change Apps to Applications in menu file.
   * Change debian/copyright to the new machine-readable format.
   * Add watch file.
+  
+  * New upstream release.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 29 Feb 2008 17:51:19 +0100
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 28 Mar 2008 23:27:53 +0100
 
 teleschorsch (0.2.1-1) unstable; urgency=low
 

diff --git a/teleschorschrc b/teleschorschrc
index 899eba25aff12d1256ee53f39066935a81ce0e29..1e0e5ceb0a2ced4d703bca9a70bbc982e355f29f 100644 (file)
--- a/teleschorschrc
+++ b/teleschorschrc
@@ -8,6 +8,16 @@ FULLNAME=ORF - Zeit im Bild 2
 STATICURL=http://stream5.orf.at/zib2/zib2200_${Y}_${m}_${d}.wmv
 PLAYER=vlc
 
+[ORFZIB20]
+FULLNAME=ORF - ZIB 20
+STATICURL=mms://stream5.orf.at/zib20/zib20_${Y}_${m}_${d}.wmv
+PLAYER=vlc
+
+[ORFZIB24]
+FULLNAME=ORF - ZIB 24
+STATICURL=mms://stream5.orf.at/zib24/zib24_${Y}_${m}_${d}.wmv
+PLAYER=vlc
+
 [ORFHEUTE]
 FULLNAME=ORF - Heute in Österreich
 STATICURL=http://stream5.orf.at/hioe/hioe_${Y}_${m}_${d}.wmv