Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 11

freetuxtv.changes Added

@@ -0,0 +1,51 @@
+-------------------------------------------------------------------
+Mon Jan 27 13:41:26 UTC 2014 - guillaume@opensuse.org
+
+- Clean-up spec file
+- Now use GTK-3 when available since GTK-2 build is broken
+
+-------------------------------------------------------------------
+Mon Jan 27 13:21:05 UTC 2014 - guillaume@opensuse.org
+
+- Update to FreetuxTV 0.6.6 (2014-01-18):
+ - Use correctly libvlc options
+ - Add Turkish translation
+ - Add Spanish translation
+ - Add missing logo size
+ - Download icons options
+
+-------------------------------------------------------------------
+Mon Jan 27 13:20:03 UTC 2014 - guillaume@opensuse.org
+
+- Move changelog from *.spec file to *.changes file
+
+-------------------------------------------------------------------
+Wed Apr 18 2012 - Benjamin Denisart <p.drouand@gmail.com>
+
+- Freetuxtv version 0.6.3
+
+-------------------------------------------------------------------
+Sun Mar 21 2010 - Gilles Sabourin <gilles.sabourin@free.fr>
+
+- Freetuxtv version 0.4.2
+
+-------------------------------------------------------------------
+Sat Dec 12 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
+
+- Freetuxtv version 0.4.0
+
+-------------------------------------------------------------------
+Wed Aug 26 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
+
+- Source is bziped
+- Freetuxtv version 0.3.0
+
+-------------------------------------------------------------------
+Sun Jan 18 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
+
+- Added norootforbuild directive
+
+-------------------------------------------------------------------
+Tue Nov 11 2008 - Gilles Sabourin <gilles.sabourin@free.fr>
+
+- Initial build for openSUSE 11.0

freetuxtv.spec Changed

@@ -1,22 +1,34 @@
 # norootforbuild
 %define vlcbetadev %(rpm -q --quiet vlc-beta-devel ; if test $? != 0 ; then echo 0 ; else echo 1 ; fi )
 
-Summary: Player Free / Neuf TV
-Name: 	freetuxtv
-Version:	0.6.5
-Release:	1
+%if 0%{?suse_version} < 1220
+# openSUSE before 12.2 has only GTK-2 and no GTK-3
+%define gtk_version 2
+%else
+%define gtk_version 3
+%endif
+
+Summary: Player Free / Neuf TV
+Name: 	 freetuxtv
+Version:	0.6.6
+Release:	0
 Source: 	%{name}-%{version}.tar.gz
 License: 	GPL-2.0
 Url: http://code.google.com/p/freetuxtv/
-Group: Productivity/Multimedia/Video/Players
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gtk2-devel >= 2.12 glib2-devel >= 2.16 libglade2-devel >= 2.6
-BuildRequires: libcurl-devel >= 7.16.4 sqlite3-devel > 3.4.0
-BuildRequires: dbus-1-glib-devel >= 0.74
-BuildRequires: libgthread-2_0-0
-BuildRequires: gettext-devel libstdc++-devel
-BuildRequires: vlc-devel >= 2.0
-BuildRequires: intltool
+Group: Productivity/Multimedia/Video/Players
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{gtk_version} == 2
+BuildRequires: gtk2-devel >= 2.12
+%else
+BuildRequires: gtk3-devel
+%endif
+BuildRequires: glib2-devel >= 2.16 libglade2-devel >= 2.6
+BuildRequires: libcurl-devel >= 7.18.0 sqlite3-devel > 3.4.0
+BuildRequires: dbus-1-glib-devel >= 0.74
+BuildRequires: libgthread-2_0-0
+BuildRequires: gettext-devel libstdc++-devel
+BuildRequires: vlc-devel >= 2.0
+BuildRequires: intltool
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: automake
@@ -47,7 +59,12 @@
 
 %build 
 
-./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir} --with-gtk=2.0
+%configure \
+%if %{gtk_version} == 2
+ --with-gtk=2.0
+%else
+ --with-gtk=3.0
+%endif
 make %{?_smp_mflags}
 
 
@@ -56,9 +73,6 @@
 %find_lang %{name}
 rm -r %{buildroot}/%{_datadir}/%{name}/doc
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
 
 %files
 %defattr(-,root,root)
@@ -93,21 +107,3 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Apr 18 2012 - Benjamin Denisart <p.drouand@gmail.com>
-- Freetuxtv version 0.6.3
-
-* Sun Mar 21 2010 - Gilles Sabourin <gilles.sabourin@free.fr>
-- Freetuxtv version 0.4.2
-
-* Sat Dec 12 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
-- Freetuxtv version 0.4.0
-
-* Wed Aug 26 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
-- Source is bziped
-- Freetuxtv version 0.3.0
-
-* Sun Jan 18 2009 - Gilles Sabourin <gilles.sabourin@free.fr>
-- Added norootforbuild directive
-
-* Tue Nov 11 2008 - Gilles Sabourin <gilles.sabourin@free.fr>
-- Initial build for openSUSE 11.0

freetuxtv-0.6.5.tar.gz/mkinstalldirs Deleted

@@ -1,162 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2009-04-28.21; # UTC
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
- else
-	if test ! -z "$dirmode"; then
-	 echo "chmod $dirmode $pathcomp"
-	 lasterr=
-	 chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	 if test ! -z "$lasterr"; then
-	 errstatus=$lasterr
-	 fi
-	fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

freetuxtv-0.6.5.tar.gz/ChangeLog -> freetuxtv-0.6.6.tar.gz/ChangeLog Changed

freetuxtv-0.6.5.tar.gz/Makefile.in -> freetuxtv-0.6.6.tar.gz/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,30 +79,48 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing mkinstalldirs
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in COPYING compile config.guess config.sub \
+	install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -90,11 +152,33 @@
 DATA = $(freetuxtvdoc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -105,6 +189,7 @@
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$[^/]*$/.*$$,\1,'; \
@@ -132,6 +217,7 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -396,8 +482,11 @@
 	-rm -f libtool config.lt
 install-freetuxtvdocDATA: $(freetuxtvdoc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(freetuxtvdocdir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvdocdir)"
 	@list='$(freetuxtvdoc_DATA)'; test -n "$(freetuxtvdocdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvdocdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(freetuxtvdocdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -414,22 +503,25 @@
 	dir='$(DESTDIR)$(freetuxtvdocdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'

freetuxtv-0.6.5.tar.gz/aclocal.m4 -> freetuxtv-0.6.6.tar.gz/aclocal.m4 Changed

@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -337,7 +337,6 @@
 dnl
 glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -1990,7 +1989,14 @@
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -2354,7 +2360,8 @@
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -3178,17 +3185,6 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -3305,7 +3301,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3921,10 +3917,6 @@
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3963,7 +3955,7 @@
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4715,7 +4707,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -5014,7 +5006,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -6903,9 +6895,6 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -7067,7 +7056,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -9471,25 +9460,22 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.13.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9505,24 +9491,22 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to

freetuxtv-0.6.5.tar.gz/compile -> freetuxtv-0.6.6.tar.gz/compile Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -79,6 +78,53 @@
 esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +155,34 @@
 	 ;;
 	 esac
 	 ;;
+	-I)
+	 eat=1
+	 func_file_conv "$2" mingw
+	 set x "$@" -I"$file"
+	 shift
+	 ;;
 	-I*)
 	 func_file_conv "${1#-I}" mingw
 	 set x "$@" -I"$file"
 	 shift
 	 ;;
+	-l)
+	 eat=1
+	 func_cl_dashl "$2"
+	 set x "$@" "$lib"
+	 shift
+	 ;;
 	-l*)
-	 lib=${1#-l}
-	 found=no
-	 save_IFS=$IFS
-	 IFS=';'
-	 for dir in $lib_path $LIB
-	 do
-	 IFS=$save_IFS
-	 if $shared && test -f "$dir/$lib.dll.lib"; then
-	 found=yes
-	 set x "$@" "$dir/$lib.dll.lib"
-	 break
-	 fi
-	 if test -f "$dir/$lib.lib"; then
-	 found=yes
-	 set x "$@" "$dir/$lib.lib"
-	 break
-	 fi
-	 done
-	 IFS=$save_IFS
-
-	 test "$found" != yes && set x "$@" "$lib.lib"
+	 func_cl_dashl "${1#-l}"
+	 set x "$@" "$lib"
 	 shift
 	 ;;
+	-L)
+	 eat=1
+	 func_cl_dashL "$2"
+	 ;;
 	-L*)
-	 func_file_conv "${1#-L}"
-	 if test -z "$lib_path"; then
-	 lib_path=$file
-	 else
-	 lib_path="$lib_path;$file"
-	 fi
-	 linker_opts="$linker_opts -LIBPATH:$file"
+	 func_cl_dashL "${1#-L}"
 	 ;;
 	-static)
 	 shared=false

freetuxtv-0.6.5.tar.gz/config.guess -> freetuxtv-0.6.6.tar.gz/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+ *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@
 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+ *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -852,21 +874,21 @@
 	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
 aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@
 	 EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	 then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	 else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	 fi
 	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

freetuxtv-0.6.5.tar.gz/config.sub -> freetuxtv-0.6.6.tar.gz/config.sub Changed

freetuxtv-0.6.5.tar.gz/configure -> freetuxtv-0.6.6.tar.gz/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for freetuxtv 0.6.5.
+# Generated by GNU Autoconf 2.69 for freetuxtv 0.6.6.
 #
 # Report bugs to <http://code.google.com/p/freetuxtv/issues/list>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
@@ -169,7 +192,8 @@
 else
 exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -222,21 +246,25 @@
 
 
 if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	 *v*x* | *x*v* ) as_opts=-vx ;;
-	 *v* ) as_opts=-v ;;
-	 *x* ) as_opts=-x ;;
-	 * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
 if test x$as_have_required = xno; then :
@@ -339,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -460,6 +496,10 @@
 chmod +x "$as_me.lineno" ||
 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
 # Don't try to exec as it changes $[0], causing all sort of problems
 # (the dirname of $[0] is not the place where we might find the
 # original and so on. Autoconf is especially sensitive to this).
@@ -494,16 +534,16 @@
 # ... but there are two gotchas:
 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
 as_ln_s=ln
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -515,28 +555,8 @@
 as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
-	test -d "$1/.";
- else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -570,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='freetuxtv'
 PACKAGE_TARNAME='freetuxtv'
-PACKAGE_VERSION='0.6.5'
-PACKAGE_STRING='freetuxtv 0.6.5'
+PACKAGE_VERSION='0.6.6'
+PACKAGE_STRING='freetuxtv 0.6.6'
 PACKAGE_BUGREPORT='http://code.google.com/p/freetuxtv/issues/list'
 PACKAGE_URL='http://code.google.com/p/freetuxtv/'
 
@@ -672,7 +692,6 @@
 INTLTOOL__v_MERGE_0
 INTLTOOL__v_MERGE_
 INTLTOOL_V_MERGE
-AM_DEFAULT_VERBOSITY
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -745,6 +764,10 @@
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE

freetuxtv-0.6.5.tar.gz/configure.ac -> freetuxtv-0.6.6.tar.gz/configure.ac Changed

