- merge from DEVEL

Changed files:
    mythepg.desktop -> 1.4
    mythprofind.desktop -> 1.4
    mythtv-x11.patch -> 1.2
    mythtv.desktop -> 1.3

diff --git a/mythepg.desktop b/mythepg.desktop
deleted file mode 100644 (file)
index fb4ef4b..0000000
--- a/mythepg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=MythTV EPG
-Comment=Electronic Programm Guide for mythTV.
-GenericName=Electronic Programm Guide
-Icon=mythepg.png
-Exec=mythepg
-Terminal=false
-Type=Application
-Categories=Video;TV;
-# vi: encoding=utf-8

diff --git a/mythprofind.desktop b/mythprofind.desktop
deleted file mode 100644 (file)
index 3bc2fc2..0000000
--- a/mythprofind.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=MythTV progfind
-Comment=Programm finder for mythTV.
-GenericName=Programm finder
-Icon=mythprogfind.png
-Exec=mythprogfind
-Terminal=false
-Type=Application
-Categories=Video;TV;
-# vi: encoding=utf-8

diff --git a/mythtv-x11.patch b/mythtv-x11.patch
deleted file mode 100644 (file)
index e1abea3..0000000
--- a/mythtv-x11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure~       2005-09-04 11:49:01.000000000 +0300
-+++ ./configure        2005-09-04 13:43:02.000000000 +0300
-@@ -1683,7 +1683,7 @@
- 
- if test x"$x11" = x"yes" ; then
-     x11="no"
--    if test -f /usr/X11R6/bin/xinit ; then
-+    if test -f /usr/X11R6/include/X11/X.h; then
-         x11="yes"
-     fi
- fi

diff --git a/mythtv.desktop b/mythtv.desktop
deleted file mode 100644 (file)
index 3c45956..0000000
--- a/mythtv.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=mythTV
-Comment=Record, playback and watch TV.
-Icon=mythtv.png
-Exec=mythtv
-Terminal=false
-Type=Application
-Categories=Video;TV;
-# vi: encoding=utf-8