update default bouquet

2 files changed, 130 insertions, 109 deletions

diff --git a/packages/enigma/enigma/opendreambox/userbouquet.33fc5.tv b/packages/enigma/enigma/opendreambox/userbouquet.33fc5.tv
index 2c836163d8..e232c5b621 100644
--- a/packages/enigma/enigma/opendreambox/userbouquet.33fc5.tv
+++ b/packages/enigma/enigma/opendreambox/userbouquet.33fc5.tv
@@ -1,108 +1,129 @@
-#NAME Favourites (TV)
-#SERVICE: 1:0:1:6DCA:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6D66:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6DCC:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2EE3:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:445C:453:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2EF4:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:445D:453:1:C00000:0:0:0:
-#SERVICE: 1:0:1:445E:453:1:C00000:0:0:0:
-#SERVICE: 1:0:1:33:21:85:C00000:0:0:0:
-#SERVICE: 1:0:1:701:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:2F1C:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:7005:436:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6DCD:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6D67:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E29:431:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E2A:431:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E2B:431:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6DCB:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E2C:431:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E2D:431:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6F46:445:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6DCF:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6E41:431:1:C00000:0:0:0:
-#SERVICE: 1:64:B:0:0:0:0:0:0:0:
-#DESCRIPTION: Doku/Wissen/Themen
-#SERVICE: 1:0:1:6DD0:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:4289:446:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6D6E:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6D6B:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2775:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:202:7:85:C00000:0:0:0:
-#SERVICE: 1:0:1:293:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:3158:459:1:C00000:0:0:0:
-#SERVICE: 1:0:1:3138:459:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2FE:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:6D70:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:3139:459:1:C00000:0:0:0:
-#SERVICE: 1:0:1:F1CC:421:1:C00000:0:0:0:
-#SERVICE: 1:64:A:0:0:0:0:0:0:0:
-#DESCRIPTION: Sport
-#SERVICE: 1:0:1:384:21:85:C00000:0:0:0:
-#SERVICE: 1:0:1:79E0:443:1:C00000:0:0:0:
-#SERVICE: 1:64:1:0:0:0:0:0:0:0:
-#DESCRIPTION: Kinder
-#SERVICE: 1:0:1:2F08:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6D68:437:1:C00000:0:0:0:
-#SERVICE: 1:0:1:7008:436:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6FE0:443:1:C00000:0:0:0:
-#SERVICE: 1:64:2:0:0:0:0:0:0:0:
-#DESCRIPTION: Nachrichten
-#SERVICE: 1:0:1:2F3A:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:445F:453:1:C00000:0:0:0:
-#SERVICE: 1:0:1:79F4:443:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6DD2:44D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2F80:454:1:C00000:0:0:0:
-#SERVICE: 1:64:3:0:0:0:0:0:0:0:
-#DESCRIPTION: Regional
-#SERVICE: 1:0:1:3146:459:1:C00000:0:0:0:
-#SERVICE: 1:0:1:300:7:85:C00000:0:0:0:
-#SERVICE: 1:0:1:2778:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6F45:445:1:C00000:0:0:0:
-#SERVICE: 1:0:1:277A:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2779:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2777:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:32D6:45D:1:C00000:0:0:0:
-#SERVICE: 1:64:4:0:0:0:0:0:0:0:
-#DESCRIPTION: Musik
-#SERVICE: 1:0:1:308:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:2774:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:7004:436:1:C00000:0:0:0:
-#SERVICE: 1:0:1:7001:436:1:C00000:0:0:0:
-#SERVICE: 1:0:1:6FE1:443:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2FD:7:85:C00000:0:0:0:
-#SERVICE: 1:0:1:32D5:45D:1:C00000:0:0:0:
-#SERVICE: 1:0:1:277B:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:332E:45B:1:C00000:0:0:0:
-#SERVICE: 1:0:1:304:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:702:5:85:C00000:0:0:0:
-#SERVICE: 1:64:5:0:0:0:0:0:0:0:
-#DESCRIPTION: Reisen
-#SERVICE: 1:0:1:20:21:85:C00000:0:0:0:
-#SERVICE: 1:0:1:2FC:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:301:7:85:C00000:0:0:0:
-#SERVICE: 1:64:9:0:0:0:0:0:0:0:
-#DESCRIPTION: Beratung
-#SERVICE: 1:0:1:295:21:85:C00000:0:0:0:
-#SERVICE: 1:0:1:277C:444:1:C00000:0:0:0:
-#SERVICE: 1:0:1:F9B:454:1:C00000:0:0:0:
-#SERVICE: 1:64:6:0:0:0:0:0:0:0:
-#DESCRIPTION: Einkaufen
-#SERVICE: 1:0:1:2F30:441:1:C00000:0:0:0:
-#SERVICE: 1:0:1:28:21:85:C00000:0:0:0:
-#SERVICE: 1:0:1:79EA:443:1:C00000:0:0:0:
-#SERVICE: 1:0:1:2F44:454:1:C00000:0:0:0:
-#SERVICE: 1:0:1:3148:459:1:C00000:0:0:0:
-#SERVICE: 1:0:1:332D:45B:1:C00000:0:0:0:
-#SERVICE: 1:0:1:36:7:85:C00000:0:0:0:
-#SERVICE: 1:0:1:307:7:85:C00000:0:0:0:
-#SERVICE: 1:0:1:296:5:85:C00000:0:0:0:
-#SERVICE: 1:0:1:F20B:421:1:C00000:0:0:0:
-#SERVICE: 1:0:1:1782:457:1:C00000:0:0:0:
-#SERVICE: 1:64:8:0:0:0:0:0:0:0:
-#DESCRIPTION: Gewinnspiele
-#SERVICE: 1:0:1:381:21:85:C00000:0:0:0:
-#SERVICE: 1:64:7:0:0:0:0:0:0:0:
-#DESCRIPTION: Anzeigen
-#SERVICE: 1:0:1:313C:459:1:C00000:0:0:0:
+#NAME Favourites (TV)