freetuxtv-0.6.5.tar.gz/data/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,24 +79,42 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -85,9 +147,29 @@
 DATA = $(freetuxtvdata_DATA) $(xml_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -359,8 +441,11 @@
 	-rm -rf .libs _libs
 install-freetuxtvdataDATA: $(freetuxtvdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(freetuxtvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvdatadir)"
 	@list='$(freetuxtvdata_DATA)'; test -n "$(freetuxtvdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(freetuxtvdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -377,8 +462,11 @@
 	dir='$(DESTDIR)$(freetuxtvdatadir)'; $(am__uninstall_files_from_dir)
 install-xmlDATA: $(xml_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
 	@list='$(xml_DATA)'; test -n "$(xmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(xmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(xmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -395,22 +483,25 @@
 	dir='$(DESTDIR)$(xmldir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \

freetuxtv-0.6.5.tar.gz/data/channels_groups.xml.in -> freetuxtv-0.6.6.tar.gz/data/channels_groups.xml.in Changed

@@ -21,98 +21,245 @@
 	<language lang="Darty" id="darty">
 		<channels_group name="Darty TV" uri="http://dartybox-news.fr/ftp/dartyboxtvpc.m3u" required_isp="Darty"/>
 	</language>
+	<language id="af" _lang="Afrikaans Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_af.m3u" _name="Web TV (Afrikaans)"></channels_group>
+	</language>
+	<language id="sq" _lang="Albanian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_sq.m3u" _name="Web TV (Albanian)"></channels_group>
+	</language>
+	<language id="am" _lang="Amharic Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_am.m3u" _name="Web TV (Amharic)"></channels_group>
+	</language>
 	<language id="ar" _lang="Arabic Web TV and Radio">
-		<channels_group _name="Web Radio (Arabic)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_ar.m3u" />
-		<channels_group _name="Web TV (Arabic)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ar.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ar.m3u" _name="Web TV (Arabic)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ar.m3u" _name="Web Radio (Arabic)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_ar.m3u" _name="Web Cam (Arabic)"></channels_group>
+	</language>
+	<language id="hy" _lang="Armenian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hy.m3u" _name="Web TV (Armenian)"></channels_group>
+	</language>
+	<language id="az" _lang="Azerbaijani Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_az.m3u" _name="Web TV (Azerbaijani)"></channels_group>
+	</language>
+	<language id="bn" _lang="Bengali/Bangla Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_bn.m3u" _name="Web TV (Bengali/Bangla)"></channels_group>
+	</language>
+	<language id="bg" _lang="Bulgarian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_bg.m3u" _name="Web TV (Bulgarian)"></channels_group>
+	</language>
+	<language id="km" _lang="Cambodian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_km.m3u" _name="Web TV (Cambodian)"></channels_group>
 	</language>
 	<language id="ca" _lang="Catalan Web TV and Radio">
-		<channels_group _name="Web Radio (Catalan)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_ca.m3u" />
-		<channels_group _name="Web TV (Catalan)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ca.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ca.m3u" _name="Web TV (Catalan)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ca.m3u" _name="Web Radio (Catalan)"></channels_group>
 	</language>
 	<language id="zh" _lang="Chinese Web TV and Radio">
-		<channels_group _name="Web Radio (Chinese)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_zh.m3u" />
-		<channels_group _name="Web TV (Chinese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_zh.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_zh.m3u" _name="Web TV (Chinese)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_zh.m3u" _name="Web Radio (Chinese)"></channels_group>
+	</language>
+	<language id="hr" _lang="Croatian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hr.m3u" _name="Web TV (Croatian)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_hr.m3u" _name="Web Radio (Croatian)"></channels_group>
 	</language>
 	<language id="cs" _lang="Czech Web TV and Radio">
-		<channels_group _name="Web TV (Czech)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_cs.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_cs.m3u" _name="Web TV (Czech)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_cs.m3u" _name="Web Radio (Czech)"></channels_group>
+	</language>
+	<language id="da" _lang="Danish Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_da.m3u" _name="Web TV (Danish)"></channels_group>
 	</language>
 	<language id="nl" _lang="Dutch Web TV and Radio">
-		<channels_group _name="Web TV (Dutch)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_nl.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_nl.m3u" _name="Web TV (Dutch)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_nl.m3u" _name="Web Radio (Dutch)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_nl.m3u" _name="Web Cam (Dutch)"></channels_group>
 	</language>
 	<language id="en" _lang="English Web TV and Radio">
-		<channels_group _name="Web Programmes (English)" uri="http://database.freetuxtv.net/playlists/playlist_programmes_en.m3u" />
-		<channels_group _name="Web Radio (English)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_en.m3u" />
-		<channels_group _name="Web TV (English)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_en.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_en.m3u" _name="Web TV (English)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_en.m3u" _name="Web Radio (English)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_en.m3u" _name="Web Programmes (English)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_en.m3u" _name="Web Cam (English)"></channels_group>
+	</language>
+	<language id="et" _lang="Estonian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_et.m3u" _name="Web TV (Estonian)"></channels_group>
+	</language>
+	<language id="fi" _lang="Finnish Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fi.m3u" _name="Web TV (Finnish)"></channels_group>
 	</language>
 	<language id="fr" _lang="French Web TV and Radio">
-		<channels_group _name="Web Programmes (French)" uri="http://database.freetuxtv.net/playlists/playlist_programmes_fr.m3u" />
-		<channels_group _name="Web Radio (French)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_fr.m3u" />
-		<channels_group _name="Web TV (French)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_fr.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fr.m3u" _name="Web TV (French)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_fr.m3u" _name="Web Radio (French)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_programmes_fr.m3u" _name="Web Programmes (French)"></channels_group>
+	</language>
+	<language id="ka" _lang="Georgian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ka.m3u" _name="Web TV (Georgian)"></channels_group>
 	</language>
 	<language id="de" _lang="German Web TV and Radio">
-		<channels_group _name="Web Radio (German)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_de.m3u" />
-		<channels_group _name="Web TV (German)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_de.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_de.m3u" _name="Web TV (German)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_de.m3u" _name="Web Radio (German)"></channels_group>
+	</language>
+	<language id="el" _lang="Greek Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" _name="Web TV (Greek)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_el.m3u" _name="Web Radio (Greek)"></channels_group>
+	</language>
+	<language id="iw" _lang="Hebrew Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_iw.m3u" _name="Web TV (Hebrew)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_iw.m3u" _name="Web Radio (Hebrew)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_iw.m3u" _name="Web Cam (Hebrew)"></channels_group>
+	</language>
+	<language id="hi" _lang="Hindi Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hi.m3u" _name="Web TV (Hindi)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_hi.m3u" _name="Web Radio (Hindi)"></channels_group>
 	</language>
 	<language id="hu" _lang="Hungarian Web TV and Radio">
-		<channels_group _name="Web TV (Hungarian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_hu.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_hu.m3u" _name="Web TV (Hungarian)"></channels_group>
 	</language>
-	<language id="el" _lang="Greek Web TV and Radio">
-		<channels_group _name="Web TV (Greek)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" />
+	<language id="is" _lang="Icelandic Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_is.m3u" _name="Web TV (Icelandic)"></channels_group>
+	</language>
+	<language id="in" _lang="Indonesian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_in.m3u" _name="Web TV (Indonesian)"></channels_group>
+	</language>
+	<language id="ia" _lang="Interlingua Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ia.m3u" _name="Web Radio (Interlingua)"></channels_group>
+	</language>
+	<language id="ga" _lang="Irish Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ga.m3u" _name="Web TV (Irish)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ga.m3u" _name="Web Radio (Irish)"></channels_group>
 	</language>
 	<language id="it" _lang="Italian Web TV and Radio">
-		<channels_group _name="Web Radio (Italian)" uri="http://database.freetuxtv.net/playlists/playlist_webradio_it.m3u" />
-		<channels_group _name="Web TV (Italian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_it.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_it.m3u" _name="Web TV (Italian)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_it.m3u" _name="Web Radio (Italian)"></channels_group>
 	</language>
 	<language id="ja" _lang="Japanese Web TV and Radio">
-		<channels_group _name="Web TV (Japanese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ja.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ja.m3u" _name="Web TV (Japanese)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_ja.m3u" _name="Web Radio (Japanese)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_ja.m3u" _name="Web Cam (Japanese)"></channels_group>
+	</language>
+	<language id="kk" _lang="Kazakh Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_kk.m3u" _name="Web TV (Kazakh)"></channels_group>
 	</language>
 	<language id="ko" _lang="Korean Web TV and Radio">
-		<channels_group _name="Web TV (Korean)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_ko.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ko.m3u" _name="Web TV (Korean)"></channels_group>
+	</language>
+	<language id="ku" _lang="Kurdish Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ku.m3u" _name="Web TV (Kurdish)"></channels_group>
 	</language>
 	<language id="la" _lang="Latin Web TV and Radio">
-		<channels_group _name="Web TV (Latin)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_la.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_la.m3u" _name="Web TV (Latin)"></channels_group>
+	</language>
+	<language id="lv" _lang="Latvian/Lettish Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_lv.m3u" _name="Web TV (Latvian/Lettish)"></channels_group>
+	</language>
+	<language id="lt" _lang="Lithuanian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_lt.m3u" _name="Web TV (Lithuanian)"></channels_group>
+	</language>
+	<language id="mk" _lang="Macedonian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mk.m3u" _name="Web TV (Macedonian)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_mk.m3u" _name="Web Radio (Macedonian)"></channels_group>
 	</language>
-	<language id="el" _lang="Modern Greek Web TV and Radio">
-		<channels_group _name="Web TV (Modern Greek)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_el.m3u" />
+	<language id="ms" _lang="Malay Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ms.m3u" _name="Web TV (Malay)"></channels_group>
+	</language>
+	<language id="ml" _lang="Malayalam Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_ml.m3u" _name="Web TV (Malayalam)"></channels_group>
+	</language>
+	<language id="mt" _lang="Maltese Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mt.m3u" _name="Web TV (Maltese)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_mt.m3u" _name="Web Radio (Maltese)"></channels_group>
+	</language>
+	<language id="mo" _lang="Moldavian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mo.m3u" _name="Web TV (Moldavian)"></channels_group>
+	</language>
+	<language id="mn" _lang="Mongolian Web TV and Radio">
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_mn.m3u" _name="Web TV (Mongolian)"></channels_group>
 	</language>
 	<language id="no" _lang="Norwegian Web TV and Radio">
-		<channels_group _name="Web TV (Norwegian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_no.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_no.m3u" _name="Web TV (Norwegian)"></channels_group>
 	</language>
 	<language id="fa" _lang="Persian Web TV and Radio">
-		<channels_group _name="Web TV (Persian)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_fa.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_fa.m3u" _name="Web TV (Persian)"></channels_group>
 	</language>
 	<language id="pl" _lang="Polish Web TV and Radio">
-		<channels_group _name="Web TV (Polish)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_pl.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_pl.m3u" _name="Web TV (Polish)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webradio_pl.m3u" _name="Web Radio (Polish)"></channels_group>
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webcam_pl.m3u" _name="Web Cam (Polish)"></channels_group>
 	</language>
 	<language id="pt" _lang="Portuguese Web TV and Radio">
-		<channels_group _name="Web TV (Portuguese)" uri="http://database.freetuxtv.net/playlists/playlist_webtv_pt.m3u" />
+		<channels_group uri="http://database.freetuxtv.net/playlists/playlist_webtv_pt.m3u" _name="Web TV (Portuguese)"></channels_group>

freetuxtv-0.6.5.tar.gz/data/icons/Makefile.am -> freetuxtv-0.6.6.tar.gz/data/icons/Makefile.am Changed

freetuxtv-0.6.5.tar.gz/data/icons/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/icons/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,18 +79,36 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -231,6 +293,8 @@
 	hicolor_apps_22x22_freetuxtv.png \
 	hicolor_apps_32x32_freetuxtv.png \
 	hicolor_apps_48x48_freetuxtv.png \
+	hicolor_apps_64x64_freetuxtv.png \
+	hicolor_apps_128x128_freetuxtv.png \
 	hicolor_apps_scalable_freetuxtv.svg \
 	$(NULL)
 
@@ -242,6 +306,8 @@
 	hicolor_apps_22x22_freetuxtv.svg \
 	hicolor_apps_32x32_freetuxtv.svg \
 	hicolor_apps_48x48_freetuxtv.svg \
+	hicolor_apps_64x64_freetuxtv.svg \
+	hicolor_apps_128x128_freetuxtv.svg \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -292,11 +358,11 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -432,16 +498,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-local
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 update-icon-cache:

freetuxtv-0.6.6.tar.gz/data/icons/hicolor_apps_128x128_freetuxtv.png Added

freetuxtv-0.6.6.tar.gz/data/icons/hicolor_apps_128x128_freetuxtv.svg Added

@@ -0,0 +1,1368 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg19089"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="hicdolor_apps_48x48_freetuxtv.svg"
+ inkscape:export-filename="/home/ebeuque/Informatique/Personnel/Projets/autres/freetuxtv/freetuxtv/data/icons/hicolor_apps_scalable_freetuxtv.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs19091">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective19097" />
+ <inkscape:perspective
+ id="perspective19107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6814"
+ id="radialGradient19039"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.58265832,0.48695545,-0.35874809,0.43561089,-6534.2634,8805.1227)"
+ cx="-11724.028"
+ cy="7085.5718"
+ fx="-11724.028"
+ fy="7085.5718"
+ r="230.60361" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6814">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6816" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6818" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient22931"
+ id="radialGradient19041"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.70059678,0,0,0.39699302,-7364.8104,3547.1811)"
+ cx="-11699.636"
+ cy="6699.9062"
+ fx="-11699.636"
+ fy="6699.9062"
+ r="282.70825" />
+ <linearGradient
+ id="linearGradient22931"
+ inkscape:collect="always">
+ <stop
+ id="stop22933"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.5" />
+ <stop
+ id="stop22935"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7918"
+ id="linearGradient19043"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.85224082,0,0,0.85852814,-5913.9015,53.6739)"
+ x1="-11583.832"
+ y1="7177.8628"
+ x2="-11393.838"
+ y2="7307.4028" />
+ <linearGradient
+ id="linearGradient7918"
+ inkscape:collect="always">
+ <stop
+ id="stop7920"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop7922"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <filter
+ color-interpolation-filters="sRGB"
+ height="1.7744713"
+ y="-0.38723564"
+ width="1.1470716"
+ x="-0.073535778"
+ id="filter7804"
+ inkscape:collect="always">
+ <feGaussianBlur
+ id="feGaussianBlur7806"
+ stdDeviation="20.83271"
+ inkscape:collect="always" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7834"
+ id="radialGradient19045"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.12345678,0,7047.5778)"
+ cx="-8773.3252"
+ cy="8040.1943"
+ fx="-8773.3252"
+ fy="8040.1943"
+ r="291.20587" />
+ <linearGradient
+ id="linearGradient7834"
+ inkscape:collect="always">
+ <stop
+ id="stop7836"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop7838"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7834"
+ id="radialGradient19047"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.12345678,0,7047.5778)"
+ cx="-8773.3252"
+ cy="8040.1943"
+ fx="-8773.3252"
+ fy="8040.1943"
+ r="291.20587" />
+ <filter
+ id="filter10358"
+ color-interpolation-filters="sRGB"
+ height="1.3937207"
+ width="1.1726084"
+ y="-0.19686034"
+ x="-0.086304188">
+ <feGaussianBlur
+ stdDeviation="4.5870333"
+ id="feGaussianBlur10360" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient10031"
+ id="linearGradient19049"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2574371,0,0,1.2991162,-8898.6126,6772.5369)"
+ x1="283.625"
+ y1="324.5"
+ x2="283.625"
+ y2="380.875" />
+ <linearGradient
+ id="linearGradient10031">
+ <stop
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.67595828;"
+ id="stop10033" />
+ <stop
+ offset="0.5"
+ style="stop-color:#ffffff;stop-opacity:0.50196081"
+ id="stop10370" />
+ <stop
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0"
+ id="stop10035" />
+ </linearGradient>
+ <filter
+ id="filter19143"
+ color-interpolation-filters="sRGB"
+ height="1.3937207"
+ width="1.1726084"
+ y="-0.19686034"
+ x="-0.086304188">
+ <feGaussianBlur
+ stdDeviation="4.5870333"
+ id="feGaussianBlur19145" />
+ </filter>

freetuxtv-0.6.6.tar.gz/data/icons/hicolor_apps_64x64_freetuxtv.png Added

freetuxtv-0.6.6.tar.gz/data/icons/hicolor_apps_64x64_freetuxtv.svg Added

