Package: xawtv Severity: normal I've NMUed xawtv with the attached diff.
-- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.4.27 Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) -- see shy jo
diff --new-file -ur tmp/xawtv-3.94/debian/changelog xawtv-3.94/debian/changelog --- tmp/xawtv-3.94/debian/changelog 2005-08-29 10:18:49.000000000 -0400 +++ xawtv-3.94/debian/changelog 2005-08-29 12:32:44.000000000 -0400 @@ -1,3 +1,20 @@ +xawtv (3.94-1.0) unstable; urgency=low + + * NMU. + * Fix FTBFS with gcc 4.0 with patches from Andreas Jochens. + Closes: #300363, #298171 + * Build depend on libaa1-dev. Closes: #325044 + * Rebuilt with slang2 and libaa. Closes: #317579 + * Add Czech translation of debconf messages, by Miroslav Kure. + Closes: #314790 + * Add Vietnamese translation of debconf messages, by Clytie Siddall. + Closes: #324235 + * Add build dependency on libfs-dev due to X reorg. + * Update includes to work with current libquicktime-dev, which has moved + them to lqt/ + + -- Joey Hess <[EMAIL PROTECTED]> Mon, 29 Aug 2005 10:02:16 -0400 + xawtv (3.94-1) unstable; urgency=low * new release (closes: #191044, #256860). diff --new-file -ur tmp/xawtv-3.94/debian/control xawtv-3.94/debian/control --- tmp/xawtv-3.94/debian/control 2005-08-29 10:18:49.000000000 -0400 +++ xawtv-3.94/debian/control 2005-08-29 11:33:55.000000000 -0400 @@ -1,7 +1,7 @@ Source: xawtv Section: graphics Priority: extra -Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper (>= 4.1.16), xutils, xbase-clients, aalib1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, xlibmesa-gl-dev, libxft2-dev, po-debconf, libpng-dev, libglib1.2-dev +Build-Depends: libjpeg-dev, libncurses5-dev, xlibs-dev (>= 4.0.1), liblircclient-dev, debhelper (>= 4.1.16), xutils, xbase-clients, libaa1-dev, libasound2-dev, libzvbi-dev (>= 0.2.1), libquicktime-dev, libxaw7-dev, xlibmesa-gl-dev, libxft2-dev, po-debconf, libpng-dev, libglib1.2-dev, libfs-dev Maintainer: Gerd Knorr <[EMAIL PROTECTED]> Standards-Version: 3.6.1 diff --new-file -ur tmp/xawtv-3.94/debian/po/cs.po xawtv-3.94/debian/po/cs.po --- tmp/xawtv-3.94/debian/po/cs.po 1969-12-31 19:00:00.000000000 -0500 +++ xawtv-3.94/debian/po/cs.po 2005-08-29 10:12:05.000000000 -0400 @@ -0,0 +1,121 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: xawtv\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-07 13:31+0200\n" +"PO-Revision-Date: 2005-06-18 16:44+0200\n" +"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n" +"Language-Team: Czech <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Description +#: ../xawtv.templates:4 +msgid "Create video4linux (/dev/video*) special files?" +msgstr "Vytvořit speciální soubory pro video4linux (/dev/video*)?" + +#. Description +#: ../xawtv.templates:9 +msgid "scan for TV stations?" +msgstr "Hledat TV stanice?" + +#. Description +#: ../xawtv.templates:9 +msgid "" +"I can do a scan of all channels and put a list of the TV stations I've found " +"into the config file." +msgstr "" +"Mohu prohledat všechny televizní kanály a uložit seznam nalezených " +"televizních stanic do konfiguračního souboru." + +#. Description +#: ../xawtv.templates:9 +msgid "" +"This requires a working bttv driver. If bttv isn't configured correctly I " +"might not find the TV stations." +msgstr "" +"To vyžaduje funkční ovladač bttv. Pokud bttv není nastaven správně, je " +"pravděpodobné, že nenaleznu žádné televizní stanice." + +#. Description +#: ../xawtv.templates:9 +msgid "" +"I'll try to pick up the channel names from videotext. This will work with " +"PAL only." +msgstr "" +"Pokusím se získat názvy kanálů z videotextu, což bude fungovat pouze pro " +"systém PAL." + +#. Choices +#: ../xawtv.templates:21 +msgid "PAL, SECAM, NTSC" +msgstr "PAL, SECAM, NTSC" + +#. Description +#: ../xawtv.templates:22 +msgid "Which TV norm is used in your country?" +msgstr "Která televizní norma se používá ve vaší zemi?" + +#. Description +#: ../xawtv.templates:27 +msgid "Create a default configuration for xawtv?" +msgstr "Vytvořit výchozí konfiguraci xawtv?" + +#. Description +#: ../xawtv.templates:27 +msgid "" +"You can create a system-wide configuration file for xawtv with reasonable " +"default values for the country you live in (which TV norm is used for " +"example)." +msgstr "" +"Můžete vytvořit systémový konfigurační soubor xawtv, ketrý bude obsahovat " +"rozumné hodnoty pro vaši zemi (např. která televizní norma se u vás " +"používá)." + +#. Description +#: ../xawtv.templates:27 +msgid "" +"It is not required to have a global configuration file, but it will be more " +"comfortable for your users if they find a working default configuration." +msgstr "" +"Není nutné mít systémový konfigurační soubor, avšak je to pohodlnější " +"pro vaše uživatele, kteří tak nemusí nic nastavovat." + +#. Choices +#: ../xawtv.templates:38 +msgid "" +"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, " +"europe-east, italy, newzealand, australia, ireland, france, china-bcast" +msgstr "" +"usa-vysílání, usa-kabel, usa-kabel-hrc, japonsko-vysílání, japonsko-kabel, " +"evropa-západ, evropa-východ, itálie, novýzéland, austrálie, irsko, francie, " +"čína-vysílání" + +#. Description +#: ../xawtv.templates:39 +msgid "Which frequency table should be used?" +msgstr "Která tabulka frekvencí se má použít?" + +#. Description +#: ../xawtv.templates:39 +msgid "" +"A frequency table is just a list of TV channel names/numbers and the " +"corresponding broadcast frequencies for these channels. Different regions " +"use different standards here..." +msgstr "" +"Tabulka frekvencí je seznam jmen/čísel televizních kanálů a odpovídajících " +"vysílacích frekvencí. Různé části světa používají různé standardy..." diff --new-file -ur tmp/xawtv-3.94/debian/po/vi.po xawtv-3.94/debian/po/vi.po --- tmp/xawtv-3.94/debian/po/vi.po 1969-12-31 19:00:00.000000000 -0500 +++ xawtv-3.94/debian/po/vi.po 2005-08-29 10:13:02.000000000 -0400 @@ -0,0 +1,98 @@ +# Vietnamese translation for XawTV. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall <[EMAIL PROTECTED]>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: xawtv 3.94-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-10-07 13:31+0200\n" +"PO-Revision-Date: 2005-08-21 17:16+0930\n" +"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n" +"Language-Team: Vietnamese <[EMAIL PROTECTED]>\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: LocFactoryEditor 1.2.2\n" + +#. Description +#: ../xawtv.templates:4 +msgid "Create video4linux (/dev/video*) special files?" +msgstr "Có tạo tập tin video4linux (</dev/video*>) đặc biệt không?" + +#. Description +#: ../xawtv.templates:9 +msgid "scan for TV stations?" +msgstr "Có quét kênh TV chứ?" + +#. Description +#: ../xawtv.templates:9 +msgid "" +"I can do a scan of all channels and put a list of the TV stations I've found " +"into the config file." +msgstr "Trình này có thể quét mọi kênh rồi ghi danh sách các kênh TV đã tìm vào tập tin cấu hình." + +#. Description +#: ../xawtv.templates:9 +msgid "" +"This requires a working bttv driver. If bttv isn't configured correctly I " +"might not find the TV stations." +msgstr "Làm như thế cần thiết trình điều khiển « bttv ». Nếu chưa cấu hình bttv cho đúng thì có lẽ trình này sẽ không tìm kênh TV." + +#. Description +#: ../xawtv.templates:9 +msgid "" +"I'll try to pick up the channel names from videotext. This will work with " +"PAL only." +msgstr "Trình này sẽ cố lấy tên kênh từ videotext (chữ ảnh động). Sẽ hoạt động chỉ với giao thức PAL." + +#. Choices +#: ../xawtv.templates:21 +msgid "PAL, SECAM, NTSC" +msgstr "PAL, SECAM, NTSC" + +#. Description +#: ../xawtv.templates:22 +msgid "Which TV norm is used in your country?" +msgstr "Chỗ bạn có sử dụng tiêu chuẩn TV nào?" + +#. Description +#: ../xawtv.templates:27 +msgid "Create a default configuration for xawtv?" +msgstr "Có tạo cấu hình mặc định cho trình xawtv chứ?" + +#. Description +#: ../xawtv.templates:27 +msgid "" +"You can create a system-wide configuration file for xawtv with reasonable " +"default values for the country you live in (which TV norm is used for " +"example)." +msgstr "Bạn có thể tạo một tập tin cấu hình xawtv cho toàn hệ thống với giá trị mặc định hữu ích cho chỗ bạn (v.d. tiêu chuẩn TV)." + +#. Description +#: ../xawtv.templates:27 +msgid "" +"It is not required to have a global configuration file, but it will be more " +"comfortable for your users if they find a working default configuration." +msgstr "Không cần tập tin cấu hình toàn cục, nhưng nó tiện hơn cho người dùng nếu họ tìm cấu hình hoạt động." + +#. Choices +#: ../xawtv.templates:38 +msgid "" +"us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west, " +"europe-east, italy, newzealand, australia, ireland, france, china-bcast" +msgstr "phát_thanh_Mỹ, cáp_Mỹ, cáp_Mỹ_hrc, phát_thanh_Nhật_bản, cáp_Nhật_bản, Tây_Âu, Đông_Âu, Ý, Niu_Di-lan, Úc, Ái-nhĩ-lan, Pháp, phát_thanh_Quốc_Trung" + +#. Description +#: ../xawtv.templates:39 +msgid "Which frequency table should be used?" +msgstr "Nên dùng bảng tần số nào?" + +#. Description +#: ../xawtv.templates:39 +msgid "" +"A frequency table is just a list of TV channel names/numbers and the " +"corresponding broadcast frequencies for these channels. Different regions " +"use different standards here..." +msgstr "Bảng tần số là danh sách tên/số kênh TV và tần số phát hành tương ứng cho kênh này. Miền khác có dùng tiêu chuẩn khác..." diff --new-file -ur tmp/xawtv-3.94/dist/gcc4.diff xawtv-3.94/dist/gcc4.diff --- tmp/xawtv-3.94/dist/gcc4.diff 1969-12-31 19:00:00.000000000 -0500 +++ xawtv-3.94/dist/gcc4.diff 2005-08-29 12:19:56.000000000 -0400 @@ -0,0 +1,61 @@ +diff -urN tmp/xawtv-3.94/common/channel.c xawtv-3.94/common/channel.c +--- tmp/xawtv-3.94/common/channel.c 2003-03-28 13:22:06.000000000 +0100 ++++ xawtv-3.94/common/channel.c 2005-03-18 19:55:18.725753547 +0100 +@@ -181,6 +181,9 @@ + { -1, NULL, }, + }; + ++extern struct STRTAB booltab[]; ++extern struct STRTAB captab[]; ++ + /* just malloc memory for a new channel ... */ + struct CHANNEL* + add_channel(char *name) +diff -urN tmp/xawtv-3.94/common/channel.h xawtv-3.94/common/channel.h +--- tmp/xawtv-3.94/common/channel.h 2003-02-14 15:14:04.000000000 +0100 ++++ xawtv-3.94/common/channel.h 2005-03-18 19:43:32.462851013 +0100 +@@ -90,8 +90,6 @@ + + /* ----------------------------------------------------------------------- */ + +-extern struct STRTAB booltab[]; +-extern struct STRTAB captab[]; + + int str_to_int(char *str, struct STRTAB *tab); + const char* int_to_str(int n, struct STRTAB *tab); +diff -urN tmp/xawtv-3.94/common/commands.c xawtv-3.94/common/commands.c +--- tmp/xawtv-3.94/common/commands.c 2004-04-19 18:24:05.000000000 +0200 ++++ xawtv-3.94/common/commands.c 2005-03-18 19:55:48.485941906 +0100 +@@ -162,6 +162,9 @@ + + static int keypad_state = -1; + ++extern struct STRTAB booltab[]; ++extern struct STRTAB captab[]; ++ + /* ----------------------------------------------------------------------- */ + + void add_attrs(struct ng_attribute *new) +diff -ur /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/console/fbtv.c xawtv-3.94/console/fbtv.c +--- /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/console/fbtv.c 2004-06-30 08:26:52.000000000 -0400 ++++ xawtv-3.94/console/fbtv.c 2005-08-29 10:22:01.000000000 -0400 +@@ -187,7 +187,7 @@ + + #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB)) + +-static char *snapbase; ++static char *snapbase_fbtv; + static char default_title[128] = "???"; + static char message[128] = ""; + +@@ -634,7 +634,7 @@ + fbdev = optarg; + break; + case 'o': +- snapbase = strdup(optarg); ++ snapbase_fbtv = strdup(optarg); + break; + case 's': + sscanf(optarg,"%dx%d",&ww,&hh); +Only in xawtv-3.94/console: fbtv.c.rej +Only in xawtv-3.94/console: fbtv.cgcc4_fix diff --new-file -ur tmp/xawtv-3.94/dist/libquicktime.diff xawtv-3.94/dist/libquicktime.diff --- tmp/xawtv-3.94/dist/libquicktime.diff 1969-12-31 19:00:00.000000000 -0500 +++ xawtv-3.94/dist/libquicktime.diff 2005-08-29 11:45:21.000000000 -0400 @@ -0,0 +1,32 @@ +diff -ur /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/libng/plugins/read-qt.c xawtv-3.94/libng/plugins/read-qt.c +--- /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/libng/plugins/read-qt.c 2003-02-14 09:14:05.000000000 -0500 ++++ xawtv-3.94/libng/plugins/read-qt.c 2005-08-29 11:43:01.000000000 -0400 +@@ -4,9 +4,9 @@ + #include <stdio.h> + #include <string.h> + #include <pthread.h> +-#include <quicktime/quicktime.h> +-#include <quicktime/colormodels.h> +-#include <quicktime/lqt.h> ++#include <lqt/quicktime.h> ++#include <lqt/colormodels.h> ++#include <lqt/lqt.h> + + #include "grab-ng.h" + +diff -ur /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/libng/plugins/write-qt.c xawtv-3.94/libng/plugins/write-qt.c +--- /home/joey/tmp/tmp/xawtv-3.94/dist/xawtv-3.94/libng/plugins/write-qt.c 2003-02-14 09:14:06.000000000 -0500 ++++ xawtv-3.94/libng/plugins/write-qt.c 2005-08-29 11:43:34.000000000 -0400 +@@ -4,9 +4,9 @@ + #include <stdio.h> + #include <string.h> + #include <pthread.h> +-#include <quicktime/quicktime.h> +-#include <quicktime/colormodels.h> +-#include <quicktime/lqt.h> ++#include <lqt/quicktime.h> ++#include <lqt/colormodels.h> ++#include <lqt/lqt.h> + + #include "grab-ng.h" +
signature.asc
Description: Digital signature