+#SERVICE: 1:0:1:6dca:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d66:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6dcc:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2ee3:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:445c:453:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2ef4:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:445d:453:1:c00000:0:0:0:

+#SERVICE: 1:0:1:445e:453:1:c00000:0:0:0:

+#SERVICE: 1:0:1:33:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:701:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:2f1c:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7005:436:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2fc:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:7034:41b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d67:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7031:41b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7032:41b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7033:41b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e46:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6dce:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6dd1:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6dcf:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e42:431:1:c00000:0:0:0:

+#SERVICE: 1:64:b:0:0:0:0:0:0:0:

+#DESCRIPTION: Doku/Wissen/Themen

+#SERVICE: 1:0:1:6dd0:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d6e:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d6b:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2775:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:202:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:293:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:3138:459:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d70:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:277b:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:297:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:3139:459:1:c00000:0:0:0:

+#SERVICE: 1:0:1:f1cc:421:1:c00000:0:0:0:

+#SERVICE: 1:64:a:0:0:0:0:0:0:0:

+#DESCRIPTION: Sport

+#SERVICE: 1:0:1:384:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:79e0:443:1:c00000:0:0:0:

+#SERVICE: 1:64:1:0:0:0:0:0:0:0:

+#DESCRIPTION: Kinder

+#SERVICE: 1:0:1:2f08:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6d68:437:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7008:436:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6fe0:443:1:c00000:0:0:0:

+#SERVICE: 1:64:2:0:0:0:0:0:0:0:

+#DESCRIPTION: Nachrichten

+#SERVICE: 1:0:1:2f3a:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:445f:453:1:c00000:0:0:0:

+#SERVICE: 1:0:1:79f4:443:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7035:41b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2f80:454:1:c00000:0:0:0:

+#SERVICE: 1:64:3:0:0:0:0:0:0:0:

+#DESCRIPTION: Regional

+#SERVICE: 1:0:1:3146:459:1:c00000:0:0:0:

+#SERVICE: 1:0:1:300:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:2778:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:277a:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2779:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2777:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:32d6:45d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:277d:444:1:c00000:0:0:0:

+#SERVICE: 1:64:4:0:0:0:0:0:0:0:

+#DESCRIPTION: Musik

+#SERVICE: 1:0:1:308:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:2774:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7004:436:1:c00000:0:0:0:

+#SERVICE: 1:0:1:7001:436:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6fe1:443:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2fd:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:32d5:45d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:332e:45b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:304:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:702:5:85:c00000:0:0:0:

+#SERVICE: 1:64:5:0:0:0:0:0:0:0:

+#DESCRIPTION: Reisen

+#SERVICE: 1:0:1:20:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:301:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:27a8:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:3339:45b:1:c00000:0:0:0:

+#SERVICE: 1:64:9:0:0:0:0:0:0:0:

+#DESCRIPTION: Beratung

+#SERVICE: 1:0:1:295:21:85:c00000:0:0:0:

+#SERVICE: 1:64:6:0:0:0:0:0:0:0:

+#DESCRIPTION: Einkaufen

+#SERVICE: 1:0:1:2f30:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2f3f:441:1:c00000:0:0:0:

+#SERVICE: 1:0:1:28:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:79ea:443:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2f44:454:1:c00000:0:0:0:

+#SERVICE: 1:0:1:3148:459:1:c00000:0:0:0:

+#SERVICE: 1:0:1:332d:45b:1:c00000:0:0:0:

+#SERVICE: 1:0:1:36:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:307:7:85:c00000:0:0:0:

+#SERVICE: 1:0:1:296:5:85:c00000:0:0:0:

+#SERVICE: 1:0:1:2791:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:383:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:313c:459:1:c00000:0:0:0:

+#SERVICE: 1:0:1:278c:444:1:c00000:0:0:0:

+#SERVICE: 1:0:1:2e:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:381:21:85:c00000:0:0:0:

+#SERVICE: 1:0:1:2fe:5:85:c00000:0:0:0:

+#SERVICE: 1:64:0:0:0:0:0:0:0:0:

+#DESCRIPTION: Alternativen

+#SERVICE: 1:0:1:6dcb:44d:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e44:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e45:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e41:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e40:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e43:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6ee1:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e2d:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e2e:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6f46:445:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e47:431:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6f76:457:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e92:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e93:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6f78:457:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6f79:457:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e94:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6f77:457:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6eeb:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e97:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e96:4b1:1:c00000:0:0:0:

+#SERVICE: 1:0:1:6e95:4b1:1:c00000:0:0:0:

diff --git a/packages/enigma/enigma_cvs.bb b/packages/enigma/enigma_cvs.bb
index 412d7d2b98..25ff2a8f37 100644
--- a/packages/enigma/enigma_cvs.bb
+++ b/packages/enigma/enigma_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 SRCDATE = "20070615"
 PV = "cvs-${SRCDATE}"
 PN = "enigma"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "cvs://anoncvs@cvs.tuxbox.org/cvs/tuxbox;module=apps/tuxbox/enigma;method=ext \
            file://enigma.sh \