@@ -0,0 +1,1368 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64"
+ height="64"
+ id="svg19089"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="hicolor_apps_64x64_freetuxtv.svg"
+ inkscape:export-filename="/home/ebeuque/Informatique/Personnel/Projets/autres/freetuxtv/freetuxtv/data/icons/hicolor_apps_scalable_freetuxtv.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs19091">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective19097" />
+ <inkscape:perspective
+ id="perspective19107"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6814"
+ id="radialGradient19039"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.58265832,0.48695545,-0.35874809,0.43561089,-6534.2634,8805.1227)"
+ cx="-11724.028"
+ cy="7085.5718"
+ fx="-11724.028"
+ fy="7085.5718"
+ r="230.60361" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6814">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6816" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6818" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient22931"
+ id="radialGradient19041"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.70059678,0,0,0.39699302,-7364.8104,3547.1811)"
+ cx="-11699.636"
+ cy="6699.9062"
+ fx="-11699.636"
+ fy="6699.9062"
+ r="282.70825" />
+ <linearGradient
+ id="linearGradient22931"
+ inkscape:collect="always">
+ <stop
+ id="stop22933"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.5" />
+ <stop
+ id="stop22935"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7918"
+ id="linearGradient19043"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.85224082,0,0,0.85852814,-5913.9015,53.6739)"
+ x1="-11583.832"
+ y1="7177.8628"
+ x2="-11393.838"
+ y2="7307.4028" />
+ <linearGradient
+ id="linearGradient7918"
+ inkscape:collect="always">
+ <stop
+ id="stop7920"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop7922"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <filter
+ color-interpolation-filters="sRGB"
+ height="1.7744713"
+ y="-0.38723564"
+ width="1.1470716"
+ x="-0.073535778"
+ id="filter7804"
+ inkscape:collect="always">
+ <feGaussianBlur
+ id="feGaussianBlur7806"
+ stdDeviation="20.83271"
+ inkscape:collect="always" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7834"
+ id="radialGradient19045"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.12345678,0,7047.5778)"
+ cx="-8773.3252"
+ cy="8040.1943"
+ fx="-8773.3252"
+ fy="8040.1943"
+ r="291.20587" />
+ <linearGradient
+ id="linearGradient7834"
+ inkscape:collect="always">
+ <stop
+ id="stop7836"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop7838"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7834"
+ id="radialGradient19047"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.12345678,0,7047.5778)"
+ cx="-8773.3252"
+ cy="8040.1943"
+ fx="-8773.3252"
+ fy="8040.1943"
+ r="291.20587" />
+ <filter
+ id="filter10358"
+ color-interpolation-filters="sRGB"
+ height="1.3937207"
+ width="1.1726084"
+ y="-0.19686034"
+ x="-0.086304188">
+ <feGaussianBlur
+ stdDeviation="4.5870333"
+ id="feGaussianBlur10360" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient10031"
+ id="linearGradient19049"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2574371,0,0,1.2991162,-8898.6126,6772.5369)"
+ x1="283.625"
+ y1="324.5"
+ x2="283.625"
+ y2="380.875" />
+ <linearGradient
+ id="linearGradient10031">
+ <stop
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:0.67595828;"
+ id="stop10033" />
+ <stop
+ offset="0.5"
+ style="stop-color:#ffffff;stop-opacity:0.50196081"
+ id="stop10370" />
+ <stop
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0"
+ id="stop10035" />
+ </linearGradient>
+ <filter
+ id="filter19143"
+ color-interpolation-filters="sRGB"
+ height="1.3937207"
+ width="1.1726084"
+ y="-0.19686034"
+ x="-0.086304188">
+ <feGaussianBlur
+ stdDeviation="4.5870333"
+ id="feGaussianBlur19145" />
+ </filter>

freetuxtv-0.6.5.tar.gz/data/images/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/images/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,29 +78,67 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -304,22 +386,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -334,57 +419,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \

freetuxtv-0.6.5.tar.gz/data/images/channels/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/images/channels/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/images/channels
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@
   }
 am__installdirs = "$(DESTDIR)$(channelsdir)"
 DATA = $(channels_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -702,8 +764,11 @@
 	-rm -rf .libs _libs
 install-channelsDATA: $(channels_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(channelsdir)" || $(MKDIR_P) "$(DESTDIR)$(channelsdir)"
 	@list='$(channels_DATA)'; test -n "$(channelsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(channelsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(channelsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -718,11 +783,11 @@
 	@list='$(channels_DATA)'; test -n "$(channelsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(channelsdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -861,16 +926,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-channelsDATA install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-channelsDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-channelsDATA install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-channelsDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

freetuxtv-0.6.5.tar.gz/data/images/groups/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/images/groups/Makefile.in Changed

freetuxtv-0.6.5.tar.gz/data/menu/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/menu/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/menu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@
   }
 am__installdirs = "$(DESTDIR)$(desktopdir)"
 DATA = $(desktop_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -299,8 +361,11 @@
 	-rm -rf .libs _libs
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -315,11 +380,11 @@
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -459,16 +524,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-desktopDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-desktopDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-desktopDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-desktopDATA
 
 @INTLTOOL_DESKTOP_RULE@

freetuxtv-0.6.5.tar.gz/data/ui/Makefile.in -> freetuxtv-0.6.6.tar.gz/data/ui/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,17 +79,34 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = data/ui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +136,7 @@
   }
 am__installdirs = "$(DESTDIR)$(freetuxtvuidir)"
 DATA = $(freetuxtvui_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -302,8 +364,11 @@
 	-rm -rf .libs _libs
 install-freetuxtvuiDATA: $(freetuxtvui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(freetuxtvuidir)" || $(MKDIR_P) "$(DESTDIR)$(freetuxtvuidir)"
 	@list='$(freetuxtvui_DATA)'; test -n "$(freetuxtvuidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(freetuxtvuidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(freetuxtvuidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -318,11 +383,11 @@
 	@list='$(freetuxtvui_DATA)'; test -n "$(freetuxtvuidir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(freetuxtvuidir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -461,17 +526,17 @@
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-freetuxtvuiDATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-freetuxtvuiDATA \
-	uninstall-local
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am \
+	install-freetuxtvuiDATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-freetuxtvuiDATA uninstall-local
 
 
 # Remove ui directory on uninstall

freetuxtv-0.6.5.tar.gz/depcomp -> freetuxtv-0.6.6.tar.gz/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@
 
 case $1 in
 '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
 -h | --h*)
 cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,8 +39,8 @@
 
 Environment variables:
 depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
 DEPDIR directory where to store dependencies.
 depfile Dependency file to output.
 tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,6 +56,66 @@
 ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'. Note that this directory component will
+# be either empty or ending with a '/' character. This is deliberate.
+set_dir_from ()
+{
+ case $1 in
+ */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+ *) dir=;;
+ esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+ base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+ echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+ # If the compiler actually managed to produce a dependency file,
+ # post-process it.
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form 'foo.o: dependency.h'.
+ # Do two passes, one to just change these to
+ # $object: dependency.h
+ # and one to simply output
+ # dependency.h:
+ # which is needed to avoid the deleted-header problem.
+ { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+ sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+ } > "$depfile"
+ rm -f "$tmpdepfile"
+ else
+ make_dummy_depfile
+ fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
 echo "depcomp: Variables source, object and depmode must be set" 1>&2
 exit 1
@@ -69,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags. We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write. Note that we *cannot* use a case
@@ -80,26 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvisualcpp
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
- # This is just like msvc7 but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u='sed s,\\\\,/,g'
- depmode=msvc7
+ # This is just like msvc7 but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
 fi
 
 case "$depmode" in
@@ -122,8 +190,7 @@
 done
 "$@"
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
@@ -131,13 +198,17 @@
 ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc. Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ## up in a subdir. Having to rename by hand is ugly.
 ## (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
+## -MM, not -M (despite what the docs say). Also, it might not be
+## supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ## than renaming).
 if test -z "$gccflag"; then
@@ -145,33 +216,31 @@
 fi
 "$@" -Wp,"$gccflag$tmpdepfile"
 stat=$?
- if test $stat -eq 0; then :
- else
+ if test $stat -ne 0; then
 rm -f "$tmpdepfile"
 exit $stat
 fi
 rm -f "$depfile"

freetuxtv-0.6.5.tar.gz/install-sh -> freetuxtv-0.6.6.tar.gz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in

freetuxtv-0.6.5.tar.gz/lib/Makefile.in -> freetuxtv-0.6.6.tar.gz/lib/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,29 +78,67 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -304,22 +386,25 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -334,57 +419,12 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \

freetuxtv-0.6.5.tar.gz/lib/libdbevolution/Makefile.in -> freetuxtv-0.6.6.tar.gz/lib/libdbevolution/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +80,13 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = lib/libdbevolution
-DIST_COMMON = $(libdbevolutioninclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(libdbevolutioninclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -80,25 +124,73 @@
 libdbevolution_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libdbevolution_la_OBJECTS = db-evolution-instance.lo
 libdbevolution_la_OBJECTS = $(am_libdbevolution_la_OBJECTS)
-libdbevolution_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libdbevolution_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libdbevolution_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(libdbevolution_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libdbevolution_la_SOURCES)
 DIST_SOURCES = $(libdbevolution_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(libdbevolutioninclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -331,9 +423,9 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -341,6 +433,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -356,14 +450,17 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \

freetuxtv-0.6.5.tar.gz/lib/libvlc-gtk/Makefile.in -> freetuxtv-0.6.6.tar.gz/lib/libvlc-gtk/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,51 @@
 
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +80,13 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = lib/libvlc-gtk
-DIST_COMMON = $(libvlcgtkinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(libvlcgtkinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -81,25 +125,72 @@
 am_libvlc_gtk_la_OBJECTS = gtk-libvlc-instance.lo gtk-libvlc-media.lo \
 	gtk-libvlc-media-player.lo
 libvlc_gtk_la_OBJECTS = $(am_libvlc_gtk_la_OBJECTS)
-libvlc_gtk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libvlc_gtk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libvlc_gtk_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libvlc_gtk_la_SOURCES)
 DIST_SOURCES = $(libvlc_gtk_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(libvlcgtkinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -342,9 +433,9 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -352,6 +443,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -367,14 +460,17 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}

freetuxtv-0.6.5.tar.gz/lib/libvlc-gtk/gtk-libvlc-instance.c -> freetuxtv-0.6.6.tar.gz/lib/libvlc-gtk/gtk-libvlc-instance.c Changed

@@ -149,7 +149,7 @@
 gtk_libvlc_instance_new (const gchar* vlc_args[], GLogFunc log_func, GError** error)
 {
 	if(error != NULL){
-		g_return_if_fail(*error == NULL);
+		g_return_val_if_fail(*error == NULL, NULL);
 	}
 
 	GError* pError = NULL;
@@ -175,13 +175,16 @@
 	libvlc_exception_init (&_vlcexcep);
 #endif // LIBVLC_OLD_VLCEXCEPTION
 
+	int iVlcArgsCount = 0;
+	
 	if(vlc_args){
 		szListOptions = g_strjoinv(" ", (gchar**)vlc_args);
+		iVlcArgsCount = g_strv_length((gchar**)vlc_args);
 	}
 	
 	if(szListOptions){
 		g_log(GTK_LIBVLC_LOG_DOMAIN, G_LOG_LEVEL_INFO,
-	      "Using instance vlc options [%s]\n", szListOptions);
+	      "Using instance vlc with %d options [%s]\n", iVlcArgsCount, szListOptions);
 		g_free(szListOptions);
 		szListOptions = NULL;
 	}
@@ -190,20 +193,20 @@
 	if(vlc_args == NULL){
 		priv->libvlc_instance = libvlc_new(0, NULL, &_vlcexcep);
 	}else{
-		priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), (gchar**)vlc_args, &_vlcexcep);
+		priv->libvlc_instance = libvlc_new(iVlcArgsCount, (gchar**)vlc_args, &_vlcexcep);
 	}	
 #else
 #ifdef LIBVLC_OLD_VLCEXCEPTION
 	if(vlc_args == NULL){
 		priv->libvlc_instance = libvlc_new(0, NULL, &_vlcexcep);
 	}else{
-		priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), vlc_args, &_vlcexcep);
+		priv->libvlc_instance = libvlc_new(iVlcArgsCount, vlc_args, &_vlcexcep);
 	}
 #else
 	if(vlc_args == NULL){
 		priv->libvlc_instance = libvlc_new(0, NULL);
 	}else{
-		priv->libvlc_instance = libvlc_new(sizeof(vlc_args) / sizeof(vlc_args[0]), vlc_args);
+		priv->libvlc_instance = libvlc_new(iVlcArgsCount, vlc_args);
 	}
 #endif // LIBVLC_OLD_VLCEXCEPTION
 #endif // LIBVLC_OLD_INSTANCE
@@ -251,9 +254,9 @@
 LIBVLC_INSTANCE_HANDLE
 gtk_libvlc_instance_get_libvlc_instance(GtkLibvlcInstance* pLibvlcInstance, GError** error)
 {
-	g_return_if_fail(pLibvlcInstance != NULL);
+	g_return_val_if_fail(pLibvlcInstance != NULL, NULL);
 	if(error != NULL){
-		g_return_if_fail(*error == NULL);
+		g_return_val_if_fail(*error == NULL, NULL);
 	}
 
 	LIBVLC_INSTANCE_HANDLE handle;

freetuxtv-0.6.5.tar.gz/lib/libvlc-gtk/gtk-libvlc-media-player.c -> freetuxtv-0.6.6.tar.gz/lib/libvlc-gtk/gtk-libvlc-media-player.c Changed

@@ -708,7 +708,7 @@
 	raise_error(self, error, &_vlcexcep);
 #else 
 	libvlc_media_t *m;
-	m = libvlc_media_new_path (libvlc_instance, media->mrl);
+	m = libvlc_media_new_location (libvlc_instance, media->mrl);
 	raise_error(self, error, NULL);
 
 	if(list_options != NULL){
@@ -771,8 +771,8 @@
 static gboolean
 idle_play_next_function(gpointer ptrdata){
 	GtkLibvlcMediaPlayer *self;
-	g_return_if_fail(ptrdata != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(ptrdata));
+	g_return_val_if_fail(ptrdata != NULL, FALSE);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(ptrdata), FALSE);
 
 	self = GTK_LIBVLC_MEDIA_PLAYER(ptrdata);
 
@@ -925,8 +925,8 @@
 GtkWidget *
 gtk_libvlc_media_player_new (GtkLibvlcInstance* libvlc_instance, GError** error)
 {
-	g_return_if_fail(libvlc_instance != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_INSTANCE(libvlc_instance));
+	g_return_val_if_fail(libvlc_instance != NULL, NULL);
+	g_return_val_if_fail(GTK_IS_LIBVLC_INSTANCE(libvlc_instance), NULL);
 
 	GtkLibvlcMediaPlayer *self = NULL;
 
@@ -986,8 +986,8 @@
 GtkLibvlcMedia*
 gtk_libvlc_media_player_get_current_media (GtkLibvlcMediaPlayer *self)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+	g_return_val_if_fail(self != NULL, NULL);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), NULL);
 
 	GtkLibvlcMediaPlayerPrivate* priv;
 	priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -998,9 +998,9 @@
 GtkLibvlcMedia*
 gtk_libvlc_media_player_get_media_from_path (GtkLibvlcMediaPlayer *self, GtkTreePath *path)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
-	g_return_if_fail(path != NULL);
+	g_return_val_if_fail(self != NULL, NULL);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), NULL);
+	g_return_val_if_fail(path != NULL, NULL);
 
 	// Get the media from the path
 	GtkLibvlcMedia *media;
@@ -1244,11 +1244,11 @@
 gboolean
 gtk_libvlc_media_player_can_pause (GtkLibvlcMediaPlayer *self, GError** error)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
-	g_return_if_fail(self->libvlc_instance != NULL);
+	g_return_val_if_fail(self != NULL, FALSE);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
+	g_return_val_if_fail(self->libvlc_instance != NULL, FALSE);
 	if(error != NULL){
-		g_return_if_fail(*error == NULL);
+		g_return_val_if_fail(*error == NULL, FALSE);
 	}
 
 	GError* pError = NULL;
@@ -1258,7 +1258,7 @@
 
 	// Create the media player if not initialized
 	gtk_libvlc_media_player_initialize (self, &pError);
-	g_return_if_fail(priv->initialized == TRUE);
+	g_return_val_if_fail(priv->initialized == TRUE, FALSE);
 
 #ifdef LIBVLC_OLD_VLCEXCEPTION
 	libvlc_exception_t _vlcexcep;
@@ -1682,8 +1682,8 @@
 gboolean
 gtk_libvlc_media_player_get_fullscreen (GtkLibvlcMediaPlayer *self)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+	g_return_val_if_fail(self != NULL, FALSE);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
 
 	GtkLibvlcMediaPlayerPrivate* priv;
 	priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -1737,11 +1737,11 @@
 gboolean
 gtk_libvlc_media_player_is_playing (GtkLibvlcMediaPlayer *self, GError** error)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
-	g_return_if_fail(self->libvlc_instance != NULL);
+	g_return_val_if_fail(self != NULL, FALSE);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), FALSE);
+	g_return_val_if_fail(self->libvlc_instance != NULL, FALSE);
 	if(error != NULL){
-		g_return_if_fail(*error == NULL);
+		g_return_val_if_fail(*error == NULL, FALSE);
 	}
 
 	GError* pError = NULL;
@@ -1803,11 +1803,13 @@
 GtkLibvlcState
 gtk_libvlc_media_player_get_state (GtkLibvlcMediaPlayer *self, GError** error)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
-	g_return_if_fail(self->libvlc_instance != NULL);
+	GtkLibvlcState gtkstate = GTK_LIBVLC_STATE_NOTHING_SPECIAL;
+	
+	g_return_val_if_fail(self != NULL, gtkstate);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), gtkstate);
+	g_return_val_if_fail(self->libvlc_instance != NULL, gtkstate);
 	if(error != NULL){
-		g_return_if_fail(*error == NULL);
+		g_return_val_if_fail(*error == NULL, gtkstate);
 	}
 
 	GError* pError = NULL;
@@ -1819,8 +1821,6 @@
 	gtk_libvlc_media_player_initialize (self, &pError);
 	g_return_if_fail(priv->initialized == TRUE);
 
-	GtkLibvlcState gtkstate = GTK_LIBVLC_STATE_NOTHING_SPECIAL;
-
 	if(pError == NULL){
 
 #ifdef LIBVLC_OLD_VLCEXCEPTION
@@ -1832,7 +1832,7 @@
 		libvlc_instance_t *libvlc_instance;
 		libvlc_instance = (libvlc_instance_t *)
 			gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, &pError);
-		g_return_if_fail(libvlc_instance != NULL);
+		g_return_val_if_fail(libvlc_instance != NULL, gtkstate);
 
 		libvlc_input_t *input_t;
 		if(libvlc_instance != NULL){
@@ -1872,7 +1872,7 @@
 			}
 		}
 #else
-		g_return_if_fail(priv->libvlc_mediaplayer != NULL);
+		g_return_val_if_fail(priv->libvlc_mediaplayer != NULL, gtkstate);
 
 		libvlc_state_t state;
 
@@ -1948,13 +1948,14 @@
 		case GTK_LIBVLC_STATE_ERROR:
 			return "GTK_LIBVLC_STATE_ERROR";
 	}
+	return "";
 }
 
 glong
 gtk_libvlc_media_player_get_length(GtkLibvlcMediaPlayer *self, GError** error)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+	g_return_val_if_fail(self != NULL, 0);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), 0);
 
 	GtkLibvlcMediaPlayerPrivate* priv;
 	priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -1970,7 +1971,7 @@
 	libvlc_instance_t *libvlc_instance;
 	libvlc_instance = (libvlc_instance_t *)
 		gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, error);
-	g_return_if_fail(libvlc_instance != NULL);
+	g_return_val_if_fail(libvlc_instance != NULL, 0);
 
 	libvlc_input_t *input_t;
 	input_t = libvlc_playlist_get_input(libvlc_instance,
@@ -2006,8 +2007,8 @@
 glong
 gtk_libvlc_media_player_get_time(GtkLibvlcMediaPlayer *self, GError** error)
 {
-	g_return_if_fail(self != NULL);
-	g_return_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self));
+	g_return_val_if_fail(self != NULL, 0);
+	g_return_val_if_fail(GTK_IS_LIBVLC_MEDIA_PLAYER(self), 0);
 	
 	GtkLibvlcMediaPlayerPrivate* priv;
 	priv = GTK_LIBVLC_MEDIA_PLAYER_PRIVATE(self);
@@ -2023,7 +2024,7 @@
 	libvlc_instance_t *libvlc_instance;
 	libvlc_instance = (libvlc_instance_t *)
 		gtk_libvlc_instance_get_libvlc_instance(self->libvlc_instance, error);
-	g_return_if_fail(libvlc_instance != NULL);
+	g_return_val_if_fail(libvlc_instance != NULL, 0);
 
 	libvlc_input_t *input_t;
 	input_t = libvlc_playlist_get_input(libvlc_instance,
@@ -2099,8 +2100,8 @@
 gfloat

freetuxtv-0.6.5.tar.gz/lib/libvlc-gtk/gtk-libvlc-media.c -> freetuxtv-0.6.6.tar.gz/lib/libvlc-gtk/gtk-libvlc-media.c Changed

freetuxtv-0.6.5.tar.gz/ltmain.sh -> freetuxtv-0.6.6.tar.gz/ltmain.sh Changed

freetuxtv-0.6.5.tar.gz/missing -> freetuxtv-0.6.6.tar.gz/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
-sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
 
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
 
 -h|--h|--he|--hel|--help)
 echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
 -h, --help display this help and exit
 -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
 exit $?
@@ -99,228 +70,141 @@
 ;;
 
 -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
-				 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
-	 sed 's/\.am$/.in/' |
-	 while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU

freetuxtv-0.6.5.tar.gz/po/LINGUAS -> freetuxtv-0.6.6.tar.gz/po/LINGUAS Changed

freetuxtv-0.6.5.tar.gz/po/POTFILES.in -> freetuxtv-0.6.6.tar.gz/po/POTFILES.in Changed

freetuxtv-0.6.5.tar.gz/po/de.po -> freetuxtv-0.6.6.tar.gz/po/de.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: freetuxtv.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
 "PO-Revision-Date: 2010-08-09 20:00+0200\n"
 "Last-Translator: Benni <bestofbenni@@googlemail.com>\n"
 "Language-Team: DE <DE@li.org>\n"
@@ -21,147 +21,127 @@
 
 #: ../data/ui/addrecording.glade.h:1
 #, fuzzy
-msgid "Recording period"
-msgstr "Aufzeichnungszeitraum"
+msgid "Add a recording"
+msgstr "Aufzeichnung hinzufügen"
 
 #: ../data/ui/addrecording.glade.h:2
 #, fuzzy
-msgid "Add a recording"
-msgstr "Aufzeichnung hinzufügen"
+msgid "Selected channel:"
+msgstr "Ausgewählter Sender:"
 
 #: ../data/ui/addrecording.glade.h:3
 #, fuzzy
-msgid "Duration:"
-msgstr "Dauer:"
+msgid "Title:"
+msgstr "Titel:"
 
 #: ../data/ui/addrecording.glade.h:4
 #, fuzzy
-msgid "End time:"
-msgstr "Endzeit:"
+msgid "Start time:"
+msgstr "Startzeit:"
 
 #: ../data/ui/addrecording.glade.h:5
 #, fuzzy
-msgid "Selected channel:"
-msgstr "Ausgewählter Sender:"
+msgid "Duration:"
+msgstr "Dauer:"
 
 #: ../data/ui/addrecording.glade.h:6
 #, fuzzy
-msgid "Start time:"
-msgstr "Startzeit:"
+msgid "End time:"
+msgstr "Endzeit:"
 
 #: ../data/ui/addrecording.glade.h:7
 #, fuzzy
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../data/ui/addrecording.glade.h:8
-#, fuzzy
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
+#: ../data/ui/addrecording.glade.h:8
 #, fuzzy
-msgid "Processing of channels' name"
-msgstr "Verarbeitung des Sendernamens"
+msgid "Recording period"
+msgstr "Aufzeichnungszeitraum"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Gruppe hinzufügen"
 
 #: ../data/ui/addchannelsgroups.glade.h:2
 #, fuzzy
-msgid "Special group type:"
-msgstr "Spezieller Gruppentyp:"
+msgid "Channels groups file:"
+msgstr "Sendergruppendatei: "
 
 #: ../data/ui/addchannelsgroups.glade.h:3
-msgid "Add a group"
-msgstr "Gruppe hinzufügen"
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
 
 #: ../data/ui/addchannelsgroups.glade.h:4
 #, fuzzy
-msgid "Channels groups file:"
-msgstr "Sendergruppendatei: "
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Wähle einen oder mehrere Sendergruppen zum hinzufügen aus und klicke auf "
+"Hinzufügen."
 
 #: ../data/ui/addchannelsgroups.glade.h:5
 #, fuzzy
-msgid "Custom channels group"
-msgstr "Benutzerdefinierte Sendergruppe"
+msgid "Languages/Channels group"
+msgstr "Sprachen/Sendergruppe"
 
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
+#: ../data/ui/addchannelsgroups.glade.h:6
 #, fuzzy
-msgid "Delete this text before the name:"
-msgstr "Folgendes vor dem Namen löschen:"
+msgid "Required ISP"
+msgstr "Erforderlicher ISP"
 
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-#, fuzzy
-msgid "Delete this text behind the name:"
-msgstr "Folgendes hinter dem Namen löschen: "
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
 
 #: ../data/ui/addchannelsgroups.glade.h:8
 msgid "Existing channels group"
 msgstr "Bestehende Sendergruppe"
 
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "Favoriten"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
 #, fuzzy
 msgid "Group's name:"
 msgstr "Gruppenname:"
 
-#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
-msgid "Languages/Channels group"
-msgstr "Sprachen/Sendergruppe"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
 msgid "Name of the group which will be added"
 msgstr "Name der Gruppe die hinzugefügt wird"
 
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-#, fuzzy
-msgid "Playlist's URI of the group which will be added"
-msgstr "URI der Wiedergabeliste der Gruppe die hinzugefügt wird"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
 #, fuzzy
 msgid "Playlist's URI:"
 msgstr "URI der Wiedergabeliste:"
 
-#: ../data/ui/addchannelsgroups.glade.h:15
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
 #, fuzzy
-msgid "Required ISP"
-msgstr "Erforderlicher ISP"
+msgid "Playlist's URI of the group which will be added"
+msgstr "URI der Wiedergabeliste der Gruppe die hinzugefügt wird"
 
-#: ../data/ui/addchannelsgroups.glade.h:16
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
 #, fuzzy
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+msgid "Delete this text before the name:"
+msgstr "Folgendes vor dem Namen löschen:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+#, fuzzy
+msgid "Text or regexp which must be deleted at the end of the channel's name"
 msgstr ""
-"Wähle einen oder mehrere Sendergruppen zum hinzufügen aus und klicke auf "
-"Hinzufügen."
+"Text oder regulärer Ausdruck der hinter dem Sendernamen gelöscht werden soll"
 
-#: ../data/ui/addchannelsgroups.glade.h:17
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
 #, fuzzy
-msgid "Special group"
-msgstr "Spezielle Gruppe"
+msgid "Delete this text behind the name:"
+msgstr "Folgendes hinter dem Namen löschen: "
 
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
 #, fuzzy
 msgid ""
 "Text or regexp which must be deleted at the beginning of the channel's name"
 msgstr ""
 "Text oder regulärer Ausdruck der vor dem Sendernamen gelöscht werden soll"
 
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-#, fuzzy

freetuxtv-0.6.6.tar.gz/po/es.po Added

@@ -0,0 +1,1816 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: freetuxtv.HEAD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2012-11-3 16:22+GMT+4\n"
+"Last-Translator: Maximiliano Castañón Araneda <maximi89@gmail.com>\n"
+"Language-Team: Español <es@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Agregar una grabación"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Canal seleccionado:"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Título:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Tiempo inicio:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Duración:"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Término:"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "minutos"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "Período de grabación"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Agrega un grupo"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "Archivo de grupos de canales:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Selecciona 1 o varios grupos de canales que quieras agregar y hace clic "
+"sobre el botón agregar."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Grupo Idioma/Canales"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "ISP Requerido"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Grupo existente de canales"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Nombre grupo:"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr "Nombre del grupo que será agregado"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "URI reproducción:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Lista de reproducción de URI que serán agregados"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Elimina este texto antes del nombre:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Elimina este texto detrás del nombre:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "Nombre procesamiento de canales"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Grupo de canales personalizado"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Favoritos"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "Special group type:"
+msgstr "Tipo de grupo especial:"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Grupo Especial"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Propiedades del canal"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Nombre del canal:"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "URI del canal:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "Channel VLC options:"
+msgstr "Opciones de canales VLC:"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr ""
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr ""
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "ninguna"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Opciones"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "Project's Web Site"
+msgstr "Sitio web del proyecto"
+
+#. TRANSLATORS: Replace this string with your names, one name per line.
+#: ../data/ui/freetuxtv.glade.h:5
+msgid "translator-credits"
+msgstr "crédito traductores"
+
+#: ../data/ui/freetuxtv.glade.h:6

freetuxtv-0.6.5.tar.gz/po/fr.po -> freetuxtv-0.6.6.tar.gz/po/fr.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: freetuxtv.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
 "PO-Revision-Date: 2010-08-03 23:14+0200\n"
 "Last-Translator: Yannick LE NY <yleny@laposte.net>\n"
 "Language-Team: FR <eric.beuque@gmail.com>\n"
@@ -18,125 +18,109 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/ui/addrecording.glade.h:1
-msgid "Recording period"
-msgstr "Période d'enregistrement"
-
-#: ../data/ui/addrecording.glade.h:2
 msgid "Add a recording"
 msgstr "Ajout d'un enregistrement"
 
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Chaîne séléctionné:"
+
 #: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "Durée :"
+msgid "Title:"
+msgstr "Titre :"
 
 #: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "Heure de fin :"
+msgid "Start time:"
+msgstr "Heure de début :"
 
 #: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "Chaîne séléctionné:"
+msgid "Duration:"
+msgstr "Durée :"
 
 #: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "Heure de début :"
+msgid "End time:"
+msgstr "Heure de fin :"
 
 #: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "Titre :"
-
-#: ../data/ui/addrecording.glade.h:8
 msgid "minutes"
 msgstr "minutes"
 
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "Processing of channels' name"
-msgstr "Traitement du nom des chaînes"
-
-#: ../data/ui/addchannelsgroups.glade.h:2
-msgid "Special group type:"
-msgstr "Type du groupe spécial :"
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "Période d'enregistrement"
 
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
 msgid "Add a group"
 msgstr "_Ajouter un groupe"
 
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
 msgid "Channels groups file:"
 msgstr "Fichier des groupes de chaînes :"
 
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Sélectionnez un ou plusieurs groupes de chaînes que vous voulez ajouter et "
+"cliquez sur le bouton Ajouter."
+
 #: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "Groupe personnalisé de chaînes"
+msgid "Languages/Channels group"
+msgstr "Groupe Langues/Chaînes"
 
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "Texte à enlever au début :"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "FAI requis"
 
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "Texte à enlever à la fin :"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
 
 #: ../data/ui/addchannelsgroups.glade.h:8
 msgid "Existing channels group"
 msgstr "Groupe des chaînes existantes"
 
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "Favoris"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
 msgid "Group's name:"
 msgstr "Nom du groupe :"
 
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "Groupe Langues/Chaînes"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
 msgid "Name of the group which will be added"
 msgstr "Nom du groupe à ajouter"
 
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "URI de la playlist du groupe à ajouter"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
 msgid "Playlist's URI:"
 msgstr "URI de la playlist :"
 
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "FAI requis"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "URI de la playlist du groupe à ajouter"
 
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Texte à enlever au début :"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
 msgstr ""
-"Sélectionnez un ou plusieurs groupes de chaînes que vous voulez ajouter et "
-"cliquez sur le bouton Ajouter."
+"Texte ou expression régulière qui sera retiré à la fin du nom de la chaîne"
 
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "Groupe spécial"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Texte à enlever à la fin :"
 
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
 msgid ""
 "Text or regexp which must be deleted at the beginning of the channel's name"
 msgstr ""
 "Texte ou expression régulière qui sera retiré au début du nom de la chaîne"
 
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr ""
-"Texte ou expression régulière qui sera retiré à la fin du nom de la chaîne"
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
 msgid ""
 "You can easily use regular expressions to delete some text in the channel's "
 "name of the groupe. For example, if in your playlist, you have a name like "
@@ -149,645 +133,1093 @@
 "12\", FreetuxTV peut enlever automatiquement le numéro de chaînes devant, en "
 "spécifiant l'expression \"[0-9]* - \"."
 
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "Traitement du nom des chaînes"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"

freetuxtv-0.6.6.tar.gz/po/lt.po Added

@@ -0,0 +1,1705 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-28 11:07+0200\n"
+"PO-Revision-Date: 2013-02-28 13:43+0200\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
+"Language-Team: Lietuvių <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Pridėti įrašą"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Pasirinktas kanalas:"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Pavadinimas:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Pradžios laikas:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Trukmė:"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Pabaigos laikas:"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "minutės"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "Įrašymo laikotarpis"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Pridėti grupę"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "Kanalų grupės failas:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Pasirinkite vieną ar kelias kanalų grupes, kurias norite pridėti ir "
+"paspauskite mygtuką pridėti."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Kalbos/Kanalų grupė"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Reikalingas ISP"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Esamos kanalų grupės"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Grupės pavadinimas:"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr "Pridedamos grupės pavadinimas"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Grojaraščio URI:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Pridedamos grupės grojaraščio URI"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Prieš pavadinimą pašalinti šį tekstą:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+"Kanalo pavadinimo pabaigoje tekstas ar regexp išraiška kuri turi būti "
+"pašalinta"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Pašalinti šį tekstą pavadinimo pradžioje:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr ""
+"Kanalo pavadinimo pradžioje tekstas ar regexp išraiška kuri turi būti "
+"pašalinta"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Galite naudoti reguliariąsias išraiškas ir be didelio vargo pašalinti tekstą "
+"iš kanalo ar grupės pavadinimo. Pvz. jei jūsų grojaraštis pavadintas \"11 - "
+"NT1\" or \"12 - NRJ 12\", FreeetuxTV gali pašalinti kanalo numerį, naudojant "
+"reguliariąją išraišką „[0-9]* - “."
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "Apdorojamas kanalo pavadinimas"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Pasirinktinė kanalų grupė"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Mėgstamiausi"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "Special group type:"
+msgstr "Specialios grupės tipas:"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Speciali grupė"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Kanalo savybės"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Kanalo pavadinimas:"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Kanalo URI:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "Channel VLC options:"
+msgstr "Kanalo VLC parinktys:"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Bendra"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Deinterliacija:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "joks"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Parinktys"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr "GNU bendroji viešoji licencija, 3 versija"
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr "Internetinės televizijos grotuvas"

freetuxtv-0.6.6.tar.gz/po/pl.po Added

@@ -0,0 +1,1280 @@
+# Polish translation of freetuxtv.
+# Copyright (C) 2013 GNU General Public License v3
+# This file is distributed under the same license as the freetuxtv package.
+# Eric Beuque <eric.beuque@gmail.com>, 2013. (From patch)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"PO-Revision-Date: 2013-11-24 11:00+0100\n"
+"Last-Translator: Eric Beuque <eric.beuque@gmail.com>\n"
+"Language-Team: Polish <eric.beuque@gmail.com>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Recording period"
+msgstr "okres nagrywania"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Add a recording"
+msgstr "Dodaj nagranie"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Duration:"
+msgstr "Czas nagrywania"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "End time:"
+msgstr "Czas końcowy"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Selected channel:"
+msgstr "Wybierz kanał"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "Start time:"
+msgstr "Czas początkowy"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "Title:"
+msgstr "Tytuł"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "minutes"
+msgstr "minuty"
+
+#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
+msgid "Processing of channels' name"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Special group type:"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "Add a group"
+msgstr "Dodaj grupę"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid "Channels groups file:"
+msgstr "Plik grupy kanałów"
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Custom channels group"
+msgstr "Grupa kanałów użytkownika"
+
+#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
+msgid "Delete this text before the name:"
+msgstr "Usuń tekst przed nazwą:"
+
+#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
+msgid "Delete this text behind the name:"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Istniejące grupy kanałów"
+
+#: ../data/ui/addchannelsgroups.glade.h:9
+msgid "Favourites"
+msgstr "Ulubione"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+msgid "Group's name:"
+msgstr "Nazwa grupy:"
+
+#: ../data/ui/addchannelsgroups.glade.h:11
+msgid "Languages/Channels group"
+msgstr "ęzyki/Grupy kanałów"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+msgid "Name of the group which will be added"
+msgstr "Nazwa grupy jaka ma być dodana"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
+msgid "Playlist's URI of the group which will be added"
+msgstr "URI Listy odtwarzania jaka ma być dodana"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+msgid "Playlist's URI:"
+msgstr "URI Listy odtwarzania:"
+
+#: ../data/ui/addchannelsgroups.glade.h:15
+msgid "Required ISP"
+msgstr "Brakuje ISP"
+
+#: ../data/ui/addchannelsgroups.glade.h:16
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr "Wybierz jedną lub kilka grup kanałów jakie chcesz dodać i kliknij na "
+"przycisk."
+
+#: ../data/ui/addchannelsgroups.glade.h:17
+msgid "Special group"
+msgstr "Grupa specjalna"
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "URI"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel VLC options:"
+msgstr ""
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel properties"
+msgstr "Właściwości kanału"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "URI kanału:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "Channel's name:"
+msgstr "Nazwa kanału"
+
+#: ../data/ui/channelproperties.glade.h:5
+msgid "Deinterlacement:"
+msgstr ""
+
+#: ../data/ui/channelproperties.glade.h:6 ../data/ui/freetuxtv.glade.h:30
+msgid "General"
+msgstr "Ogólne"
+
+#: ../data/ui/channelproperties.glade.h:7
+msgid "Options"
+msgstr "Okcje"
+
+#: ../data/ui/channelproperties.glade.h:8
+#: ../src/freetuxtv-window-channel-properties.c:175
+msgid "none"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid " channels"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "+"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "-"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:4
+msgid "0"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:5
+msgid "00:00:00"
+msgstr ""
+

freetuxtv-0.6.5.tar.gz/po/pt.po -> freetuxtv-0.6.6.tar.gz/po/pt.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
 "PO-Revision-Date: 2009-12-13 22:57+0100\n"
 "Last-Translator: José JORGE <jjorge@free.fr>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -20,129 +20,111 @@
 
 #: ../data/ui/addrecording.glade.h:1
 #, fuzzy
-msgid "Recording period"
-msgstr "Destino"
+msgid "Add a recording"
+msgstr "Adicionar um grupo"
 
 #: ../data/ui/addrecording.glade.h:2
 #, fuzzy
-msgid "Add a recording"
-msgstr "Adicionar um grupo"
+msgid "Selected channel:"
+msgstr "canais"
 
 #: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
+msgid "Title:"
 msgstr ""
 
 #: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
+msgid "Start time:"
 msgstr ""
 
 #: ../data/ui/addrecording.glade.h:5
-#, fuzzy
-msgid "Selected channel:"
-msgstr "canais"
+msgid "Duration:"
+msgstr ""
 
 #: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
+msgid "End time:"
 msgstr ""
 
 #: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr ""
-
-#: ../data/ui/addrecording.glade.h:8
 msgid "minutes"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "Processing of channels' name"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:2
+#: ../data/ui/addrecording.glade.h:8
 #, fuzzy
-msgid "Special group type:"
-msgstr "Adicionar um grupo"
+msgid "Recording period"
+msgstr "Destino"
 
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
 #, fuzzy
 msgid "Add a group"
 msgstr "Adicionar um grupo"
 
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
 #, fuzzy
 msgid "Channels groups file:"
 msgstr "Ficheiro de grupos de canais :"
 
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+
 #: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
+#, fuzzy
+msgid "Languages/Channels group"
 msgstr "Grupos de canais personalizados"
 
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
 msgstr ""
 
 #: ../data/ui/addchannelsgroups.glade.h:8
 msgid "Existing channels group"
 msgstr "Grupos de canais conhecidos"
 
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
 msgid "Group's name:"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:11
-#, fuzzy
-msgid "Languages/Channels group"
-msgstr "Grupos de canais personalizados"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
 msgid "Name of the group which will be added"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr ""
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
 #, fuzzy
 msgid "Playlist's URI:"
 msgstr "Endereço URI da lista de leitura :"
 
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:17
-#, fuzzy
-msgid "Special group"
-msgstr "Adicionar um grupo"
-
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
-msgid ""
-"Text or regexp which must be deleted at the beginning of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
 msgid ""
 "You can easily use regular expressions to delete some text in the channel's "
 "name of the groupe. For example, if in your playlist, you have a name like "
@@ -150,20 +132,38 @@
 "number before the name, by using the regular expression \"[0-9]* - \"."
 msgstr ""
 
-#: ../data/ui/addchannelsgroups.glade.h:22
-msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
 msgstr ""
 
-#: ../data/ui/channelproperties.glade.h:1
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Grupos de canais personalizados"
+
+#: ../data/ui/addchannelsgroups.glade.h:20

freetuxtv-0.6.6.tar.gz/po/ru.po Added

@@ -0,0 +1,1812 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2013-02-15 21:00+GMT+3\n"
+"Last-Translator: Eugen Z.<cdxncdxn@gmail.com>\n"
+"Language-Team: Russian \n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Добавить запись"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Выбранный"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Название:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Время начала:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Продолжительность"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Конец времени"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "минут(ы)"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "Время записи"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Добавить список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "XML Файл со списками каналов:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr ""
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Выделите один или несколько списков с каналами и нажмите кнопку добавить."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Язык/Список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Необходимый провайдер"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "Интернет адрес"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Готовые списки каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Название списка"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr ""
+"Название списка с каналами который будет добавлен.\n"
+"Например: Мои список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Интернет адрес списка каналов:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr ""
+"Адрес содержащий список каналов который будет добавлен\n"
+"(ссылка на m3u файл или в другом читаемом формате)\n"
+"Например: http://database.freetuxtv.net/playlists/playlist_webtv_ru.m3u"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Удалить этот тест из начала названия:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr ""
+"Текст или регулярное выражение удаляемые из начала строки названия канала"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Удалить этот тест из конца названия:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr "Текст или регулярное выражение удаляемые с конца названия канала"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Вы можете использовать регулярные выражения, чтобы удалить текст в названиях "
+"каналов.\n"
+"Например, в списке воспроизведения названия:\n"
+"\"11 - Телеканал 2x2\". \n"
+"\"12 - Культура\". \n"
+"\"11 - \" и \"12 - \" перед именем канала удаляется с помощью фильтра: "
+"\"[0-9]* - \""
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "Обработка имен каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Другой список каналов"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Избранное"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "Special group type:"
+msgstr "Тип списка:"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Пустой список каналов"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Параметры канала"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Название канала"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Интернет адрес канала"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "Channel VLC options:"
+msgstr "VLC параметры канала:"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Основные"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Устранение чересстрочности:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "не задано"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Параметры"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr ""
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"

freetuxtv-0.6.6.tar.gz/po/tr.po Added

@@ -0,0 +1,1982 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Şâkir Aşçı <sakirasci@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
+"PO-Revision-Date: 2012-10-26 18:41+0300\n"
+"Last-Translator: Şâkir Aşçı <sakirasci@gmail.com>\n"
+"Language-Team: Ubuntu Türkçe Çeviri Takımı\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: ../data/ui/addrecording.glade.h:1
+msgid "Add a recording"
+msgstr "Kayıt ekle"
+
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "Seçilen kanal:"
+
+#: ../data/ui/addrecording.glade.h:3
+msgid "Title:"
+msgstr "Başlık:"
+
+#: ../data/ui/addrecording.glade.h:4
+msgid "Start time:"
+msgstr "Başlanguç zamânı:"
+
+#: ../data/ui/addrecording.glade.h:5
+msgid "Duration:"
+msgstr "Süre:"
+
+#: ../data/ui/addrecording.glade.h:6
+msgid "End time:"
+msgstr "Bitiş zamânı:"
+
+#: ../data/ui/addrecording.glade.h:7
+msgid "minutes"
+msgstr "dakîka"
+
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "Kaydetme aralığı"
+
+#: ../data/ui/addchannelsgroups.glade.h:1
+msgid "Add a group"
+msgstr "Liste ekle"
+
+#: ../data/ui/addchannelsgroups.glade.h:2
+msgid "Channels groups file:"
+msgstr "Kanalların liste dosyası:"
+
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr ""
+"Eklemek istediğiniz bir ya da daha fazla kanal listesini seçin ve ekle "
+"düğmesine tıklayın."
+
+#: ../data/ui/addchannelsgroups.glade.h:5
+msgid "Languages/Channels group"
+msgstr "Dil/Kanal Listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "Sağlayıcı"
+
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "Bulunak"
+
+#: ../data/ui/addchannelsgroups.glade.h:8
+msgid "Existing channels group"
+msgstr "Öntanımlı kanal listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
+msgid "Group's name:"
+msgstr "Liste adı:"
+
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
+msgid "Name of the group which will be added"
+msgstr "Eklenecek liste adı"
+
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
+msgid "Playlist's URI:"
+msgstr "Liste bulunağı:"
+
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "Eklenecek listenin bulunağı"
+
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "Addan önceki şu metni sil:"
+
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "Kanal adının sonundan silinecek olan metin ya da düzenli ifâde"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "Addan sonraki şu metni sil:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
+msgstr "Kanal adının başından silinecek olan metin ya da düzenli ifâde"
+
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"Listedeki kanal adından bâzı metinleri silmek için basit düzenli ifâdeler "
+"kullanabilirsiniz. Örneğin, ekleyeceğiniz listedeki kanalın \"54 - Kanal "
+"54\" ya da \"3 - TRT 3\" benzeri bir adı varsa, FreetuxTV kanalın adının "
+"öncesinde bulunan rakamları \"[0-9]*- \" düzenli ifâdesini kullanarak "
+"silebilir."
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "Kanalların adının işlenmesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "Kişisel kanal listesi"
+
+#: ../data/ui/addchannelsgroups.glade.h:20
+msgid "Favourites"
+msgstr "Gözdeler"
+
+#: ../data/ui/addchannelsgroups.glade.h:21
+msgid "Special group type:"
+msgstr "Özel liste biçimi:"
+
+#: ../data/ui/addchannelsgroups.glade.h:22
+msgid "Special group"
+msgstr "Özel liste"
+
+#: ../data/ui/channelproperties.glade.h:1
+msgid "Channel properties"
+msgstr "Kanal özellikleri"
+
+#: ../data/ui/channelproperties.glade.h:2
+msgid "Channel's name:"
+msgstr "Kanal adı:"
+
+#: ../data/ui/channelproperties.glade.h:3
+msgid "Channel's URI:"
+msgstr "Kanal Bulunağı:"
+
+#: ../data/ui/channelproperties.glade.h:4
+msgid "Channel VLC options:"
+msgstr "Kanal VLC seçenekleri:"
+
+#: ../data/ui/channelproperties.glade.h:5 ../data/ui/freetuxtv.glade.h:17
+msgid "General"
+msgstr "Genel"
+
+#: ../data/ui/channelproperties.glade.h:6
+msgid "Deinterlacement:"
+msgstr "Görüntü ayrıştırma:"
+
+#: ../data/ui/channelproperties.glade.h:7
+#: ../src/freetuxtv-window-channel-properties.c:176
+msgid "none"
+msgstr "yok"
+
+#: ../data/ui/channelproperties.glade.h:8
+msgid "Options"
+msgstr "Seçenekler"
+
+#: ../data/ui/freetuxtv.glade.h:1
+msgid "GNU General Public License v3"
+msgstr "GNU Genel Kamu Lisansu Sürüm 3"
+
+#: ../data/ui/freetuxtv.glade.h:2
+msgid "Web TV channels player"
+msgstr "Genelağ TV kanalları oynatıcısı"
+
+#: ../data/ui/freetuxtv.glade.h:3
+msgid "Project's Web Site"
+msgstr "Proje Genelağ Sayfası"
+
+#. TRANSLATORS: Replace this string with your names, one name per line.

freetuxtv-0.6.5.tar.gz/po/zh_CN.po -> freetuxtv-0.6.6.tar.gz/po/zh_CN.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: freetuxtv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
 "PO-Revision-Date: 2011-12-14 17:53+0800\n"
 "Last-Translator: Dean Lee <xslidian@gmail.com>\n"
 "Language-Team: Chinese Simplified <xslidian+freetuxtv@gmail.com>\n"
@@ -18,784 +18,1325 @@
 "X-Poedit-Language: Chinese\n"
 
 #: ../data/ui/addrecording.glade.h:1
-msgid "Recording period"
-msgstr "录制间隔"
-
-#: ../data/ui/addrecording.glade.h:2
 msgid "Add a recording"
 msgstr "添加录像任务"
 
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "选中频道:"
+
 #: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "时长:"
+msgid "Title:"
+msgstr "标题:"
 
 #: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "终止时间:"
+msgid "Start time:"
+msgstr "起始时间:"
 
 #: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "选中频道:"
+msgid "Duration:"
+msgstr "时长:"
 
 #: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "起始时间:"
+msgid "End time:"
+msgstr "终止时间:"
 
 #: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "标题:"
-
-#: ../data/ui/addrecording.glade.h:8
 msgid "minutes"
 msgstr "分钟"
 
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "录制间隔"
+
 #: ../data/ui/addchannelsgroups.glade.h:1
-#: ../data/ui/freetuxtv.glade.h:10
-msgid "Processing of channels' name"
-msgstr "正在处理频道名称"
+msgid "Add a group"
+msgstr "添加组"
 
 #: ../data/ui/addchannelsgroups.glade.h:2
-msgid "Special group type:"
-msgstr "特殊组类:"
+msgid "Channels groups file:"
+msgstr "频道组文件:"
 
 #: ../data/ui/addchannelsgroups.glade.h:3
-msgid "Add a group"
-msgstr "添加组"
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
 
 #: ../data/ui/addchannelsgroups.glade.h:4
-msgid "Channels groups file:"
-msgstr "频道组文件:"
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr "选择希望添加的一个或多个频道组并点击添加按钮。"
 
 #: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "自定义频道组"
+msgid "Languages/Channels group"
+msgstr "语言/频道组"
 
 #: ../data/ui/addchannelsgroups.glade.h:6
-#: ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "删除名称前的这些文字:"
+msgid "Required ISP"
+msgstr "所需 ISP"
 
 #: ../data/ui/addchannelsgroups.glade.h:7
-#: ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "删除名称后的这些文字:"
+msgid "URI"
+msgstr "URI"
 
 #: ../data/ui/addchannelsgroups.glade.h:8
 msgid "Existing channels group"
 msgstr "现有频道组"
 
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "收藏"
-
-#: ../data/ui/addchannelsgroups.glade.h:10
-#: ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
 msgid "Group's name:"
 msgstr "组名:"
 
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "语言/频道组"
-
-#: ../data/ui/addchannelsgroups.glade.h:12
-#: ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
 msgid "Name of the group which will be added"
 msgstr "将添加的组名"
 
-#: ../data/ui/addchannelsgroups.glade.h:13
-#: ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "将添加组的播放列表 URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:14
-#: ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
 msgid "Playlist's URI:"
 msgstr "播放列表 URI:"
 
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "所需 ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "将添加组的播放列表 URI"
 
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid "Select one or several channels group you want to add and click on the add button."
-msgstr "选择希望添加的一个或多个频道组并点击添加按钮。"
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "删除名称前的这些文字:"
 
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "特殊组"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "频道名称末尾必须删除的文本或正则表达式"
 
-#: ../data/ui/addchannelsgroups.glade.h:18
-#: ../data/ui/freetuxtv.glade.h:68
-msgid "Text or regexp which must be deleted at the beginning of the channel's name"
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "删除名称后的这些文字:"
+
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
+msgid ""
+"Text or regexp which must be deleted at the beginning of the channel's name"
 msgstr "频道名称开头必须删除的文本或正则表达式"
 
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
+msgid ""
+"You can easily use regular expressions to delete some text in the channel's "
+"name of the groupe. For example, if in your playlist, you have a name like "
+"\"11 - NT1\" or \"12 - NRJ 12\", FreetuxTV is able to remove the channel's "
+"number before the name, by using the regular expression \"[0-9]* - \"."
+msgstr ""
+"您可以使用正则表达式删除组中频道名称的部分文字。例如，如果您的播放列表中有类"
+"似 \"11 - NT1\" 或 \"12 - NRJ 12\" 的名称，FreetuxTV 可以使用正则表达式 "
+"\"[0-9]* - \" 移除名称前的频道号。"
+
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "正在处理频道名称"
+
 #: ../data/ui/addchannelsgroups.glade.h:19
-#: ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr "频道名称末尾必须删除的文本或正则表达式"
+msgid "Custom channels group"
+msgstr "自定义频道组"
 
 #: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"

freetuxtv-0.6.5.tar.gz/po/zh_TW.po -> freetuxtv-0.6.6.tar.gz/po/zh_TW.po Changed

@@ -8,132 +8,116 @@
 msgstr ""
 "Project-Id-Version: freetuxtv 0.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 21:41+0100\n"
+"POT-Creation-Date: 2013-03-05 20:38+0100\n"
 "PO-Revision-Date: 2011-11-25 10:59+0800\n"
 "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/ui/addrecording.glade.h:1
-msgid "Recording period"
-msgstr "錄製時段"
-
-#: ../data/ui/addrecording.glade.h:2
 msgid "Add a recording"
 msgstr "加入錄製"
 
+#: ../data/ui/addrecording.glade.h:2
+msgid "Selected channel:"
+msgstr "所選頻道"
+
 #: ../data/ui/addrecording.glade.h:3
-msgid "Duration:"
-msgstr "時間:"
+msgid "Title:"
+msgstr "標題:"
 
 #: ../data/ui/addrecording.glade.h:4
-msgid "End time:"
-msgstr "終止時間:"
+msgid "Start time:"
+msgstr "起始時間:"
 
 #: ../data/ui/addrecording.glade.h:5
-msgid "Selected channel:"
-msgstr "所選頻道"
+msgid "Duration:"
+msgstr "時間:"
 
 #: ../data/ui/addrecording.glade.h:6
-msgid "Start time:"
-msgstr "起始時間:"
+msgid "End time:"
+msgstr "終止時間:"
 
 #: ../data/ui/addrecording.glade.h:7
-msgid "Title:"
-msgstr "標題:"
-
-#: ../data/ui/addrecording.glade.h:8
 msgid "minutes"
 msgstr "分鐘"
 
-#: ../data/ui/addchannelsgroups.glade.h:1 ../data/ui/freetuxtv.glade.h:10
-msgid "Processing of channels' name"
-msgstr "正在處理頻道名稱"
-
-#: ../data/ui/addchannelsgroups.glade.h:2
-msgid "Special group type:"
-msgstr "特殊群組類別:"
+#: ../data/ui/addrecording.glade.h:8
+msgid "Recording period"
+msgstr "錄製時段"
 
-#: ../data/ui/addchannelsgroups.glade.h:3
+#: ../data/ui/addchannelsgroups.glade.h:1
 msgid "Add a group"
 msgstr "加入群組"
 
-#: ../data/ui/addchannelsgroups.glade.h:4
+#: ../data/ui/addchannelsgroups.glade.h:2
 msgid "Channels groups file:"
 msgstr "頻道群組檔案:"
 
+#: ../data/ui/addchannelsgroups.glade.h:3
+msgid "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+msgstr "http://freetuxtv.googlecode.com/svn/trunk/data/channels_groups.xml"
+
+#: ../data/ui/addchannelsgroups.glade.h:4
+msgid ""
+"Select one or several channels group you want to add and click on the add "
+"button."
+msgstr "選擇希望加入的一個或多個頻道群組並點擊加入按鈕。"
+
 #: ../data/ui/addchannelsgroups.glade.h:5
-msgid "Custom channels group"
-msgstr "自訂頻道群組"
+msgid "Languages/Channels group"
+msgstr "語言/頻道群組"
 
-#: ../data/ui/addchannelsgroups.glade.h:6 ../data/ui/freetuxtv.glade.h:20
-msgid "Delete this text before the name:"
-msgstr "刪除名稱前的這些文字:"
+#: ../data/ui/addchannelsgroups.glade.h:6
+msgid "Required ISP"
+msgstr "所需 ISP"
 
-#: ../data/ui/addchannelsgroups.glade.h:7 ../data/ui/freetuxtv.glade.h:21
-msgid "Delete this text behind the name:"
-msgstr "刪除名稱後的這些文字:"
+#: ../data/ui/addchannelsgroups.glade.h:7
+msgid "URI"
+msgstr "URI"
 
 #: ../data/ui/addchannelsgroups.glade.h:8
 msgid "Existing channels group"
 msgstr "現有頻道群組"
 
-#: ../data/ui/addchannelsgroups.glade.h:9
-msgid "Favourites"
-msgstr "收藏"
-
-#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:34
+#: ../data/ui/addchannelsgroups.glade.h:9 ../data/ui/freetuxtv.glade.h:7
 msgid "Group's name:"
 msgstr "群組名稱:"
 
-#: ../data/ui/addchannelsgroups.glade.h:11
-msgid "Languages/Channels group"
-msgstr "語言/頻道群組"
-
-#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:41
+#: ../data/ui/addchannelsgroups.glade.h:10 ../data/ui/freetuxtv.glade.h:9
 msgid "Name of the group which will be added"
 msgstr "將加入的群組名稱"
 
-#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:51
-msgid "Playlist's URI of the group which will be added"
-msgstr "將加入群組的播放清單 URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:52
+#: ../data/ui/addchannelsgroups.glade.h:11 ../data/ui/freetuxtv.glade.h:8
 msgid "Playlist's URI:"
 msgstr "播放清單 URI:"
 
-#: ../data/ui/addchannelsgroups.glade.h:15
-msgid "Required ISP"
-msgstr "所需 ISP"
+#: ../data/ui/addchannelsgroups.glade.h:12 ../data/ui/freetuxtv.glade.h:10
+msgid "Playlist's URI of the group which will be added"
+msgstr "將加入群組的播放清單 URI"
 
-#: ../data/ui/addchannelsgroups.glade.h:16
-msgid ""
-"Select one or several channels group you want to add and click on the add "
-"button."
-msgstr "選擇希望加入的一個或多個頻道群組並點擊加入按鈕。"
+#: ../data/ui/addchannelsgroups.glade.h:13 ../data/ui/freetuxtv.glade.h:11
+msgid "Delete this text before the name:"
+msgstr "刪除名稱前的這些文字:"
 
-#: ../data/ui/addchannelsgroups.glade.h:17
-msgid "Special group"
-msgstr "特殊群組"
+#: ../data/ui/addchannelsgroups.glade.h:14 ../data/ui/freetuxtv.glade.h:13
+msgid "Text or regexp which must be deleted at the end of the channel's name"
+msgstr "頻道名稱末尾必須刪除的文字或正規表示式"
+
+#: ../data/ui/addchannelsgroups.glade.h:15 ../data/ui/freetuxtv.glade.h:12
+msgid "Delete this text behind the name:"
+msgstr "刪除名稱後的這些文字:"
 
-#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:68
+#: ../data/ui/addchannelsgroups.glade.h:16 ../data/ui/freetuxtv.glade.h:14
 msgid ""
 "Text or regexp which must be deleted at the beginning of the channel's name"
 msgstr "頻道名稱開頭必須刪除的文字或正規表示式"
 
-#: ../data/ui/addchannelsgroups.glade.h:19 ../data/ui/freetuxtv.glade.h:69
-msgid "Text or regexp which must be deleted at the end of the channel's name"
-msgstr "頻道名稱末尾必須刪除的文字或正規表示式"
-
-#: ../data/ui/addchannelsgroups.glade.h:20
-msgid "URI"
-msgstr "URI"
-
-#: ../data/ui/addchannelsgroups.glade.h:21 ../data/ui/freetuxtv.glade.h:80
+#: ../data/ui/addchannelsgroups.glade.h:17 ../data/ui/freetuxtv.glade.h:15
 msgid ""
 "You can easily use regular expressions to delete some text in the channel's "
 "name of the groupe. For example, if in your playlist, you have a name like "
@@ -144,645 +128,1203 @@
 "類似「11 - NT1」或「12 - NRJ 12」的名稱，FreetuxTV 可以使用正規表示式「[0-9]"
 "* - 」移除名稱前的頻道號。"
 
+#: ../data/ui/addchannelsgroups.glade.h:18 ../data/ui/freetuxtv.glade.h:16
+msgid "Processing of channels' name"
+msgstr "正在處理頻道名稱"
+
+#: ../data/ui/addchannelsgroups.glade.h:19
+msgid "Custom channels group"
+msgstr "自訂頻道群組"
+

freetuxtv-0.6.5.tar.gz/src/Makefile.am -> freetuxtv-0.6.6.tar.gz/src/Makefile.am Changed

freetuxtv-0.6.5.tar.gz/src/Makefile.in -> freetuxtv-0.6.6.tar.gz/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,12 +80,13 @@
 host_triplet = @host@
 bin_PROGRAMS = freetuxtv$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -64,33 +109,81 @@
 	freetuxtv-tv-channel-infos.$(OBJEXT) \
 	freetuxtv-tv-channels-list.$(OBJEXT) freetuxtv-utils.$(OBJEXT) \
 	freetuxtv-window-add-channels-group.$(OBJEXT) \
+	freetuxtv-window-add-recording.$(OBJEXT) \
 	freetuxtv-window-channel-properties.$(OBJEXT) \
 	freetuxtv-window-main.$(OBJEXT) \
-	freetuxtv-window-add-recording.$(OBJEXT) lib-gmmkeys.$(OBJEXT) \
-	lib-m3uparser.$(OBJEXT) main.$(OBJEXT)
+	freetuxtv-window-tv-channels-database.$(OBJEXT) \
+	lib-gmmkeys.$(OBJEXT) lib-m3uparser.$(OBJEXT) main.$(OBJEXT)
 freetuxtv_OBJECTS = $(am_freetuxtv_OBJECTS)
 am__DEPENDENCIES_1 =
 freetuxtv_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../lib/libvlc-gtk/libvlc-gtk.la \
 	../lib/libdbevolution/libdbevolution.la
-freetuxtv_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+freetuxtv_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(freetuxtv_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(freetuxtv_SOURCES)
 DIST_SOURCES = $(freetuxtv_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -325,12 +418,14 @@
 	freetuxtv-utils.h \
 	freetuxtv-window-add-channels-group.c \
 	freetuxtv-window-add-channels-group.h \
+	freetuxtv-window-add-recording.c \
+	freetuxtv-window-add-recording.h \
 	freetuxtv-window-channel-properties.c \
 	freetuxtv-window-channel-properties.h \
 	freetuxtv-window-main.c \
 	freetuxtv-window-main.h \
-	freetuxtv-window-add-recording.c \
-	freetuxtv-window-add-recording.h \
+	freetuxtv-window-tv-channels-database.c \
+	freetuxtv-window-tv-channels-database.h \
 	lib-gmmkeys.c \
 	lib-gmmkeys.h \
 	lib-m3uparser.c \
@@ -378,14 +473,19 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \

freetuxtv-0.6.5.tar.gz/src/freetuxtv-fileutils.c -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-fileutils.c Changed

freetuxtv-0.6.5.tar.gz/src/freetuxtv-fileutils.h -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-fileutils.h Changed

freetuxtv-0.6.5.tar.gz/src/freetuxtv-gladexml.h -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-gladexml.h Changed

freetuxtv-0.6.5.tar.gz/src/freetuxtv-player-error-dialog.c -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-player-error-dialog.c Changed

freetuxtv-0.6.5.tar.gz/src/freetuxtv-tv-channels-list.c -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-tv-channels-list.c Changed

@@ -26,12 +26,16 @@
 #include "freetuxtv-window-main.h"
 #include "freetuxtv-tv-channel-infos.h"
 #include "freetuxtv-channels-list.h"
+#include "freetuxtv-utils.h"
 
 typedef struct _CBXMLData
 {
 	FreetuxTVApp *app;
 	DBSync *dbsync;
 	FreetuxTVTvChannelInfos *tv_channels_infos;
+	const gchar* szLogosURL;
+	SynchronizeProgressCB progressCB;
+	void* progressCBUserData;
 } CBXMLData;
 
 static void 
@@ -57,7 +61,8 @@
 
 void
 tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
-    GError** error)
+    const gchar* szLogosURL,
+    SynchronizeProgressCB funcCB, void* user_data, GError** error)
 {
 	g_return_if_fail(dbsync != NULL);
 	g_return_if_fail(error != NULL);
@@ -79,6 +84,9 @@
 		cbxmldata.app = app;
 		cbxmldata.dbsync = dbsync;
 		cbxmldata.tv_channels_infos = NULL;
+		cbxmldata.szLogosURL = szLogosURL,
+		cbxmldata.progressCB = funcCB;
+		cbxmldata.progressCBUserData = user_data;
 
 		gsize filelen;
 		static GMarkupParser parser = { xml_start_cb, xml_end_cb, xml_text_cb, 
@@ -89,17 +97,31 @@
 		    G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG,
 		    &cbxmldata, NULL);
 		gchar *xml_data;
-		gchar *filename;
-		filename = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
-		g_file_get_contents (filename, &xml_data, &filelen, NULL);
-		g_free(filename);
-		filename = NULL;
+		gchar *szFileName = NULL;
+
+		szFileName = g_build_filename(g_get_user_cache_dir(), "freetuxtv", "tv_channels.dat", NULL);
+		if(szFileName){
+			if(!g_file_test(szFileName, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)){
+				g_free(szFileName);
+				szFileName = NULL;
+			}
+		}
+		if(!szFileName){
+			szFileName = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
+		}
+		g_file_get_contents (szFileName, &xml_data, &filelen, NULL);
+		g_free(szFileName);
+		szFileName = NULL;
 		g_markup_parse_context_parse (context, xml_data, -1, error);
 	}
 
 	windowmain_statusbar_pop (app, "UpdateMsg");
 }
 
+static gchar* tvchannels_list_get_usr_img_path()
+{
+	return g_build_filename(g_get_user_data_dir(), "freetuxtv", "images", "channels", NULL);
+}
 
 static gchar*
 tvchannels_list_get_tvchannel_logo_path(FreetuxTVApp *app, 
@@ -109,8 +131,7 @@
 	gchar *szUserImgChannelsDir;
 	gboolean bFound = FALSE;
 	
-	szUserImgChannelsDir = g_build_filename(g_get_user_data_dir(), 
-	    "freetuxtv", "images", "channels", NULL);
+	szUserImgChannelsDir = tvchannels_list_get_usr_img_path();
 	
 	if(szLogoName != NULL){
 		// We look in the user logo directory
@@ -173,6 +194,27 @@
 	
 	return tvchannels_list_get_tvchannel_logo_path_for_channel(app, pChannelInfos, bNoneIcon);
 }
+static void tvchannels_list_download_logos(FreetuxTVApp *app, const gchar* szLogosDirectoryURL, const gchar* szUserImgChannelsDir, const char* szLogoName)
+{
+	gchar* szLogoURL = NULL;
+	gchar* szDstFile = NULL;
+	if(g_str_has_suffix(szLogosDirectoryURL, "/")){
+		szLogoURL = g_strconcat (szLogosDirectoryURL, szLogoName, NULL);
+	}else{
+		szLogoURL = g_strconcat (szLogosDirectoryURL, "/", szLogoName, NULL);
+	}
+
+	GError* error = NULL;
+	szDstFile = g_build_filename(szUserImgChannelsDir, szLogoName, NULL);
+	   
+	g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_INFO, "Downloading file : %s\n", szLogoURL);
+	freetuxtv_fileutils_get_file (szLogoURL, szDstFile, &(app->prefs.proxy), app->prefs.timeout, &error);
+	
+	if(error != NULL){
+		g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "Error : %s\n", error->message);
+		g_error_free(error);
+	}
+}
 
 static void 
 xml_start_cb(GMarkupParseContext *context,
@@ -188,6 +230,7 @@
 
 	if(g_ascii_strcasecmp(element_name, "tvchannel") == 0){
 		name = (gchar*)attribute_values[0];
+		cbxmldata->progressCB(name, cbxmldata->progressCBUserData);
 		cbxmldata->tv_channels_infos = freetuxtv_tv_channel_infos_new(name);
 	}
 	
@@ -206,6 +249,7 @@
 	CBXMLData* cbxmldata = (CBXMLData*)user_data;
 
 	FreetuxTVTvChannelInfos *tv_channels_infos = NULL;
+	gchar* szUserImgChannelsDir;
 
 	if(g_ascii_strcasecmp(element_name, "tvchannel") == 0){
 		tv_channels_infos = cbxmldata->tv_channels_infos;
@@ -213,6 +257,20 @@
 			// We have a channel pending, we add it in database
 			dbsync_add_tvchannel (cbxmldata->dbsync, tv_channels_infos, error);
 
+			const gchar* szLogoName = freetuxtv_tv_channel_infos_get_logo_filename(tv_channels_infos);
+
+			// Download logo for the channel if required
+			if(szLogoName && cbxmldata->szLogosURL){
+				szUserImgChannelsDir = tvchannels_list_get_usr_img_path();
+
+				tvchannels_list_download_logos(cbxmldata->app, cbxmldata->szLogosURL, szUserImgChannelsDir, szLogoName);
+
+				if(szUserImgChannelsDir){
+					g_free(szUserImgChannelsDir);
+					szUserImgChannelsDir = NULL;
+				}
+			}
+
 			g_object_unref(cbxmldata->tv_channels_infos);
 			cbxmldata->tv_channels_infos = NULL;
 		}

freetuxtv-0.6.5.tar.gz/src/freetuxtv-tv-channels-list.h -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-tv-channels-list.h Changed

freetuxtv-0.6.5.tar.gz/src/freetuxtv-window-main.c -> freetuxtv-0.6.6.tar.gz/src/freetuxtv-window-main.c Changed

@@ -25,6 +25,7 @@
 #include "freetuxtv-window-main.h"
 #include "freetuxtv-window-add-recording.h"
 #include "freetuxtv-window-add-channels-group.h"
+#include "freetuxtv-window-tv-channels-database.h"
 
 #include "freetuxtv-app.h"
 #include "freetuxtv-i18n.h"
@@ -1582,20 +1583,19 @@
 	FreetuxTVApp *app = (FreetuxTVApp *) user_data;
 
 	GError* error = NULL;
+	
+	GtkWindow* pWindow;
+	GtkWidget* pParent;
+	pParent = (GtkWidget *) gtk_builder_get_object (app->gui, "windowmain");
 
-	DBSync dbsync;
-	dbsync_open_db (&dbsync, &error);
-
-	if(error == NULL){
-		tvchannels_list_synchronize (app, &dbsync, &error);			
-	}
+	FreetuxTVWindowTVChannelsDatabase* pWindowTVChannelsDatabase;
+	pWindowTVChannelsDatabase = freetuxtv_window_tv_channels_database_new(GTK_WINDOW(pParent), app);
 
 	if(error == NULL){
-		channels_list_load_channels (app, &dbsync, &error);
+		pWindow = gtk_builder_window_get_top_window (GTK_BUILDER_WINDOW(pWindowTVChannelsDatabase));
+		gtk_widget_show(GTK_WIDGET(pWindow));
 	}
 
-	dbsync_close_db(&dbsync);
-
 	if(error != NULL){
 		windowmain_show_gerror (app, error);
 		g_error_free (error);

freetuxtv-0.6.6.tar.gz/src/freetuxtv-window-tv-channels-database.c Added

@@ -0,0 +1,267 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2012 <eric.beuque@gmail.com>
+ * 
+freetuxtv is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * freetuxtv is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "freetuxtv-window-tv-channels-database.h"
+
+#include "freetuxtv-gladexml.h"
+#include "freetuxtv-db-sync.h"
+#include "freetuxtv-channels-list.h"
+#include "freetuxtv-tv-channels-list.h"
+#include "freetuxtv-window-main.h"
+
+#include "freetuxtv-fileutils.h"
+
+#include "gtk-progress-dialog.h"
+
+typedef struct _FreetuxTVWindowTVChannelsDatabasePrivate FreetuxTVWindowTVChannelsDatabasePrivate;
+struct _FreetuxTVWindowTVChannelsDatabasePrivate
+{
+	FreetuxTVApp* app;
+};
+
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabasePrivate))
+
+G_DEFINE_TYPE (FreetuxTVWindowTVChannelsDatabase, freetuxtv_window_tv_channels_database, GTK_TYPE_BUILDER_WINDOW);
+
+static void
+freetuxtv_window_tv_channels_database_init (FreetuxTVWindowTVChannelsDatabase *pWindowTVChannelsDatabase)
+{
+	
+}
+
+static void
+freetuxtv_window_tv_channels_database_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (freetuxtv_window_tv_channels_database_parent_class)->finalize (object);
+}
+
+static void
+freetuxtv_window_tv_channels_database_class_init (FreetuxTVWindowTVChannelsDatabaseClass *klass)
+{
+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+	//GtkBuilderDialogClass* parent_class = GTK_BUILDER_DIALOG_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (FreetuxTVWindowTVChannelsDatabasePrivate));
+
+	object_class->finalize = freetuxtv_window_tv_channels_database_finalize;
+}
+
+static gboolean
+do_idle_destroy_window (gpointer user_data)
+{
+	g_return_val_if_fail(GTK_IS_BUILDER_WIDGET(user_data), FALSE);
+	gtk_builder_widget_destroy (GTK_BUILDER_WIDGET(user_data));
+
+	return FALSE;
+}
+
+static void
+on_buttonclose_clicked (GtkButton *button, gpointer user_data)
+{
+	// We do the destruction after the button clicked event is finished
+	g_idle_add (do_idle_destroy_window, user_data);
+}
+
+static void synchronize_progress_cb(gchar* szTVChannelName, void* user_data)
+{
+	GtkProgressDialog* pProgressDialog = (GtkProgressDialog*)user_data;
+
+	gchar* szTmp = g_strdup_printf(_("Updating TV channel: %s"), szTVChannelName);
+	
+	gtk_progress_dialog_set_text(pProgressDialog, szTmp);
+	gtk_progress_dialog_pulse(pProgressDialog);
+
+	if(szTmp){
+		g_free(szTmp);
+		szTmp = NULL;
+	}
+}
+
+static void
+on_buttonapply_clicked (GtkButton *button, gpointer user_data)
+{
+	FreetuxTVWindowTVChannelsDatabase* pWindowTVChannelsDatabase;
+	FreetuxTVWindowTVChannelsDatabasePrivate* priv;
+
+	pWindowTVChannelsDatabase = (FreetuxTVWindowTVChannelsDatabase*)user_data;
+	priv = FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_PRIVATE(pWindowTVChannelsDatabase);
+
+	GError* error = NULL;
+	
+	GtkBuilder *builder;
+	builder = gtk_builder_object_get_builder(GTK_BUILDER_OBJECT(pWindowTVChannelsDatabase));
+	
+	DBSync dbsync;
+
+	gchar* szTmp = NULL;
+	
+	gboolean bSynchronize = FALSE;
+	gboolean bDownloadFile = FALSE;
+	gboolean bUpdateLogos = FALSE;
+
+	const gchar *szDatabaseUrl;
+	const gchar *szLogosUrl;
+	gchar *szDstFile = NULL;
+
+	GtkWidget* pWidget;
+	GtkWindow* pParent;
+	
+	// Check if must synchronize
+	pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_synchronize");
+	bSynchronize = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+	
+	// Check if must update file
+	pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_download");
+	bDownloadFile = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+	pWidget = (GtkWidget *) gtk_builder_get_object (builder, "entry_url");
+	szDatabaseUrl = gtk_entry_get_text(GTK_ENTRY(pWidget));
+
+	// Check if must update logos
+	pWidget = (GtkWidget *) gtk_builder_get_object (builder, "checkbutton_logos");
+	bUpdateLogos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(pWidget));
+	pWidget = (GtkWidget *) gtk_builder_get_object (builder, "entry_logosurl");
+	szLogosUrl = gtk_entry_get_text(GTK_ENTRY(pWidget));
+
+	pParent = gtk_builder_window_get_top_window(GTK_BUILDER_WINDOW(pWindowTVChannelsDatabase));
+
+	// Start progress dialog
+	GtkProgressDialog* pProgressDialog = NULL;
+	gdouble progress = 0.0;
+	if(bSynchronize){
+		pProgressDialog = gtk_progress_dialog_new(pParent);
+		gtk_progress_dialog_set_title(pProgressDialog, _("TV channels synchronisation"));
+		gtk_progress_dialog_set_percent(pProgressDialog, progress);
+		gtk_widget_show(GTK_WIDGET(pProgressDialog));
+	}
+
+	// Do download file
+	if(bDownloadFile && (error == NULL)){
+		szDstFile = g_build_filename(g_get_user_cache_dir(), "freetuxtv", "tv_channels.dat", NULL);
+
+		szTmp = g_strdup_printf(_("Downloading the file '%s'"), szDatabaseUrl);
+		g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+		 "Downloading the file '%s'\n", szDatabaseUrl);
+		
+		gtk_progress_dialog_set_text(pProgressDialog, szTmp);
+		if(szTmp){
+			g_free(szTmp);
+			szTmp = NULL;
+		}
+
+		freetuxtv_fileutils_get_file (szDatabaseUrl, szDstFile, &(priv->app->prefs.proxy), priv->app->prefs.timeout, &error);
+	}
+
+	// Do synchronize
+	if(bSynchronize && (error == NULL)){
+		gtk_progress_dialog_set_text(pProgressDialog, _("Synchronizing TV channels from file"));
+		dbsync_open_db (&dbsync, &error);
+
+		if(error == NULL){
+			tvchannels_list_synchronize (priv->app, &dbsync,
+			 (bUpdateLogos ? szLogosUrl : NULL),
+			 synchronize_progress_cb, (void*)pProgressDialog, &error);			
+		}
+
+		if(error == NULL){
+			channels_list_load_channels (priv->app, &dbsync, &error);
+		}
+
+		dbsync_close_db(&dbsync);
+
+		gtk_progress_dialog_set_percent(pProgressDialog, 0.90);
+	}
+
+	if(szDstFile){
+		g_free(szDstFile);
+		szDstFile = NULL;
+	}
+	
+	// On error we destroy the progress dialog view
+	if(pProgressDialog){
+		if(error != NULL){
+			gtk_widget_destroy (GTK_WIDGET(pProgressDialog));
+			pProgressDialog = NULL;

freetuxtv-0.6.6.tar.gz/src/freetuxtv-window-tv-channels-database.h Added

@@ -0,0 +1,59 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2012 <eric.beuque@gmail.com>
+ * 
+freetuxtv is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * freetuxtv is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_
+#define _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_
+
+#include <glib-object.h>
+
+#include "gtk-builder-window.h"
+#include "freetuxtv-app.h"
+
+G_BEGIN_DECLS
+
+#define FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE (freetuxtv_window_tv_channels_database_get_type ())
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabase))
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabaseClass))
+#define FREETUXTV_IS_WINDOW_TV_CHANNELS_DATABASE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE))
+#define FREETUXTV_IS_WINDOW_TV_CHANNELS_DATABASE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE))
+#define FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), FREETUXTV_TYPE_WINDOW_TV_CHANNELS_DATABASE, FreetuxTVWindowTVChannelsDatabaseClass))
+
+typedef struct _FreetuxTVWindowTVChannelsDatabaseClass FreetuxTVWindowTVChannelsDatabaseClass;
+typedef struct _FreetuxTVWindowTVChannelsDatabase FreetuxTVWindowTVChannelsDatabase;
+
+
+
+struct _FreetuxTVWindowTVChannelsDatabaseClass
+{
+	GtkBuilderWindowClass parent_class;
+};
+
+struct _FreetuxTVWindowTVChannelsDatabase
+{
+	GtkBuilderWindow parent_instance;
+};
+
+GType freetuxtv_window_tv_channels_database_get_type (void) G_GNUC_CONST;
+
+FreetuxTVWindowTVChannelsDatabase*
+freetuxtv_window_tv_channels_database_new (GtkWindow *parent, FreetuxTVApp* app);
+
+G_END_DECLS
+
+#endif /* _FREETUXTV_WINDOW_TV_CHANNELS_DATABASE_H_ */

freetuxtv-0.6.5.tar.gz/src/gtk-date-time-picker.c -> freetuxtv-0.6.6.tar.gz/src/gtk-date-time-picker.c Changed

freetuxtv-0.6.5.tar.gz/src/gtk-progress-dialog.c -> freetuxtv-0.6.6.tar.gz/src/gtk-progress-dialog.c Changed

@@ -87,7 +87,7 @@
 
 	// Construct the dialog
 	GtkWidget* vbox;
-	vbox = gtk_vbox_new(FALSE, 5);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_set_border_width (GTK_CONTAINER(vbox), 10);
 
 	priv->title_widget = gtk_label_new("");
@@ -96,6 +96,7 @@
 
 	priv->progress_widget = gtk_progress_bar_new();
 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(priv->progress_widget), 0.0);
+	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(priv->progress_widget), 1.0);
 	gtk_progress_bar_set_text (GTK_PROGRESS_BAR(priv->progress_widget), "0 %");
 	gtk_box_pack_start (GTK_BOX(vbox), priv->progress_widget, FALSE, FALSE, 0);
 
@@ -194,6 +195,22 @@
 }
 
 void
+gtk_progress_dialog_pulse(GtkProgressDialog* dialog)
+{
+	g_return_if_fail(dialog!=NULL);
+	g_return_if_fail(GTK_IS_PROGRESS_DIALOG(dialog));
+
+	GtkProgressDialogPrivate* priv;
+	priv = GTK_PROGRESS_DIALOG_PRIVATE(dialog);
+	
+	gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_widget));
+	
+	while (gtk_events_pending()) {
+	    gtk_main_iteration();
+	}
+}
+
+void
 gtk_progress_dialog_set_button_close_enabled(GtkProgressDialog* dialog, gboolean enabled)
 {
 	g_return_if_fail(dialog!=NULL);

freetuxtv-0.6.5.tar.gz/src/gtk-progress-dialog.h -> freetuxtv-0.6.6.tar.gz/src/gtk-progress-dialog.h Changed

freetuxtv-0.6.5.tar.gz/src/main.c -> freetuxtv-0.6.6.tar.gz/src/main.c Changed

@@ -600,6 +600,21 @@
 	}
 }
 
+static void synchronize_progress_cb(gchar* szTVChannelName, void* user_data)
+{
+	FreetuxTVApp* app = (FreetuxTVApp*)user_data;
+
+	gchar* szTmp = g_strdup_printf(_("Synchronizing the list of tv channels: %s..."), szTVChannelName);
+	
+	splashscreen_statusbar_pop (app);
+	splashscreen_statusbar_push (app, szTmp);
+
+	if(szTmp){
+		g_free(szTmp);
+		szTmp = NULL;
+	}
+}
+
 static gboolean
 splashscreen_app_init(gpointer data)
 {
@@ -652,6 +667,7 @@
 
 		gint major, minor;
 		gtk_libvlc_get_libvlc_version(&major, &minor, NULL);
+		//list_options_add_option(&options, "-vvv"); // verbose mode
 		if(major>=1 || (major == 1 && minor>= 1)){
 			list_options_add_option(&options, "--no-xlib"); // Tell VLC to not use Xlib
 		}
@@ -706,7 +722,7 @@
 		filename = g_build_filename(app->paths.datadir, "tv_channels.xml", NULL);
 		if(g_stat (filename, &file_stat) == 0){
 			if(app->config.logosfiledate < (gint)file_stat.st_mtime){
-				tvchannels_list_synchronize(app, &dbsync, &error);
+				tvchannels_list_synchronize(app, &dbsync, NULL, &synchronize_progress_cb, app, &error);
 				if(error == NULL){
 					app->config.logosfiledate = (gint)file_stat.st_mtime;	
 				}
@@ -1101,17 +1117,17 @@
 				szMode = NULL;
 			}
 
-			if(g_strcasecmp (pChannelInfos->deinterlace_mode, "blend") == 0){
+			if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "blend") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceBlend), TRUE);
-			}else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "bob") == 0){
+			}else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "bob") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceBob), TRUE);
-			}else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "discard") == 0){
+			}else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "discard") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceDiscard), TRUE);
-			}else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "linear") == 0){
+			}else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "linear") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceLinear), TRUE);
-			}else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "mean") == 0){
+			}else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "mean") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceMean), TRUE);
-			}else if(g_strcasecmp (pChannelInfos->deinterlace_mode, "x") == 0){
+			}else if(g_ascii_strcasecmp (pChannelInfos->deinterlace_mode, "x") == 0){
 				gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(app->widget.pMenuDeinterlaceX), TRUE);
 			}
 		}else{
@@ -1131,7 +1147,7 @@
 		if(app->prefs.proxy.proxy_mode == G_PROXY_MODE_MANUAL){
 			gchar* szUser = NULL;
 
-			if(g_strcasecmp ("0", app->prefs.proxy.proxy_type) == 0){
+			if(g_ascii_strcasecmp ("0", app->prefs.proxy.proxy_type) == 0){
 				// Mode HTTP
 				if(app->prefs.proxy.proxy_use_auth){
 					szUser = g_strconcat(app->prefs.proxy.proxy_username, "@", NULL);
@@ -1153,7 +1169,7 @@
 					g_free(text);
 					text = NULL;
 				}	
-			}else if(g_strcasecmp ("1", app->prefs.proxy.proxy_type) == 0){
+			}else if(g_ascii_strcasecmp ("1", app->prefs.proxy.proxy_type) == 0){
 				// Mode SOCK
 				text = g_strdup_printf(":socks=%s:%s", app->prefs.proxy.proxy_server, app->prefs.proxy.proxy_port);
 				list_options_add_option(&options, text);