r8 - in trunk/packages/vorbis-tools/debian: . patches patches.off
Adeodato Simó
adeodato at costa.debian.org
Fri Dec 23 01:26:59 UTC 2005
Author: adeodato
Date: 2005-12-22 03:35:43 +0100 (Thu, 22 Dec 2005)
New Revision: 8
Added:
trunk/packages/vorbis-tools/debian/compat
trunk/packages/vorbis-tools/debian/do-patches.sh
trunk/packages/vorbis-tools/debian/patches.off/
trunk/packages/vorbis-tools/debian/patches.off/for_upstream-update_hu.po.diff
trunk/packages/vorbis-tools/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff
trunk/packages/vorbis-tools/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff
trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff
trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff
trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff
trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff
trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff
trunk/packages/vorbis-tools/debian/patches/no_debian_subdir.diff
trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff
trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff
Removed:
trunk/packages/vorbis-tools/debian/Makefile.am
trunk/packages/vorbis-tools/debian/Makefile.in
trunk/packages/vorbis-tools/debian/patches/play-from-pipe.diff
trunk/packages/vorbis-tools/debian/patches/vorbis-tools-head.diff
Modified:
trunk/packages/vorbis-tools/debian/changelog
trunk/packages/vorbis-tools/debian/control
trunk/packages/vorbis-tools/debian/copyright
trunk/packages/vorbis-tools/debian/rules
trunk/packages/vorbis-tools/debian/vorbis-tools.install
trunk/packages/vorbis-tools/debian/vorbis-tools.manpages
Log:
Commit vorbis-tools 1.1.1-1 packaging from the archive.
Deleted: trunk/packages/vorbis-tools/debian/Makefile.am
===================================================================
--- trunk/packages/vorbis-tools/debian/Makefile.am 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/Makefile.am 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,7 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = changelog control copyright rules vorbis-tools.README.Debian \
- vorbis-tools.examples vorbis-tools.install vorbis-tools.manpages \
- vorbis-tools.mime
Deleted: trunk/packages/vorbis-tools/debian/Makefile.in
===================================================================
--- trunk/packages/vorbis-tools/debian/Makefile.in 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/Makefile.in 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,337 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AO_CFLAGS = @AO_CFLAGS@
-AO_LIBS = @AO_LIBS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-CURL_LIBS = @CURL_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEBUG = @DEBUG@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FLAC_LIBS = @FLAC_LIBS@
-GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-I18N_CFLAGS = @I18N_CFLAGS@
-I18N_LIBS = @I18N_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MANDIR = @MANDIR@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
-OGG123_FLAC_OBJS = @OGG123_FLAC_OBJS@
-OGG123_SPEEX_OBJS = @OGG123_SPEEX_OBJS@
-OGGENC_FLAC_OBJS = @OGGENC_FLAC_OBJS@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-OPT_SUBDIRS = @OPT_SUBDIRS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PROFILE = @PROFILE@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHARE_CFLAGS = @SHARE_CFLAGS@
-SHARE_LIBS = @SHARE_LIBS@
-SHELL = @SHELL@
-SOCKET_LIBS = @SOCKET_LIBS@
-SPEEX_LIBS = @SPEEX_LIBS@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VORBISENC_LIBS = @VORBISENC_LIBS@
-VORBISFILE_LIBS = @VORBISFILE_LIBS@
-VORBIS_CFLAGS = @VORBIS_CFLAGS@
-VORBIS_LIBS = @VORBIS_LIBS@
-XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = changelog control copyright rules vorbis-tools.README.Debian \
- vorbis-tools.install vorbis-tools.manpages vorbis-tools.mime
-
-subdir = debian
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign debian/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man 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-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: trunk/packages/vorbis-tools/debian/changelog
===================================================================
--- trunk/packages/vorbis-tools/debian/changelog 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/changelog 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,3 +1,35 @@
+vorbis-tools (1.1.1-1) unstable; urgency=low
+
+ * New upstream release packaged (closes: #339846).
+
+ * Pull patch from upstream to prevent vorbiscomment from clobbering files
+ when an error happens. (Closes: #287170)
+ [File: upstream_r9935-dont_clobber_file_on_error.diff]
+
+ * Add myself as an uploader, as agreed with Christopher in the past;
+ note it in debian/copyright.
+
+ * Update debian/control:
+
+ + drop unnecessary build-dependencies on bison and devscripts.
+ + build-depend on libcurl3-gnutls-dev instead of libcurl3-dev | libcurl-dev
+ (vorbis-tools is GPL'ed, no SSL exception).
+ + drop version restriction on all build-dependencies, since they'd be all
+ satisfied with stable.
+
+ * Overhaul debian/rules.
+
+ * Make use of debian/patches, putting in separate files the patches applied
+ in previous NMUs (deactivated some of them because they no longer apply
+ and/or are incomplete, until I figure out what to do with them; reopens:
+ #272037, #264365).
+
+ * Update download URL in debian/copyright.
+
+ * Bumped Standards-Version to 3.6.2 (no changes required).
+
+ -- Adeodato Simó <dato at net.com.org.es> Wed, 07 Dec 2005 06:21:02 +0100
+
vorbis-tools (1.0.1-1.5) unstable; urgency=low
* Non-maintainer upload during BSP.
Added: trunk/packages/vorbis-tools/debian/compat
===================================================================
--- trunk/packages/vorbis-tools/debian/compat 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/compat 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1 @@
+5
Modified: trunk/packages/vorbis-tools/debian/control
===================================================================
--- trunk/packages/vorbis-tools/debian/control 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/control 2005-12-22 02:35:43 UTC (rev 8)
@@ -2,13 +2,14 @@
Section: sound
Priority: optional
Maintainer: Christopher L Cheney <ccheney at debian.org>
-Build-Depends: autotools-dev, bison, debhelper (>> 4.0.18), devscripts, libcurl3-dev | libcurl-dev, libao-dev (>> 0.8.4), libogg-dev (>> 1.1.0), liboggflac-dev (>= 1.1.1-3), libspeex-dev, libvorbis-dev (>> 1.0.1)
-Standards-Version: 3.6.1.0
+Uploaders: Adeodato Simó <dato at net.com.org.es>
+Build-Depends: autotools-dev, debhelper, libcurl3-gnutls-dev, libao-dev, libogg-dev, liboggflac-dev, libspeex-dev, libvorbis-dev
+Standards-Version: 3.6.2
Package: vorbis-tools
Architecture: any
Depends: ${shlibs:Depends}
-Description: Several Ogg Vorbis Tools
+Description: several Ogg Vorbis tools
vorbis-tools contains oggenc (an encoder), ogg123 (a playback tool),
ogginfo (displays ogg information), oggdec (decodes ogg files), vcut
- (ogg file splitter), and vorbiscomment (ogg comment editor)
+ (ogg file splitter), and vorbiscomment (ogg comment editor).
Modified: trunk/packages/vorbis-tools/debian/copyright
===================================================================
--- trunk/packages/vorbis-tools/debian/copyright 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/copyright 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,8 +1,13 @@
This package was debianized by Christopher L Cheney <ccheney at debian.org> on
Tue, 31 Oct 2000 16:38:42 -0600.
-It was downloaded from http://www.vorbis.com/download_unix.psp
+Adeodato Simó <dato at net.com.org.es> stepped as a co-maintainer on
+Sat, 19 Nov 2005 12:04:38 +0100.
+It was downloaded from http://www.xiph.org/downloads/:
+
+ URL:<http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz>
+
Upstream Authors: Kenneth Arnold <ogg123 at arnoldnet.net>
Segher Boessenkool <segher at xiph.org>
Stan Seibert <volsung at xiph.org>
Added: trunk/packages/vorbis-tools/debian/do-patches.sh
===================================================================
--- trunk/packages/vorbis-tools/debian/do-patches.sh 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/do-patches.sh 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,60 @@
+#! /bin/sh
+
+# Very simple patching system with uu-encoded patches support.
+# Added per-patch stamp on 2004-11-06.
+# GPLv2.
+# (c) 2004 Adeodato Simó
+
+set -e
+
+export LC_COLLATE=C
+
+dir=`pwd`
+patchesdirs="debian/common/patches debian/patches" # it's ok if they don't exist
+
+case $1 in
+ apply)
+ # Decode uu-encoded patches
+ for uu in $(find $patchesdirs -name '*.uu'); do
+ cd `dirname $uu`
+ uudecode `basename $uu`
+ cd $dir
+ done
+
+ # List of patches
+ patches=$(find $patchesdirs -name '*.diff' | sort)
+
+ # Apply if stamp does not exist
+ for patch in $patches; do
+ if test ! -f $patch-stamp; then
+ echo "APPLYING PATCH: ${patch##*/}"
+ patch -p1 < "$patch"
+ touch $patch-stamp
+ else
+ echo "ALREADY APPLIED: ${patch##*/}"
+ fi
+ done
+
+ ;;
+
+ unapply)
+ # List of applied patches == list of stamps
+ stamps=$(find $patchesdirs -name '*.diff-stamp' | sort -r)
+
+ # Unapply
+ for stamp in $stamps; do
+ patch=`dirname $stamp`/`basename $stamp -stamp`
+ echo "REMOVING PATCH: ${patch##*/}"
+ patch -p1 -R < "$patch"
+ rm -f $stamp
+ done
+
+ # Remove decoded patches
+ for uu in $(find $patchesdirs -name '*.uu'); do
+ rm -f "${uu%%.uu}"
+ done
+ ;;
+
+esac
+
+# vim: sw=4
Added: trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,56 @@
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -733,7 +733,7 @@
+ #: oggenc/encode.c:391
+ #, fuzzy, c-format
+ msgid "\tEncoding [%2dm%.2ds so far] %c "
+-msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
++msgstr "\tCodage [%2dm%.2ds pour l'instant] %c"
+
+ #: oggenc/encode.c:377
+ #, c-format
+@@ -791,7 +791,7 @@
+ " %s%s%s \n"
+ "at average bitrate %d kbps "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "au débit moyen de %d kbps "
+
+@@ -812,7 +812,7 @@
+ " %s%s%s \n"
+ "at approximate bitrate %d kbps (VBR encoding enabled)\n"
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "au débit approximatif de %d kbps (encodage VBR en cours)\n"
+
+@@ -823,7 +823,7 @@
+ " %s%s%s \n"
+ "at quality level %2.2f using constrained VBR "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "au niveau de qualité %2.2f en utilisant un VBR contraint "
+
+@@ -834,7 +834,7 @@
+ " %s%s%s \n"
+ "at quality %2.2f\n"
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "à la qualité %2.2f\n"
+
+@@ -845,7 +845,7 @@
+ " %s%s%s \n"
+ "using bitrate management "
+ msgstr ""
+-"Encodage de %s%s%s \n"
++"Codage de %s%s%s \n"
+ " en %s%s%s \n"
+ "en utilisant la gestion du débit "
+
Added: trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,23 @@
+* Typos in manpages: Closes: #302150.
+--- a/vorbiscomment/vorbiscomment.1
++++ b/vorbiscomment/vorbiscomment.1
+@@ -55,7 +57,7 @@
+ To edit those comments:
+
+ vorbiscomment -l file.ogg > file.txt
+- [edit the comments in file.txt to your statisfaction]
++ [edit the comments in file.txt to your satisfaction]
+ vorbiscomment -w -c file.txt file.ogg newfile.ogg
+
+ To simply add a comment:
+--- a/oggenc/man/oggenc.1
++++ b/oggenc/man/oggenc.1
+@@ -319,7 +319,7 @@
+ .RS
+ oggenc somefile.wav -t "The track title" -a "artist who performed this" -l
+ "name of album" -c
+-"OTHERFIELD=contents of some other field not explictly supported"
++"OTHERFIELD=contents of some other field not explicitly supported"
+ .RE
+ .PP
+
Added: trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_alsa09_in_ogg123.1.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,13 @@
+* Modified alsa to mention alsa09 (although the device might be nowadays
+ alsa, back, since alsa1.0 has been already released). (Closes: #258286)
+--- a/ogg123/ogg123.1
++++ b/ogg123/ogg123.1
+@@ -144,7 +144,7 @@
+ .RE
+ .RE
+
+-.IP alsa
++.IP alsa09
+ Advanced Linux Sound Architecture.
+ .RS
+ Options:
Added: trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-mention_option_-R_in_vorbiscomment.1.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,12 @@
+Closes: #252531.
+--- a/vorbiscomment/vorbiscomment.1
++++ b/vorbiscomment/vorbiscomment.1
+@@ -44,6 +44,8 @@
+ Specify a new tag on the command line. Each tag is given as a single string. The part before the '=' is treated as the tag name and the part after as the value.
+ .IP "-w"
+ Replace comments with the new set given either on the command line with -t or from a file with -c.
++.IP "-R"
++Read and write comments in utf8, rather than converting to the user's character set.
+
+ .\" Examples go here
+ .SH EXAMPLES
Added: trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,13 @@
+* Change input.wav with inputfile, since we accept flac-formated files.
+ Closes: #262509.
+--- a/oggenc/oggenc.c
++++ b/oggenc/oggenc.c
+@@ -375,7 +375,7 @@
+ {
+ fprintf(stdout,
+ _("%s%s\n"
+- "Usage: oggenc [options] input.wav [...]\n"
++ "Usage: oggenc [options] inputfile [...]\n"
+ "\n"
+ "OPTIONS:\n"
+ " General:\n"
Added: trunk/packages/vorbis-tools/debian/patches/no_debian_subdir.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/no_debian_subdir.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/no_debian_subdir.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,31 @@
+My debian/ does not have Makefile.{am,in}.
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -233,7 +233,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+-SUBDIRS = po intl include share debian win32 @OPT_SUBDIRS@
++SUBDIRS = po intl include share win32 @OPT_SUBDIRS@
+ DIST_SUBDIRS = po intl include share debian win32 ogg123 oggenc oggdec ogginfo \
+ vcut vorbiscomment m4
+
+--- a/configure
++++ b/configure
+@@ -28678,7 +28678,7 @@
+
+
+
+- ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in intl/Makefile include/Makefile share/Makefile win32/Makefile oggdec/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile debian/Makefile"
++ ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in intl/Makefile include/Makefile share/Makefile win32/Makefile oggdec/Makefile oggenc/Makefile oggenc/man/Makefile ogg123/Makefile vorbiscomment/Makefile vcut/Makefile ogginfo/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -29277,7 +29277,6 @@
+ "vorbiscomment/Makefile" ) CONFIG_FILES="$CONFIG_FILES vorbiscomment/Makefile" ;;
+ "vcut/Makefile" ) CONFIG_FILES="$CONFIG_FILES vcut/Makefile" ;;
+ "ogginfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES ogginfo/Makefile" ;;
+- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Deleted: trunk/packages/vorbis-tools/debian/patches/play-from-pipe.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/play-from-pipe.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/play-from-pipe.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,60 +0,0 @@
-Index: ogg123/file_transport.c
-===================================================================
---- ogg123/file_transport.c (revision 9695)
-+++ ogg123/file_transport.c (working copy)
-@@ -26,6 +26,7 @@
- typedef struct file_private_t {
- FILE *fp;
- data_source_stats_t stats;
-+ int seekable;
- } file_private_t;
-
-
-@@ -51,6 +52,7 @@
- source->transport = &file_transport;
- source->private = private;
-
-+ private->seekable = 1;
- private->stats.transfer_rate = 0;
- private->stats.bytes_read = 0;
- private->stats.input_buffer_used = 0;
-@@ -60,9 +62,10 @@
- }
-
- /* Open file */
-- if (strcmp(source_string, "-") == 0)
-+ if (strcmp(source_string, "-") == 0) {
- private->fp = stdin;
-- else
-+ private->seekable = 0;
-+ } else
- private->fp = fopen(source_string, "r");
-
- if (private->fp == NULL) {
-@@ -84,6 +87,8 @@
- int items;
- long start;
-
-+ if (!private->seekable) return 0;
-+
- /* Record where we are */
- start = ftell(fp);
-
-@@ -118,6 +123,8 @@
- file_private_t *private = source->private;
- FILE *fp = private->fp;
-
-+ if (!private->seekable) return -1;
-+
- return fseek(fp, offset, whence);
- }
-
-@@ -135,6 +142,8 @@
- file_private_t *private = source->private;
- FILE *fp = private->fp;
-
-+ if (!private->seekable) return -1;
-+
- return ftell(fp);
- }
-
Added: trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r9696-play_from_pipe.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,60 @@
+Index: ogg123/file_transport.c
+===================================================================
+--- a/ogg123/file_transport.c (revision 9695)
++++ b/ogg123/file_transport.c (working copy)
+@@ -26,6 +26,7 @@
+ typedef struct file_private_t {
+ FILE *fp;
+ data_source_stats_t stats;
++ int seekable;
+ } file_private_t;
+
+
+@@ -51,6 +52,7 @@
+ source->transport = &file_transport;
+ source->private = private;
+
++ private->seekable = 1;
+ private->stats.transfer_rate = 0;
+ private->stats.bytes_read = 0;
+ private->stats.input_buffer_used = 0;
+@@ -60,9 +62,10 @@
+ }
+
+ /* Open file */
+- if (strcmp(source_string, "-") == 0)
++ if (strcmp(source_string, "-") == 0) {
+ private->fp = stdin;
+- else
++ private->seekable = 0;
++ } else
+ private->fp = fopen(source_string, "r");
+
+ if (private->fp == NULL) {
+@@ -84,6 +87,8 @@
+ int items;
+ long start;
+
++ if (!private->seekable) return 0;
++
+ /* Record where we are */
+ start = ftell(fp);
+
+@@ -118,6 +123,8 @@
+ file_private_t *private = source->private;
+ FILE *fp = private->fp;
+
++ if (!private->seekable) return -1;
++
+ return fseek(fp, offset, whence);
+ }
+
+@@ -135,6 +142,8 @@
+ file_private_t *private = source->private;
+ FILE *fp = private->fp;
+
++ if (!private->seekable) return -1;
++
+ return ftell(fp);
+ }
+
Added: trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/upstream_r9935-dont_clobber_file_on_error.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,105 @@
+Index: vorbiscomment/vcomment.c
+===================================================================
+--- a/vorbiscomment/vcomment.c (revision 9934)
++++ b/vorbiscomment/vcomment.c (revision 9935)
+@@ -63,7 +63,7 @@
+ void free_param(param_t *param);
+ void parse_options(int argc, char *argv[], param_t *param);
+ void open_files(param_t *p);
+-void close_files(param_t *p);
++void close_files(param_t *p, int output_written);
+
+
+ /**********
+@@ -107,7 +107,7 @@
+ {
+ fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -120,7 +120,7 @@
+ /* done */
+ vcedit_clear(state);
+
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ return 0;
+ }
+@@ -133,7 +133,7 @@
+ {
+ fprintf(stderr, _("Failed to open file as vorbis: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -174,7 +174,7 @@
+ {
+ fprintf(stderr, _("Failed to write comments to output file: %s\n"),
+ vcedit_error(state));
+- close_files(param);
++ close_files(param, 0);
+ free_param(param);
+ vcedit_clear(state);
+ return 1;
+@@ -183,7 +183,7 @@
+ /* done */
+ vcedit_clear(state);
+
+- close_files(param);
++ close_files(param, 1);
+ free_param(param);
+ return 0;
+ }
+@@ -527,23 +527,31 @@
+
+ ***********/
+
+-void close_files(param_t *p)
++void close_files(param_t *p, int output_written)
+ {
+- if (p->in != NULL && p->in != stdin) fclose(p->in);
+- if (p->out != NULL && p->out != stdout) fclose(p->out);
+- if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
++ if (p->in != NULL && p->in != stdin) fclose(p->in);
++ if (p->out != NULL && p->out != stdout) fclose(p->out);
++ if (p->com != NULL && p->com != stdout && p->com != stdin) fclose(p->com);
+
+- if(p->tempoutfile) {
+- /* Some platforms fail to rename a file if the new name already exists,
+- * so we need to remove, then rename. How stupid.
+- */
+- if(rename(p->outfilename, p->infilename)) {
+- if(remove(p->infilename))
+- fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
+- else if(rename(p->outfilename, p->infilename))
+- fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
+- p->infilename);
+- }
++ if(p->tempoutfile) {
++ if(output_written) {
++ /* Some platforms fail to rename a file if the new name already
++ * exists, so we need to remove, then rename. How stupid.
++ */
++ if(rename(p->outfilename, p->infilename)) {
++ if(remove(p->infilename))
++ fprintf(stderr, _("Error removing old file %s\n"), p->infilename);
++ else if(rename(p->outfilename, p->infilename))
++ fprintf(stderr, _("Error renaming %s to %s\n"), p->outfilename,
++ p->infilename);
++ }
+ }
++ else {
++ if(remove(p->outfilename)) {
++ fprintf(stderr, _("Error removing erroneous temporary file %s\n"),
++ p->outfilename);
++ }
++ }
++ }
+ }
+
Deleted: trunk/packages/vorbis-tools/debian/patches/vorbis-tools-head.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/vorbis-tools-head.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches/vorbis-tools-head.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,1330 +0,0 @@
-diff -Nru vorbis-tools-1.0.1/ogg123/ogg123.c vorbis-tools-head/ogg123/ogg123.c
---- vorbis-tools-1.0.1/ogg123/ogg123.c 2003-09-02 14:37:05.000000000 -0500
-+++ vorbis-tools-head/ogg123/ogg123.c 2003-11-27 13:38:29.000000000 -0600
-@@ -14,7 +14,7 @@
- * *
- ********************************************************************
-
-- last mod: $Id: ogg123.c,v 1.70 2003/09/02 19:37:05 volsung Exp $
-+ last mod: $Id: ogg123.c,v 1.71 2003/11/27 19:38:29 volsung Exp $
-
- ********************************************************************/
-
-@@ -108,6 +108,10 @@
- sig_request.last_ctrl_c = now;
- break;
-
-+ case SIGTERM:
-+ sig_request.exit = 1;
-+ break;
-+
- case SIGTSTP:
- sig_request.pause = 1;
- /* buffer_Pause (Options.outputOpts.buffer);
-@@ -381,7 +385,7 @@
- signal (SIGINT, signal_handler);
- signal (SIGTSTP, signal_handler);
- signal (SIGCONT, signal_handler);
--
-+ signal (SIGTERM, signal_handler);
-
- /* Play the files/streams */
- i = 0;
-diff -Nru vorbis-tools-1.0.1/oggdec/oggdec.c vorbis-tools-head/oggdec/oggdec.c
---- vorbis-tools-1.0.1/oggdec/oggdec.c 2003-09-03 02:58:04.000000000 -0500
-+++ vorbis-tools-head/oggdec/oggdec.c 2003-11-18 13:16:18.000000000 -0600
-@@ -32,7 +32,7 @@
- {NULL,0,0,0}
- };
-
--#define VERSIONSTRING "OggDec 1.0\n"
-+#define VERSIONSTRING "OggDec 1.0.1\n"
-
- static int quiet = 0;
- static int bits = 16;
-diff -Nru vorbis-tools-1.0.1/oggenc/man/oggenc.1 vorbis-tools-head/oggenc/man/oggenc.1
---- vorbis-tools-1.0.1/oggenc/man/oggenc.1 2003-09-03 02:58:05.000000000 -0500
-+++ vorbis-tools-head/oggenc/man/oggenc.1 2003-11-25 11:54:50.000000000 -0600
-@@ -149,7 +149,8 @@
- output Ogg Vorbis file.
- .IP "-o output_file, --output=output_file"
- Write the Ogg Vorbis stream to
--.I output_file (only valid if a single input file is specified)
-+.I output_file
-+(only valid if a single input file is specified).
-
- .IP "-n pattern, --names=pattern"
- Produce filenames as this string, with %g, %a, %l, %n, %t, %d replaced by
-diff -Nru vorbis-tools-1.0.1/ogginfo/ogginfo.1 vorbis-tools-head/ogginfo/ogginfo.1
---- vorbis-tools-1.0.1/ogginfo/ogginfo.1 2003-09-03 02:58:05.000000000 -0500
-+++ vorbis-tools-head/ogginfo/ogginfo.1 2003-11-25 11:54:50.000000000 -0600
-@@ -39,7 +39,7 @@
-
- .SH OPTIONS
- .IP -h
--Show a help and usage message
-+Show a help and usage message.
- .IP -q
- Quiet mode. This may be specified multiple times. Doing so once will remove
- the detailed informative messages, twice will remove warnings as well.
-diff -Nru vorbis-tools-1.0.1/ogginfo/ogginfo2.c vorbis-tools-head/ogginfo/ogginfo2.c
---- vorbis-tools-1.0.1/ogginfo/ogginfo2.c 2003-09-10 10:05:09.000000000 -0500
-+++ vorbis-tools-head/ogginfo/ogginfo2.c 2003-11-25 11:02:48.000000000 -0600
-@@ -384,27 +384,28 @@
- static void vorbis_end(stream_processor *stream)
- {
- misc_vorbis_info *inf = stream->data;
-- long minutes, seconds;
-+ long minutes, seconds, milliseconds;
- double bitrate, time;
-
- /* This should be lastgranulepos - startgranulepos, or something like that*/
- time = (double)inf->lastgranulepos / inf->vi.rate;
- minutes = (long)time / 60;
- seconds = (long)time - minutes*60;
-+ milliseconds = (long)((time - minutes*60 - seconds)*1000);
- bitrate = inf->bytes*8 / time / 1000.0;
-
- #ifdef _WIN32
- info(_("Vorbis stream %d:\n"
- "\tTotal data length: %I64d bytes\n"
-- "\tPlayback length: %ldm:%02lds\n"
-+ "\tPlayback length: %ldm:%02ld.%03lds\n"
- "\tAverage bitrate: %f kbps\n"),
-- stream->num,inf->bytes, minutes, seconds, bitrate);
-+ stream->num,inf->bytes, minutes, seconds, milliseconds, bitrate);
- #else
- info(_("Vorbis stream %d:\n"
- "\tTotal data length: %lld bytes\n"
-- "\tPlayback length: %ldm:%02lds\n"
-+ "\tPlayback length: %ldm:%02ld.%03lds\n"
- "\tAverage bitrate: %f kbps\n"),
-- stream->num,inf->bytes, minutes, seconds, bitrate);
-+ stream->num,inf->bytes, minutes, seconds, milliseconds, bitrate);
- #endif
-
- vorbis_comment_clear(&inf->vc);
-@@ -719,8 +720,8 @@
- }
-
- static void usage(void) {
-- printf(_("ogginfo 1.0\n"
-- "(c) 2002 Michael Smith <msmith at xiph.org>\n"
-+ printf(_("ogginfo 1.0.1\n"
-+ "(c) 2003 Michael Smith <msmith at xiph.org>\n"
- "\n"
- "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
- "Flags supported:\n"
-diff -Nru vorbis-tools-1.0.1/win32/oggdec.dsp vorbis-tools-head/win32/oggdec.dsp
---- vorbis-tools-1.0.1/win32/oggdec.dsp 1969-12-31 18:00:00.000000000 -0600
-+++ vorbis-tools-head/win32/oggdec.dsp 2003-11-18 14:34:43.000000000 -0600
-@@ -0,0 +1,111 @@
-+# Microsoft Developer Studio Project File - Name="oggdec" - Package Owner=<4>
-+# Microsoft Developer Studio Generated Build File, Format Version 6.00
-+# ** DO NOT EDIT **
-+
-+# TARGTYPE "Win32 (x86) Console Application" 0x0103
-+
-+CFG=oggdec - Win32 Debug
-+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-+!MESSAGE use the Export Makefile command and run
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggdec.mak".
-+!MESSAGE
-+!MESSAGE You can specify a configuration when running NMAKE
-+!MESSAGE by defining the macro CFG on the command line. For example:
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggdec.mak" CFG="oggdec - Win32 Debug"
-+!MESSAGE
-+!MESSAGE Possible choices for configuration are:
-+!MESSAGE
-+!MESSAGE "oggdec - Win32 Release" (based on "Win32 (x86) Console Application")
-+!MESSAGE "oggdec - Win32 Debug" (based on "Win32 (x86) Console Application")
-+!MESSAGE
-+
-+# Begin Project
-+# PROP AllowPerConfigDependencies 0
-+# PROP Scc_ProjName ""
-+# PROP Scc_LocalPath ""
-+CPP=cl.exe
-+RSC=rc.exe
-+
-+!IF "$(CFG)" == "oggdec - Win32 Release"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 0
-+# PROP BASE Output_Dir "Release"
-+# PROP BASE Intermediate_Dir "Release"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 0
-+# PROP Output_Dir "Release\oggdec\static"
-+# PROP Intermediate_Dir "Release\oggdec\static"
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "NDEBUG"
-+# ADD RSC /l 0x409 /d "NDEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-+# ADD LINK32 ogg_static.lib vorbis_static.lib vorbisenc_static.lib vorbisfile_static.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Release" /libpath:"..\..\vorbis\win32\VorbisFile_Static_Release"
-+
-+!ELSEIF "$(CFG)" == "oggdec - Win32 Debug"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 1
-+# PROP BASE Output_Dir "oggdec___Win32_Debug"
-+# PROP BASE Intermediate_Dir "oggdec___Win32_Debug"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 1
-+# PROP Output_Dir "Debug\oggdec\static"
-+# PROP Intermediate_Dir "Debug\oggdec\static"
-+# PROP Ignore_Export_Lib 0
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "_DEBUG"
-+# ADD RSC /l 0x409 /d "_DEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-+# ADD LINK32 ogg_static_d.lib vorbis_static_d.lib vorbisenc_static_d.lib vorbisfile_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Debug" /libpath:"..\..\vorbis\win32\VorbisFile_Static_Debug"
-+
-+!ENDIF
-+
-+# Begin Target
-+
-+# Name "oggdec - Win32 Release"
-+# Name "oggdec - Win32 Debug"
-+# Begin Group "Source Files"
-+
-+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-+# Begin Source File
-+
-+SOURCE=..\share\getopt.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt1.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggdec\oggdec.c
-+# End Source File
-+# End Group
-+# Begin Group "Header Files"
-+
-+# PROP Default_Filter "h;hpp;hxx;hm;inl"
-+# End Group
-+# Begin Group "Resource Files"
-+
-+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-+# End Group
-+# End Target
-+# End Project
-diff -Nru vorbis-tools-1.0.1/win32/oggenc.dsp vorbis-tools-head/win32/oggenc.dsp
---- vorbis-tools-1.0.1/win32/oggenc.dsp 2002-07-04 04:16:13.000000000 -0500
-+++ vorbis-tools-head/win32/oggenc.dsp 2003-11-18 14:34:43.000000000 -0600
-@@ -1,155 +1,155 @@
--# Microsoft Developer Studio Project File - Name="oggenc" - Package Owner=<4>
--# Microsoft Developer Studio Generated Build File, Format Version 6.00
--# ** DO NOT EDIT **
--
--# TARGTYPE "Win32 (x86) Console Application" 0x0103
--
--CFG=oggenc - Win32 Debug
--!MESSAGE This is not a valid makefile. To build this project using NMAKE,
--!MESSAGE use the Export Makefile command and run
--!MESSAGE
--!MESSAGE NMAKE /f "oggenc.mak".
--!MESSAGE
--!MESSAGE You can specify a configuration when running NMAKE
--!MESSAGE by defining the macro CFG on the command line. For example:
--!MESSAGE
--!MESSAGE NMAKE /f "oggenc.mak" CFG="oggenc - Win32 Debug"
--!MESSAGE
--!MESSAGE Possible choices for configuration are:
--!MESSAGE
--!MESSAGE "oggenc - Win32 Release" (based on "Win32 (x86) Console Application")
--!MESSAGE "oggenc - Win32 Debug" (based on "Win32 (x86) Console Application")
--!MESSAGE
--
--# Begin Project
--# PROP AllowPerConfigDependencies 0
--# PROP Scc_ProjName ""
--# PROP Scc_LocalPath ""
--CPP=cl.exe
--RSC=rc.exe
--
--!IF "$(CFG)" == "oggenc - Win32 Release"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 0
--# PROP BASE Output_Dir "Release"
--# PROP BASE Intermediate_Dir "Release"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 0
--# PROP Output_Dir "Release\oggenc\static"
--# PROP Intermediate_Dir "Release\oggenc\static"
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
--# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
--# SUBTRACT CPP /YX
--# ADD BASE RSC /l 0x409 /d "NDEBUG"
--# ADD RSC /l 0x409 /d "NDEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
--# ADD LINK32 ogg_static.lib vorbis_static.lib vorbisenc_static.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Release"
--
--!ELSEIF "$(CFG)" == "oggenc - Win32 Debug"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 1
--# PROP BASE Output_Dir "oggenc___Win32_Debug"
--# PROP BASE Intermediate_Dir "oggenc___Win32_Debug"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 1
--# PROP Output_Dir "Debug\oggenc\static"
--# PROP Intermediate_Dir "Debug\oggenc\static"
--# PROP Ignore_Export_Lib 0
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
--# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
--# SUBTRACT CPP /YX
--# ADD BASE RSC /l 0x409 /d "_DEBUG"
--# ADD RSC /l 0x409 /d "_DEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
--# ADD LINK32 ogg_static_d.lib vorbis_static_d.lib vorbisenc_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Debug"
--
--!ENDIF
--
--# Begin Target
--
--# Name "oggenc - Win32 Release"
--# Name "oggenc - Win32 Debug"
--# Begin Group "Source Files"
--
--# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
--# Begin Source File
--
--SOURCE=..\oggenc\audio.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\encode.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\getopt.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\getopt1.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\oggenc.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\platform.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\resample.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\utf8.c
--# End Source File
--# End Group
--# Begin Group "Header Files"
--
--# PROP Default_Filter "h;hpp;hxx;hm;inl"
--# Begin Source File
--
--SOURCE=..\oggenc\audio.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\encode.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\include\getopt.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\platform.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\resample.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\include\utf8.h
--# End Source File
--# End Group
--# Begin Group "Resource Files"
--
--# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
--# End Group
--# End Target
--# End Project
-+# Microsoft Developer Studio Project File - Name="oggenc" - Package Owner=<4>
-+# Microsoft Developer Studio Generated Build File, Format Version 6.00
-+# ** DO NOT EDIT **
-+
-+# TARGTYPE "Win32 (x86) Console Application" 0x0103
-+
-+CFG=oggenc - Win32 Debug
-+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-+!MESSAGE use the Export Makefile command and run
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggenc.mak".
-+!MESSAGE
-+!MESSAGE You can specify a configuration when running NMAKE
-+!MESSAGE by defining the macro CFG on the command line. For example:
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggenc.mak" CFG="oggenc - Win32 Debug"
-+!MESSAGE
-+!MESSAGE Possible choices for configuration are:
-+!MESSAGE
-+!MESSAGE "oggenc - Win32 Release" (based on "Win32 (x86) Console Application")
-+!MESSAGE "oggenc - Win32 Debug" (based on "Win32 (x86) Console Application")
-+!MESSAGE
-+
-+# Begin Project
-+# PROP AllowPerConfigDependencies 0
-+# PROP Scc_ProjName ""
-+# PROP Scc_LocalPath ""
-+CPP=cl.exe
-+RSC=rc.exe
-+
-+!IF "$(CFG)" == "oggenc - Win32 Release"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 0
-+# PROP BASE Output_Dir "Release"
-+# PROP BASE Intermediate_Dir "Release"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 0
-+# PROP Output_Dir "Release\oggenc\static"
-+# PROP Intermediate_Dir "Release\oggenc\static"
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "NDEBUG"
-+# ADD RSC /l 0x409 /d "NDEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-+# ADD LINK32 ogg_static.lib vorbis_static.lib vorbisenc_static.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Release"
-+
-+!ELSEIF "$(CFG)" == "oggenc - Win32 Debug"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 1
-+# PROP BASE Output_Dir "oggenc___Win32_Debug"
-+# PROP BASE Intermediate_Dir "oggenc___Win32_Debug"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 1
-+# PROP Output_Dir "Debug\oggenc\static"
-+# PROP Intermediate_Dir "Debug\oggenc\static"
-+# PROP Ignore_Export_Lib 0
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "_DEBUG"
-+# ADD RSC /l 0x409 /d "_DEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-+# ADD LINK32 ogg_static_d.lib vorbis_static_d.lib vorbisenc_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug" /libpath:"..\..\vorbis\win32\VorbisEnc_Static_Debug"
-+
-+!ENDIF
-+
-+# Begin Target
-+
-+# Name "oggenc - Win32 Release"
-+# Name "oggenc - Win32 Debug"
-+# Begin Group "Source Files"
-+
-+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-+# Begin Source File
-+
-+SOURCE=..\oggenc\audio.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\encode.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt1.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\oggenc.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\platform.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\resample.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\utf8.c
-+# End Source File
-+# End Group
-+# Begin Group "Header Files"
-+
-+# PROP Default_Filter "h;hpp;hxx;hm;inl"
-+# Begin Source File
-+
-+SOURCE=..\oggenc\audio.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\encode.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\include\getopt.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\platform.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\resample.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\include\utf8.h
-+# End Source File
-+# End Group
-+# Begin Group "Resource Files"
-+
-+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-+# End Group
-+# End Target
-+# End Project
-diff -Nru vorbis-tools-1.0.1/win32/oggenc_dynamic.dsp vorbis-tools-head/win32/oggenc_dynamic.dsp
---- vorbis-tools-1.0.1/win32/oggenc_dynamic.dsp 2002-07-04 04:16:13.000000000 -0500
-+++ vorbis-tools-head/win32/oggenc_dynamic.dsp 2003-11-18 14:34:43.000000000 -0600
-@@ -1,152 +1,152 @@
--# Microsoft Developer Studio Project File - Name="oggenc_dynamic" - Package Owner=<4>
--# Microsoft Developer Studio Generated Build File, Format Version 6.00
--# ** DO NOT EDIT **
--
--# TARGTYPE "Win32 (x86) Console Application" 0x0103
--
--CFG=oggenc_dynamic - Win32 Debug
--!MESSAGE This is not a valid makefile. To build this project using NMAKE,
--!MESSAGE use the Export Makefile command and run
--!MESSAGE
--!MESSAGE NMAKE /f "oggenc_dynamic.mak".
--!MESSAGE
--!MESSAGE You can specify a configuration when running NMAKE
--!MESSAGE by defining the macro CFG on the command line. For example:
--!MESSAGE
--!MESSAGE NMAKE /f "oggenc_dynamic.mak" CFG="oggenc_dynamic - Win32 Debug"
--!MESSAGE
--!MESSAGE Possible choices for configuration are:
--!MESSAGE
--!MESSAGE "oggenc_dynamic - Win32 Release" (based on "Win32 (x86) Console Application")
--!MESSAGE "oggenc_dynamic - Win32 Debug" (based on "Win32 (x86) Console Application")
--!MESSAGE
--
--# Begin Project
--# PROP AllowPerConfigDependencies 0
--# PROP Scc_ProjName ""
--# PROP Scc_LocalPath ""
--CPP=cl.exe
--RSC=rc.exe
--
--!IF "$(CFG)" == "oggenc_dynamic - Win32 Release"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 0
--# PROP BASE Output_Dir "oggenc_dynamic___Win32_Release"
--# PROP BASE Intermediate_Dir "oggenc_dynamic___Win32_Release"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 0
--# PROP Output_Dir "Release\oggenc\dynamic"
--# PROP Intermediate_Dir "Release\oggenc\dynamic"
--# PROP Ignore_Export_Lib 0
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
--# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
--# SUBTRACT CPP /YX
--# ADD BASE RSC /l 0x409 /d "NDEBUG"
--# ADD RSC /l 0x409 /d "NDEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
--# ADD LINK32 ogg.lib vorbis.lib vorbisenc.lib /nologo /subsystem:console /machine:I386 /out:"Release\oggenc\dynamic/oggenc.exe" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:"..\..\vorbis\win32\Vorbis_Dynamic_Release" /libpath:"..\..\vorbis\win32\VorbisEnc_Dynamic_Release"
--
--!ELSEIF "$(CFG)" == "oggenc_dynamic - Win32 Debug"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 1
--# PROP BASE Output_Dir "oggenc_dynamic___Win32_Debug"
--# PROP BASE Intermediate_Dir "oggenc_dynamic___Win32_Debug"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 1
--# PROP Output_Dir "Debug\oggenc\dynamic"
--# PROP Intermediate_Dir "Debug\oggenc\dynamic"
--# PROP Ignore_Export_Lib 0
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
--# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
--# SUBTRACT CPP /YX
--# ADD BASE RSC /l 0x409 /d "_DEBUG"
--# ADD RSC /l 0x409 /d "_DEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
--# ADD LINK32 ogg_d.lib vorbis_d.lib vorbisenc_d.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug\oggenc\dynamic/oggenc.exe" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Dynamic_Debug" /libpath:"..\..\vorbis\win32\VorbisEnc_Dynamic_Debug"
--
--!ENDIF
--
--# Begin Target
--
--# Name "oggenc_dynamic - Win32 Release"
--# Name "oggenc_dynamic - Win32 Debug"
--# Begin Group "Source Files"
--
--# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
--# Begin Source File
--
--SOURCE=..\oggenc\audio.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\encode.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\getopt.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\getopt1.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\oggenc.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\platform.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\resample.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\utf8.c
--# End Source File
--# End Group
--# Begin Group "Header Files"
--
--# PROP Default_Filter "h;hpp;hxx;hm;inl"
--# Begin Source File
--
--SOURCE=..\oggenc\audio.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\encode.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\include\getopt.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\oggenc\platform.h
--# End Source File
--# Begin Source File
--
--SOURCE=..\include\utf8.h
--# End Source File
--# End Group
--# Begin Group "Resource Files"
--
--# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
--# End Group
--# End Target
--# End Project
-+# Microsoft Developer Studio Project File - Name="oggenc_dynamic" - Package Owner=<4>
-+# Microsoft Developer Studio Generated Build File, Format Version 6.00
-+# ** DO NOT EDIT **
-+
-+# TARGTYPE "Win32 (x86) Console Application" 0x0103
-+
-+CFG=oggenc_dynamic - Win32 Debug
-+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-+!MESSAGE use the Export Makefile command and run
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggenc_dynamic.mak".
-+!MESSAGE
-+!MESSAGE You can specify a configuration when running NMAKE
-+!MESSAGE by defining the macro CFG on the command line. For example:
-+!MESSAGE
-+!MESSAGE NMAKE /f "oggenc_dynamic.mak" CFG="oggenc_dynamic - Win32 Debug"
-+!MESSAGE
-+!MESSAGE Possible choices for configuration are:
-+!MESSAGE
-+!MESSAGE "oggenc_dynamic - Win32 Release" (based on "Win32 (x86) Console Application")
-+!MESSAGE "oggenc_dynamic - Win32 Debug" (based on "Win32 (x86) Console Application")
-+!MESSAGE
-+
-+# Begin Project
-+# PROP AllowPerConfigDependencies 0
-+# PROP Scc_ProjName ""
-+# PROP Scc_LocalPath ""
-+CPP=cl.exe
-+RSC=rc.exe
-+
-+!IF "$(CFG)" == "oggenc_dynamic - Win32 Release"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 0
-+# PROP BASE Output_Dir "oggenc_dynamic___Win32_Release"
-+# PROP BASE Intermediate_Dir "oggenc_dynamic___Win32_Release"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 0
-+# PROP Output_Dir "Release\oggenc\dynamic"
-+# PROP Intermediate_Dir "Release\oggenc\dynamic"
-+# PROP Ignore_Export_Lib 0
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "NDEBUG"
-+# ADD RSC /l 0x409 /d "NDEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-+# ADD LINK32 ogg.lib vorbis.lib vorbisenc.lib /nologo /subsystem:console /machine:I386 /out:"Release\oggenc\dynamic/oggenc.exe" /libpath:"..\..\ogg\win32\Dynamic_Release" /libpath:"..\..\vorbis\win32\Vorbis_Dynamic_Release" /libpath:"..\..\vorbis\win32\VorbisEnc_Dynamic_Release"
-+
-+!ELSEIF "$(CFG)" == "oggenc_dynamic - Win32 Debug"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 1
-+# PROP BASE Output_Dir "oggenc_dynamic___Win32_Debug"
-+# PROP BASE Intermediate_Dir "oggenc_dynamic___Win32_Debug"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 1
-+# PROP Output_Dir "Debug\oggenc\dynamic"
-+# PROP Intermediate_Dir "Debug\oggenc\dynamic"
-+# PROP Ignore_Export_Lib 0
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "_DEBUG"
-+# ADD RSC /l 0x409 /d "_DEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-+# ADD LINK32 ogg_d.lib vorbis_d.lib vorbisenc_d.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug\oggenc\dynamic/oggenc.exe" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Dynamic_Debug" /libpath:"..\..\vorbis\win32\VorbisEnc_Dynamic_Debug"
-+
-+!ENDIF
-+
-+# Begin Target
-+
-+# Name "oggenc_dynamic - Win32 Release"
-+# Name "oggenc_dynamic - Win32 Debug"
-+# Begin Group "Source Files"
-+
-+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-+# Begin Source File
-+
-+SOURCE=..\oggenc\audio.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\encode.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt1.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\oggenc.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\platform.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\resample.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\utf8.c
-+# End Source File
-+# End Group
-+# Begin Group "Header Files"
-+
-+# PROP Default_Filter "h;hpp;hxx;hm;inl"
-+# Begin Source File
-+
-+SOURCE=..\oggenc\audio.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\encode.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\include\getopt.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\oggenc\platform.h
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\include\utf8.h
-+# End Source File
-+# End Group
-+# Begin Group "Resource Files"
-+
-+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-+# End Group
-+# End Target
-+# End Project
-diff -Nru vorbis-tools-1.0.1/win32/tools.dsw vorbis-tools-head/win32/tools.dsw
---- vorbis-tools-1.0.1/win32/tools.dsw 2002-07-04 04:16:13.000000000 -0500
-+++ vorbis-tools-head/win32/tools.dsw 2003-11-18 14:34:43.000000000 -0600
-@@ -1,104 +1,119 @@
--Microsoft Developer Studio Workspace File, Format Version 6.00
--# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
--
--###############################################################################
--
--Project: "oggenc"=".\oggenc.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
--}}}
--
--###############################################################################
--
--Project: "oggenc_dynamic"=".\oggenc_dynamic.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
--}}}
--
--###############################################################################
--
--Project: "ogginfo"=".\ogginfo.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
--}}}
--
--###############################################################################
--
--Project: "tools"=".\tools.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
-- Begin Project Dependency
-- Project_Dep_Name oggenc
-- End Project Dependency
-- Begin Project Dependency
-- Project_Dep_Name oggenc_dynamic
-- End Project Dependency
-- Begin Project Dependency
-- Project_Dep_Name ogginfo
-- End Project Dependency
-- Begin Project Dependency
-- Project_Dep_Name vcut
-- End Project Dependency
-- Begin Project Dependency
-- Project_Dep_Name vorbiscomment
-- End Project Dependency
--}}}
--
--###############################################################################
--
--Project: "vcut"=".\vcut.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
--}}}
--
--###############################################################################
--
--Project: "vorbiscomment"=".\vorbiscomment.dsp" - Package Owner=<4>
--
--Package=<5>
--{{{
--}}}
--
--Package=<4>
--{{{
--}}}
--
--###############################################################################
--
--Global:
--
--Package=<5>
--{{{
--}}}
--
--Package=<3>
--{{{
--}}}
--
--###############################################################################
--
-+Microsoft Developer Studio Workspace File, Format Version 6.00
-+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-+
-+###############################################################################
-+
-+Project: "oggdec"=".\oggdec.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Project: "oggenc"=".\oggenc.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Project: "oggenc_dynamic"=".\oggenc_dynamic.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Project: "ogginfo"=".\ogginfo.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Project: "tools"=".\tools.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+ Begin Project Dependency
-+ Project_Dep_Name oggenc
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name oggenc_dynamic
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name ogginfo
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name vcut
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name vorbiscomment
-+ End Project Dependency
-+ Begin Project Dependency
-+ Project_Dep_Name oggdec
-+ End Project Dependency
-+}}}
-+
-+###############################################################################
-+
-+Project: "vcut"=".\vcut.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Project: "vorbiscomment"=".\vorbiscomment.dsp" - Package Owner=<4>
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<4>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-+Global:
-+
-+Package=<5>
-+{{{
-+}}}
-+
-+Package=<3>
-+{{{
-+}}}
-+
-+###############################################################################
-+
-Binary files vorbis-tools-1.0.1/win32/tools.opt and vorbis-tools-head/win32/tools.opt differ
-diff -Nru vorbis-tools-1.0.1/win32/vorbiscomment.dsp vorbis-tools-head/win32/vorbiscomment.dsp
---- vorbis-tools-1.0.1/win32/vorbiscomment.dsp 2002-07-04 04:16:13.000000000 -0500
-+++ vorbis-tools-head/win32/vorbiscomment.dsp 2003-11-18 13:51:30.000000000 -0600
-@@ -1,122 +1,122 @@
--# Microsoft Developer Studio Project File - Name="vorbiscomment" - Package Owner=<4>
--# Microsoft Developer Studio Generated Build File, Format Version 6.00
--# ** DO NOT EDIT **
--
--# TARGTYPE "Win32 (x86) Console Application" 0x0103
--
--CFG=vorbiscomment - Win32 Debug
--!MESSAGE This is not a valid makefile. To build this project using NMAKE,
--!MESSAGE use the Export Makefile command and run
--!MESSAGE
--!MESSAGE NMAKE /f "vorbiscomment.mak".
--!MESSAGE
--!MESSAGE You can specify a configuration when running NMAKE
--!MESSAGE by defining the macro CFG on the command line. For example:
--!MESSAGE
--!MESSAGE NMAKE /f "vorbiscomment.mak" CFG="vorbiscomment - Win32 Debug"
--!MESSAGE
--!MESSAGE Possible choices for configuration are:
--!MESSAGE
--!MESSAGE "vorbiscomment - Win32 Release" (based on "Win32 (x86) Console Application")
--!MESSAGE "vorbiscomment - Win32 Debug" (based on "Win32 (x86) Console Application")
--!MESSAGE
--
--# Begin Project
--# PROP AllowPerConfigDependencies 0
--# PROP Scc_ProjName ""
--# PROP Scc_LocalPath ""
--CPP=cl.exe
--RSC=rc.exe
--
--!IF "$(CFG)" == "vorbiscomment - Win32 Release"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 0
--# PROP BASE Output_Dir "vorbiscomment___Win32_Release"
--# PROP BASE Intermediate_Dir "vorbiscomment___Win32_Release"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 0
--# PROP Output_Dir "Release\vorbiscomment\static"
--# PROP Intermediate_Dir "Release\vorbiscomment\static"
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
--# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
--# ADD BASE RSC /l 0x409 /d "NDEBUG"
--# ADD RSC /l 0x409 /d "NDEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
--# ADD LINK32 ogg_static.lib vorbis_static.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release"
--
--!ELSEIF "$(CFG)" == "vorbiscomment - Win32 Debug"
--
--# PROP BASE Use_MFC 0
--# PROP BASE Use_Debug_Libraries 1
--# PROP BASE Output_Dir "vorbiscomment___Win32_Debug"
--# PROP BASE Intermediate_Dir "vorbiscomment___Win32_Debug"
--# PROP BASE Target_Dir ""
--# PROP Use_MFC 0
--# PROP Use_Debug_Libraries 1
--# PROP Output_Dir "Debug\vorbiscomment\static"
--# PROP Intermediate_Dir "Debug\vorbiscomment\static"
--# PROP Ignore_Export_Lib 0
--# PROP Target_Dir ""
--# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
--# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
--# SUBTRACT CPP /YX
--# ADD BASE RSC /l 0x409 /d "_DEBUG"
--# ADD RSC /l 0x409 /d "_DEBUG"
--BSC32=bscmake.exe
--# ADD BASE BSC32 /nologo
--# ADD BSC32 /nologo
--LINK32=link.exe
--# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
--# ADD LINK32 ogg_static_d.lib vorbis_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug"
--
--!ENDIF
--
--# Begin Target
--
--# Name "vorbiscomment - Win32 Release"
--# Name "vorbiscomment - Win32 Debug"
--# Begin Group "Source Files"
--
--# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
--# Begin Source File
--
--SOURCE=..\share\getopt.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\getopt1.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\share\utf8.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\vorbiscomment\vcedit.c
--# End Source File
--# Begin Source File
--
--SOURCE=..\vorbiscomment\vcomment.c
--# End Source File
--# End Group
--# Begin Group "Header Files"
--
--# PROP Default_Filter "h;hpp;hxx;hm;inl"
--# Begin Source File
--
--SOURCE=..\vorbiscomment\vcedit.h
--# End Source File
--# End Group
--# Begin Group "Resource Files"
--
--# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
--# End Group
--# End Target
--# End Project
-+# Microsoft Developer Studio Project File - Name="vorbiscomment" - Package Owner=<4>
-+# Microsoft Developer Studio Generated Build File, Format Version 6.00
-+# ** DO NOT EDIT **
-+
-+# TARGTYPE "Win32 (x86) Console Application" 0x0103
-+
-+CFG=vorbiscomment - Win32 Debug
-+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-+!MESSAGE use the Export Makefile command and run
-+!MESSAGE
-+!MESSAGE NMAKE /f "vorbiscomment.mak".
-+!MESSAGE
-+!MESSAGE You can specify a configuration when running NMAKE
-+!MESSAGE by defining the macro CFG on the command line. For example:
-+!MESSAGE
-+!MESSAGE NMAKE /f "vorbiscomment.mak" CFG="vorbiscomment - Win32 Debug"
-+!MESSAGE
-+!MESSAGE Possible choices for configuration are:
-+!MESSAGE
-+!MESSAGE "vorbiscomment - Win32 Release" (based on "Win32 (x86) Console Application")
-+!MESSAGE "vorbiscomment - Win32 Debug" (based on "Win32 (x86) Console Application")
-+!MESSAGE
-+
-+# Begin Project
-+# PROP AllowPerConfigDependencies 0
-+# PROP Scc_ProjName ""
-+# PROP Scc_LocalPath ""
-+CPP=cl.exe
-+RSC=rc.exe
-+
-+!IF "$(CFG)" == "vorbiscomment - Win32 Release"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 0
-+# PROP BASE Output_Dir "vorbiscomment___Win32_Release"
-+# PROP BASE Intermediate_Dir "vorbiscomment___Win32_Release"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 0
-+# PROP Output_Dir "Release\vorbiscomment\static"
-+# PROP Intermediate_Dir "Release\vorbiscomment\static"
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D VERSION=\"1.0.1\" /YX /FD /c
-+# ADD BASE RSC /l 0x409 /d "NDEBUG"
-+# ADD RSC /l 0x409 /d "NDEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-+# ADD LINK32 ogg_static.lib vorbis_static.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ogg\win32\Static_Release" /libpath:"..\..\vorbis\win32\Vorbis_Static_Release"
-+
-+!ELSEIF "$(CFG)" == "vorbiscomment - Win32 Debug"
-+
-+# PROP BASE Use_MFC 0
-+# PROP BASE Use_Debug_Libraries 1
-+# PROP BASE Output_Dir "vorbiscomment___Win32_Debug"
-+# PROP BASE Intermediate_Dir "vorbiscomment___Win32_Debug"
-+# PROP BASE Target_Dir ""
-+# PROP Use_MFC 0
-+# PROP Use_Debug_Libraries 1
-+# PROP Output_Dir "Debug\vorbiscomment\static"
-+# PROP Intermediate_Dir "Debug\vorbiscomment\static"
-+# PROP Ignore_Export_Lib 0
-+# PROP Target_Dir ""
-+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\..\ogg\include" /I "..\..\vorbis\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D VERSION=\"1.0.1\" /FR /FD /GZ /c
-+# SUBTRACT CPP /YX
-+# ADD BASE RSC /l 0x409 /d "_DEBUG"
-+# ADD RSC /l 0x409 /d "_DEBUG"
-+BSC32=bscmake.exe
-+# ADD BASE BSC32 /nologo
-+# ADD BSC32 /nologo
-+LINK32=link.exe
-+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-+# ADD LINK32 ogg_static_d.lib vorbis_static_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ogg\win32\Static_Debug" /libpath:"..\..\vorbis\win32\Vorbis_Static_Debug"
-+
-+!ENDIF
-+
-+# Begin Target
-+
-+# Name "vorbiscomment - Win32 Release"
-+# Name "vorbiscomment - Win32 Debug"
-+# Begin Group "Source Files"
-+
-+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-+# Begin Source File
-+
-+SOURCE=..\share\getopt.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\getopt1.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\share\utf8.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\vorbiscomment\vcedit.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=..\vorbiscomment\vcomment.c
-+# End Source File
-+# End Group
-+# Begin Group "Header Files"
-+
-+# PROP Default_Filter "h;hpp;hxx;hm;inl"
-+# Begin Source File
-+
-+SOURCE=..\vorbiscomment\vcedit.h
-+# End Source File
-+# End Group
-+# Begin Group "Resource Files"
-+
-+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-+# End Group
-+# End Target
-+# End Project
Added: trunk/packages/vorbis-tools/debian/patches.off/for_upstream-update_hu.po.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches.off/for_upstream-update_hu.po.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches.off/for_upstream-update_hu.po.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,1968 @@
+* Updated translation hu.po: Closes: #272037.
+--- vorbis-tools-1.0.1.orig/po/hu.po
++++ vorbis-tools-1.0.1/po/hu.po
+@@ -1,98 +1,99 @@
+ # Hungarian translate of the GNU vorbis-tools.
+ # Copyright (C) 2002 Free Software Foundation, Inc.
+-# Gábor István <stive at mezobereny.hu>, 2002.
++# Gábor István <stive at mezobereny.hu>, 2002.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: vorbis-tools-0.99.1.3.1\n"
+-"Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2003-12-10 21:49-0600\n"
+-"PO-Revision-Date: 2002-08-05 11:38GMT\n"
++"Project-Id-Version: vorbis-tools 1.0\n"
++"POT-Creation-Date: 2002-07-19 22:30+1000\n"
++"PO-Revision-Date: 2004-05-07 11:38GMT\n"
+ "Last-Translator: Gábor István <stive at mezobereny.hu>\n"
+ "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: KBabel 0.9.5\n"
+
+-#: ogg123/buffer.c:114
++#: ogg123/buffer.c:111
+ msgid "Error: Out of memory in malloc_action().\n"
+-msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n"
++msgstr "Hiba: Elfogyott a memória a malloc_action()-ban.\n"
+
+-#: ogg123/buffer.c:347
++#: ogg123/buffer.c:344
+ msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
+ msgstr "Hiba: Nem lehet lefoglalni memóriát malloc_buffer_stats()-ban\n"
+
+-#: ogg123/callbacks.c:71
++#: ogg123/buffer.c:363
++msgid "malloc"
++msgstr "malloc"
++
++#: ogg123/callbacks.c:70
+ msgid "Error: Device not available.\n"
+ msgstr "Hiba: Eszköz nem áll rendelkezésre.\n"
+
+-#: ogg123/callbacks.c:74
++#: ogg123/callbacks.c:73
+ #, c-format
+ msgid "Error: %s requires an output filename to be specified with -f.\n"
+ msgstr "Hiba: %s-nek szükséges egy kimeneti fájlnevet meghatározni a -f el.\n"
+
+-#: ogg123/callbacks.c:77
++#: ogg123/callbacks.c:76
+ #, c-format
+ msgid "Error: Unsupported option value to %s device.\n"
+-msgstr "Hiba:Nem támogatott opció a %s eszközön.\n"
++msgstr "Hiba: Nem támogatott opcióérték a %s eszköznek.\n"
+
+-#: ogg123/callbacks.c:81
++#: ogg123/callbacks.c:80
+ #, c-format
+ msgid "Error: Cannot open device %s.\n"
+ msgstr "Hiba: Nem lehet megnyitni a %s eszközt.\n"
+
+-#: ogg123/callbacks.c:85
++#: ogg123/callbacks.c:84
+ #, c-format
+ msgid "Error: Device %s failure.\n"
+ msgstr "Hiba: %s eszköz hibás.\n"
+
+-#: ogg123/callbacks.c:88
++#: ogg123/callbacks.c:87
+ #, c-format
+ msgid "Error: An output file cannot be given for %s device.\n"
+ msgstr "Hiba: A kimeneti fájlt nem lehet átadni a %s eszköznek.\n"
+
+-#: ogg123/callbacks.c:91
++#: ogg123/callbacks.c:90
+ #, c-format
+ msgid "Error: Cannot open file %s for writing.\n"
+ msgstr "Hiba: A %s fájlt nem lehet megnyitni írásra.\n"
+
+-#: ogg123/callbacks.c:95
++#: ogg123/callbacks.c:94
+ #, c-format
+ msgid "Error: File %s already exists.\n"
+ msgstr "Hiba: A %s fájl már létezik.\n"
+
+-#: ogg123/callbacks.c:98
++#: ogg123/callbacks.c:97
+ #, c-format
+ msgid "Error: This error should never happen (%d). Panic!\n"
+-msgstr "Hiba: Ez a hiba soha nem történhet meg(%d). Baj van!\n"
++msgstr "Hiba: Ez a hiba soha nem történhet meg (%d). Baj van!\n"
+
+-#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
++#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+ msgid "Error: Out of memory in new_audio_reopen_arg().\n"
+-msgstr "Hiba: Elfogyott a memória a new_audio_reopen_arg() ban.\n"
++msgstr "Hiba: Elfogyott a memória a new_audio_reopen_arg()-ban.\n"
+
+-#: ogg123/callbacks.c:170
++#: ogg123/callbacks.c:169
+ msgid "Error: Out of memory in new_print_statistics_arg().\n"
+-msgstr "Hiba: Elfogyott a memória a new_print_statistics_arg() ban .\n"
++msgstr "Hiba: Elfogyott a memória a new_print_statistics_arg()-ban .\n"
+
+-#: ogg123/callbacks.c:229
++#: ogg123/callbacks.c:228
+ msgid "Error: Out of memory in new_status_message_arg().\n"
+-msgstr "Hiba: Elfogyott a memória a new_status_message_arg() ban .\n"
++msgstr "Hiba: Elfogyott a memória a new_status_message_arg()-ban .\n"
+
+-#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+-#: ogg123/callbacks.c:350
++#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
++#: ogg123/callbacks.c:349
+ msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
+-msgstr ""
+-"Hiba: Elfogyott a memória a decoder_buffered_metadata_callback() ban .\n"
++msgstr "Hiba: Elfogyott a memória a decoder_buffered_metadata_callback()-ban .\n"
+
+ #: ogg123/cfgfile_options.c:51
+ msgid "System error"
+-msgstr "Rendszer hiba"
++msgstr "Rendszerhiba"
+
+ #: ogg123/cfgfile_options.c:54
+ #, c-format
+ msgid "=== Parse error: %s on line %d of %s (%s)\n"
+-msgstr "=== Értelmezési hiba: %s sorban a %d ban %s (%s)\n"
++msgstr "=== Értelmezési hiba: %s a(z) %d. sorban %s (%s)\n"
+
+ #. Column headers
+ #. Name
+@@ -121,7 +122,7 @@
+
+ #: ogg123/cfgfile_options.c:168
+ msgid "bool"
+-msgstr "bool"
++msgstr "logikai"
+
+ #: ogg123/cfgfile_options.c:171
+ msgid "char"
+@@ -141,7 +142,7 @@
+
+ #: ogg123/cfgfile_options.c:183
+ msgid "double"
+-msgstr "dupla"
++msgstr "duplapontos"
+
+ #: ogg123/cfgfile_options.c:186
+ msgid "other"
+@@ -149,11 +150,11 @@
+
+ #: ogg123/cfgfile_options.c:192
+ msgid "(NULL)"
+-msgstr "(NULLA)"
++msgstr "(NULL)"
+
+-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+-#: oggenc/oggenc.c:531 oggenc/oggenc.c:536 oggenc/oggenc.c:541
+-#: oggenc/oggenc.c:546
++#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
++#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
++#: oggenc/oggenc.c:531
+ msgid "(none)"
+ msgstr "(nincs)"
+
+@@ -181,96 +182,85 @@
+ msgid "Unknown error"
+ msgstr "Ismeretlen hiba"
+
+-#: ogg123/cmdline_options.c:86
+-#, fuzzy
++#: ogg123/cmdline_options.c:74
+ msgid "Internal error parsing command line options.\n"
+-msgstr "Belsõ hiba a parancs sori opció elemzése során\n"
++msgstr "Belsõ hiba a parancssori opciók elemzése során\n"
+
+-#: ogg123/cmdline_options.c:93
++#: ogg123/cmdline_options.c:81
+ #, c-format
+ msgid "Input buffer size smaller than minimum size of %dkB."
+-msgstr "Bevitel puffer mérete kisebb méret mint %dkB."
++msgstr "Bevitel puffer mérete kisebb, mint %d kB."
+
+-#: ogg123/cmdline_options.c:105
++#: ogg123/cmdline_options.c:93
+ #, c-format
+ msgid ""
+ "=== Error \"%s\" while parsing config option from command line.\n"
+ "=== Option was: %s\n"
+ msgstr ""
+-"===Hiba \"%s\" a parancs sori opciók értelmezése közben\n"
+-"===Opció %s volt\n"
++"===Hiba \"%s\" a parancssori opciók értelmezése közben.\n"
++"===A hibás opció: %s\n"
+
+ #. not using the status interface here
+-#: ogg123/cmdline_options.c:112
++#: ogg123/cmdline_options.c:100
+ msgid "Available options:\n"
+ msgstr "Rendelkezésre álló opciók:\n"
+
+-#: ogg123/cmdline_options.c:121
++#: ogg123/cmdline_options.c:109
+ #, c-format
+ msgid "=== No such device %s.\n"
+-msgstr "=== Nem ilyen eszköz: %s.\n"
++msgstr "=== Nincs ilyen eszköz: %s.\n"
+
+-#: ogg123/cmdline_options.c:141
++#: ogg123/cmdline_options.c:129
+ #, c-format
+ msgid "=== Driver %s is not a file output driver.\n"
+ msgstr "=== Meghajtó %s nem kimeneti fájlba irányítható meghajtó.\n"
+
+-#: ogg123/cmdline_options.c:146
++#: ogg123/cmdline_options.c:134
+ msgid "=== Cannot specify output file without specifying a driver.\n"
+-msgstr ""
+-"=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n"
++msgstr "=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n"
+
+-#: ogg123/cmdline_options.c:165
++#: ogg123/cmdline_options.c:149
+ #, c-format
+ msgid "=== Incorrect option format: %s.\n"
+ msgstr "==== Érvénytelen kimeneti formátum: %s.\n"
+
+-#: ogg123/cmdline_options.c:180
++#: ogg123/cmdline_options.c:164
+ msgid "--- Prebuffer value invalid. Range is 0-100.\n"
+-msgstr "--- Elõbuffer érték érvénytelen. Érvényes tartomány: 0-100.\n"
++msgstr "--- Elõbuffer értéke érvénytelen. Érvényes tartomány: 0-100.\n"
+
+-#: ogg123/cmdline_options.c:195
++#: ogg123/cmdline_options.c:179
+ #, c-format
+ msgid "ogg123 from %s %s\n"
+ msgstr "ogg123 a %s %s -ból\n"
+
+-#: ogg123/cmdline_options.c:202
++#: ogg123/cmdline_options.c:186
+ msgid "--- Cannot play every 0th chunk!\n"
+ msgstr "--- Nem lehet lejátszani a 0-dik csonkokat!\n"
+
+-#: ogg123/cmdline_options.c:210
++#: ogg123/cmdline_options.c:194
+ msgid ""
+ "--- Cannot play every chunk 0 times.\n"
+ "--- To do a test decode, use the null output driver.\n"
+ msgstr ""
+-"--- Nem lehet lejátszani a nulla csonkokat.\n"
+-"--- A kódólás kipróbálásához használja a null kimeneti meghatjót.\n"
++"--- Nem lehet lejátszani minden csonkot 0-szor.\n"
++"--- A dekódólás kipróbálásához használja a null kimeneti meghajtót.\n"
+
+-#: ogg123/cmdline_options.c:222
+-#, fuzzy, c-format
++#: ogg123/cmdline_options.c:206
++#, c-format
+ msgid "--- Cannot open playlist file %s. Skipped.\n"
+-msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n"
++msgstr "--- Nem lehet megnyitni a lejátszandó számok fájlját: %s. Átugorva.\n"
+
+-#: ogg123/cmdline_options.c:238
+-msgid "=== Option conflict: End time is before start time.\n"
+-msgstr ""
+-
+-#: ogg123/cmdline_options.c:251
++#: ogg123/cmdline_options.c:227
+ #, c-format
+ msgid "--- Driver %s specified in configuration file invalid.\n"
+-msgstr ""
+-"--- A konfigurációs állmányban meghatározott %s meghajtó érvénytelen.\n"
++msgstr "--- A konfigurációs állományban meghatározott %s meghajtó érvénytelen.\n"
+
+-#: ogg123/cmdline_options.c:261
+-msgid ""
+-"=== Could not load default driver and no driver specified in config file. "
+-"Exiting.\n"
+-msgstr ""
+-"=== Nem lehet betölteni az alapértelmezés szerinti meghajtót és nincs "
+-"meghajtó meghatározva a beállítás fájlban. Kilép.\n"
++#: ogg123/cmdline_options.c:237
++msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
++msgstr "=== Nem lehet betölteni az alapértelmezés szerinti meghajtót, és nincs meghajtó meghatározva a konfigurációs fájlban. Kilépés.\n"
+
+-#: ogg123/cmdline_options.c:282
+-#, fuzzy, c-format
++#: ogg123/cmdline_options.c:258
++#, c-format
+ msgid ""
+ "ogg123 from %s %s\n"
+ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
+@@ -290,38 +280,36 @@
+ "\n"
+ " -h, --help ez a segítség\n"
+ " -V, --version az Ogg123 verziójának a megjelenítése\n"
+-" -d, --device=a kimeneti egység meghatározása\n"
++" -d, --device=d a 'd' kimeneti eszköz meghatározása\n"
+ " Lehetséges eszközök ('*'=live, '@'=file):\n"
+ " "
+
+-#: ogg123/cmdline_options.c:303
+-#, fuzzy, c-format
++#: ogg123/cmdline_options.c:279
++#, c-format
+ msgid ""
+ " -f, --file=filename Set the output filename for a previously\n"
+ " specified file device (with -d).\n"
+-" -k n, --skip n Skip the first 'n' seconds (or hh:mm:ss format)\n"
+-" -K n, --end n End at 'n' seconds (or hh:mm:ss format)\n"
++" -k n, --skip n Skip the first 'n' seconds\n"
+ " -o, --device-option=k:v passes special option k with value\n"
+ " v to previously specified device (with -d). See\n"
+ " man page for more info.\n"
+-" -@, --list=filename Read playlist of files and URLs from \"filename\"\n"
+-" -b n, --buffer n Use an input buffer of 'n' kilobytes\n"
+-" -p n, --prebuffer n Load n%% of the input buffer before playing\n"
+-" -v, --verbose Display progress and other status information\n"
+-" -q, --quiet Don't display anything (no title)\n"
+-" -x n, --nth Play every 'n'th block\n"
+-" -y n, --ntimes Repeat every played block 'n' times\n"
+-" -z, --shuffle Shuffle play\n"
++" -b n, --buffer n use an input buffer of 'n' kilobytes\n"
++" -p n, --prebuffer n load n%% of the input buffer before playing\n"
++" -v, --verbose display progress and other status information\n"
++" -q, --quiet don't display anything (no title)\n"
++" -x n, --nth play every 'n'th block\n"
++" -y n, --ntimes repeat every played block 'n' times\n"
++" -z, --shuffle shuffle play\n"
+ "\n"
+ "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
+ "s milliseconds make ogg123 terminate.\n"
+-" -l, --delay=s Set s [milliseconds] (default 500).\n"
++" -l, --delay=s set s [milliseconds] (default 500).\n"
+ msgstr ""
+-" -f, --file=fájlnév Beállítja a kiemeneti fájlnevet az elõzõleg\n"
++" -f, --file=fájlnév Beállítja a kimeneti fájlnevet az elõzõleg\n"
+ " meghatározott eszközhöz (a '-d'-vel).\n"
+ " -k n, --skip n Átugorja az elsõ 'n' másodpercet\n"
+ " -o, --device-option=k:v átírja a speciális opciót a k értékével\n"
+-" a v elõzõleg meghatázott eszközt (a '-d'-vel). Több\n"
++" a v elõzõleg meghatázott eszközt (a '-d'-vel). További\n"
+ " információhoz nézze meg man lapot.\n"
+ " -b n, --buffer n 'n' kilobájt bemeneti puffert használ\n"
+ " -p n, --prebuffer n betölt n%% a bemeneti pufferbe lejátszás elõtt\n"
+@@ -331,138 +319,163 @@
+ " -y n, --ntimes megismétel minden lejátszott blokkot 'n'-szer\n"
+ " -z, --shuffle véletlen lejátszás\n"
+ "\n"
+-"ogg123 átugrik a következõ számra ha egy SIGINT (Ctrl-C) jelet kap; két "
+-"SIGINT\n"
++"ogg123 átugrik a következõ számra ha egy SIGINT (Ctrl-C) jelet kap; két SIGINT\n"
+ "s ezredmásodpercen belül akkor megszakad az ogg123 futása.\n"
+ " -l, --delay=s beállítja s [ezredmásodperc] (alapból 500).\n"
+
+-#: ogg123/file_transport.c:58 ogg123/http_transport.c:209
+-#: ogg123/oggvorbis_format.c:91
++#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
++#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
++#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
+ msgid "Error: Out of memory.\n"
+ msgstr "Hiba: Elfogyott a memória.\n"
+
+-#: ogg123/format.c:78
++#: ogg123/format.c:59
+ msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
+-msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats() -ban\n"
++msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats()-ban\n"
+
+-#: ogg123/http_transport.c:139
++#: ogg123/http_transport.c:137
+ msgid "Error: Could not set signal mask."
+-msgstr "Hiba: Nem lehet beállítani a szignál maszkot."
++msgstr "Hiba: Nem lehet beállítani a szignálmaszkot."
+
+-#: ogg123/http_transport.c:196
++#: ogg123/http_transport.c:191
+ msgid "Error: Unable to create input buffer.\n"
+ msgstr "Hiba: Nem lehet létrehozni a bemeneti puffert.\n"
+
+ #. found, name, description, type, ptr, default
+ #: ogg123/ogg123.c:75
+ msgid "default output device"
+-msgstr "alapértelmezés szerinti kimenet eszköz"
++msgstr "alapértelmezés szerinti kimeneti eszköz"
+
+ #: ogg123/ogg123.c:77
+ msgid "shuffle playlist"
+ msgstr "véletelen lejátszási lista"
+
+-#: ogg123/ogg123.c:277
+-#, fuzzy, c-format
++#: ogg123/ogg123.c:261
++#, c-format
+ msgid ""
+ "\n"
+ "Audio Device: %s"
+ msgstr ""
+ "\n"
+-"Eszköz: %s"
++"Audioeszköz: %s"
+
+-#: ogg123/ogg123.c:278
++#: ogg123/ogg123.c:262
+ #, c-format
+ msgid "Author: %s"
+ msgstr "Szerzõ: %s"
+
+-#: ogg123/ogg123.c:279
++#: ogg123/ogg123.c:263
+ #, fuzzy, c-format
+ msgid "Comments: %s"
+ msgstr "Megjegyzések: %s\n"
+
+-#: ogg123/ogg123.c:323 ogg123/playlist.c:155
+-#, fuzzy, c-format
++#: ogg123/ogg123.c:307 ogg123/playlist.c:155
++#, c-format
+ msgid "Warning: Could not read directory %s.\n"
+-msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %s\n"
++msgstr "Figyelmeztetés: Nem lehet olvasni a könyvtárat: %s.\n"
+
+-#: ogg123/ogg123.c:357
++#: ogg123/ogg123.c:341
+ msgid "Error: Could not create audio buffer.\n"
+-msgstr "Hiba: Nem lehet létrehozni a audio puffert.\n"
++msgstr "Hiba: Nem lehet létrehozni az audiopuffert.\n"
+
+-#: ogg123/ogg123.c:445
++#: ogg123/ogg123.c:429
+ #, c-format
+ msgid "No module could be found to read from %s.\n"
+-msgstr "Nem találtam modult a %s belovasása során.\n"
++msgstr "Nem találtam modult a %s beolvasása során.\n"
+
+-#: ogg123/ogg123.c:450
++#: ogg123/ogg123.c:434
+ #, c-format
+ msgid "Cannot open %s.\n"
+-msgstr "Nem lehet megnyitni a %s-t.\n"
++msgstr "Nem lehet megnyitni %s-t.\n"
+
+-#: ogg123/ogg123.c:456
++#: ogg123/ogg123.c:440
+ #, c-format
+ msgid "The file format of %s is not supported.\n"
+-msgstr "A %s fájl formátum nem támogatott.\n"
++msgstr "A(z) %s fájl formátum nem támogatott.\n"
+
+-#: ogg123/ogg123.c:466
++#: ogg123/ogg123.c:450
+ #, c-format
+ msgid "Error opening %s using the %s module. The file may be corrupted.\n"
+-msgstr ""
+-"Hiba a %s megnyitása közben ami a %s modult használna. A fájl lehet, hogy "
+-"sérült.\n"
++msgstr "Hiba a %s megnyitása közben, ami a %s modult használna. A fájl lehet, hogy sérült.\n"
+
+-#: ogg123/ogg123.c:485
++#: ogg123/ogg123.c:469
+ #, c-format
+ msgid "Playing: %s"
+ msgstr "Lejátszás: %s"
+
+-#: ogg123/ogg123.c:490
++#: ogg123/ogg123.c:474
+ #, c-format
+ msgid "Could not skip %f seconds of audio."
+ msgstr "Nem lehet átugrani %f másodpercet ."
+
+-#: ogg123/ogg123.c:532
++#: ogg123/ogg123.c:512
+ msgid "Error: Decoding failure.\n"
+-msgstr "Hiba: Visszakódólás nem sikerült.\n"
++msgstr "Hiba: Dekódolás nem sikerült.\n"
+
+ #. In case we were killed mid-output
+-#: ogg123/ogg123.c:611
++#: ogg123/ogg123.c:585
+ msgid "Done."
+ msgstr "Kész."
+
+-#: ogg123/oggvorbis_format.c:153
++#: ogg123/oggvorbis_format.c:51
++msgid "Track number:"
++msgstr "Sáv száma:"
++
++#: ogg123/oggvorbis_format.c:52
++msgid "ReplayGain (Track):"
++msgstr ""
++
++#: ogg123/oggvorbis_format.c:53
++msgid "ReplayGain (Album):"
++msgstr ""
++
++#: ogg123/oggvorbis_format.c:54
++msgid "ReplayGain (Track) Peak:"
++msgstr ""
++
++#: ogg123/oggvorbis_format.c:55
++msgid "ReplayGain (Album) Peak:"
++msgstr ""
++
++#: ogg123/oggvorbis_format.c:56
++msgid "Copyright"
++msgstr "Copyright"
++
++#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
++msgid "Comment:"
++msgstr "Megjegyzés:"
++
++#: ogg123/oggvorbis_format.c:167
+ msgid "--- Hole in the stream; probably harmless\n"
+-msgstr "--- Lyuk a adatfolyamban, lehet hogy ártalmatlan\n"
++msgstr "--- Lyuk a adatfolyamban, valószínûleg ártalmatlan\n"
+
+-#: ogg123/oggvorbis_format.c:159
++#: ogg123/oggvorbis_format.c:173
+ msgid "=== Vorbis library reported a stream error.\n"
+-msgstr "=== a vorbis programozói könyvtár adatfolyam hibát jelentett.\n"
++msgstr "=== A vorbis programozói könyvtár adatfolyamhibát jelentett.\n"
+
+-#: ogg123/oggvorbis_format.c:303
+-#, fuzzy, c-format
+-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
+-msgstr "Bitfolyam %d csatornán, %ldHz"
+-
+-#: ogg123/oggvorbis_format.c:308
++#: ogg123/oggvorbis_format.c:402
+ #, c-format
+-msgid "Vorbis format: Version %d"
+-msgstr ""
++msgid "Version is %d"
++msgstr "Verzió: %d"
+
+-#: ogg123/oggvorbis_format.c:312
++#: ogg123/oggvorbis_format.c:406
+ #, c-format
+ msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
+ msgstr "Bitráta adatok: felsõ=%ld névleges=%ld alsó=%ld ablak=%ld"
+
+-#: ogg123/oggvorbis_format.c:320
++#: ogg123/oggvorbis_format.c:414
++#, c-format
++msgid "Bitstream is %d channel, %ldHz"
++msgstr "A bitfolyam %d csatornás, %ld Hz"
++
++#: ogg123/oggvorbis_format.c:419
+ #, c-format
+ msgid "Encoded by: %s"
+-msgstr "Kódolva: %s-el"
++msgstr "Kódolva: %s módszerrel"
+
+ #: ogg123/playlist.c:41 ogg123/playlist.c:52
+-#, fuzzy
+ msgid "Error: Out of memory in create_playlist_member().\n"
+-msgstr "Hiba: Elfogyott a memória a new_status_message_arg() ban .\n"
++msgstr "Hiba: Elfogyott a memória a create_playlist_member()-ben.\n"
+
+ #: ogg123/playlist.c:214
+ #, c-format
+@@ -470,12 +483,11 @@
+ msgstr ""
+
+ #: ogg123/playlist.c:259 ogg123/playlist.c:271
+-#, fuzzy
+ msgid "Error: Out of memory in playlist_to_array().\n"
+-msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n"
++msgstr "Hiba: Elfogyott a memória a playlist_to_array()-ben.\n"
+
+ #: ogg123/status.c:47
+-#, fuzzy, c-format
++#, c-format
+ msgid "%sPrebuf to %.1f%%"
+ msgstr "%sElõpufferelés %1.f%%"
+
+@@ -492,7 +504,7 @@
+ #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+ #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+ msgid "Memory allocation error in stats_init()\n"
+-msgstr "Memória kiosztás hiba a stats_init()-ban\n"
++msgstr "Memóriakiosztási hiba a stats_init()-ben\n"
+
+ #: ogg123/status.c:198
+ #, c-format
+@@ -507,12 +519,12 @@
+ #: ogg123/status.c:232
+ #, c-format
+ msgid "of %s"
+-msgstr "%s-é"
++msgstr "/ %s"
+
+ #: ogg123/status.c:252
+ #, c-format
+ msgid "Avg bitrate: %5.1f"
+-msgstr "Átl bitráta: %5.1f"
++msgstr "Átl. bitráta: %5.1f"
+
+ #: ogg123/status.c:258
+ #, c-format
+@@ -526,87 +538,74 @@
+
+ #: ogg123/transport.c:67
+ msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
+-msgstr ""
+-"Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n"
++msgstr "Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n"
+
+-#: oggenc/audio.c:43
++#: oggenc/audio.c:39
+ msgid "WAV file reader"
+-msgstr "WAV fájl olvasó"
++msgstr "WAV-fájl olvasó"
+
+-#: oggenc/audio.c:44
++#: oggenc/audio.c:40
+ msgid "AIFF/AIFC file reader"
+-msgstr "AIFF/AIFC fájl olvasó"
++msgstr "AIFF/AIFC-fájl olvasó"
+
+-#: oggenc/audio.c:46
+-#, fuzzy
+-msgid "FLAC file reader"
+-msgstr "WAV fájl olvasó"
+-
+-#: oggenc/audio.c:47
+-#, fuzzy
+-msgid "Ogg FLAC file reader"
+-msgstr "WAV fájl olvasó"
+-
+-#: oggenc/audio.c:124 oggenc/audio.c:391
++#: oggenc/audio.c:117 oggenc/audio.c:374
+ msgid "Warning: Unexpected EOF in reading WAV header\n"
+-msgstr "Figyelmeztetés: Váratlan fájl vég a WAV fejlécben\n"
++msgstr "Figyelmeztetés: Váratlan fájlvég a WAV-fejlécben\n"
+
+-#: oggenc/audio.c:135
++#: oggenc/audio.c:128
+ #, c-format
+ msgid "Skipping chunk of type \"%s\", length %d\n"
+ msgstr "\"%s\" típusú csonk átugrása, hossz: %d\n"
+
+-#: oggenc/audio.c:153
++#: oggenc/audio.c:146
+ msgid "Warning: Unexpected EOF in AIFF chunk\n"
+ msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF csonkban\n"
+
+-#: oggenc/audio.c:238
++#: oggenc/audio.c:231
+ msgid "Warning: No common chunk found in AIFF file\n"
+ msgstr "Figyelmeztetés: Nem találtam közös csonkot az AIFF fájlban\n"
+
+-#: oggenc/audio.c:244
++#: oggenc/audio.c:237
+ msgid "Warning: Truncated common chunk in AIFF header\n"
+ msgstr "Figyelmeztetés: Csonkított közös csonk az AIFF fejlécben\n"
+
+-#: oggenc/audio.c:252
++#: oggenc/audio.c:245
+ msgid "Warning: Unexpected EOF in reading AIFF header\n"
+ msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF fejlécben\n"
+
+-#: oggenc/audio.c:267
++#: oggenc/audio.c:258
+ msgid "Warning: AIFF-C header truncated.\n"
+ msgstr "Figyelmeztetés: AIFF-C fejléc csonkított.\n"
+
+-#: oggenc/audio.c:281
+-#, fuzzy, c-format
+-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
++#: oggenc/audio.c:263
++msgid "Warning: Can't handle compressed AIFF-C\n"
+ msgstr "Figyelmeztetés: Nem tudom kezelni a tömörített AIFF-C-t\n"
+
+-#: oggenc/audio.c:288
++#: oggenc/audio.c:270
+ msgid "Warning: No SSND chunk found in AIFF file\n"
+ msgstr "Figyelmeztetés: Nem találtam SSND csonkot az AIFF fájlban\n"
+
+-#: oggenc/audio.c:294
++#: oggenc/audio.c:276
+ msgid "Warning: Corrupted SSND chunk in AIFF header\n"
+ msgstr "Figyelmeztetés: Sérült az SSND csonk az AIFF fájlban\n"
+
+-#: oggenc/audio.c:300
++#: oggenc/audio.c:282
+ msgid "Warning: Unexpected EOF reading AIFF header\n"
+ msgstr "Figyelmeztetés: Váratlan fájlvég az AIFF fejlécben\n"
+
+-#: oggenc/audio.c:331
+-#, fuzzy
++#: oggenc/audio.c:314
+ msgid ""
+ "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
+-" Must be 8, 16, or 24 bit PCM.\n"
++" Must be 8 or 16 bit PCM.\n"
+ msgstr ""
+ "Figyelmeztetés: Az OggEnc nem támogatja ezt a típusú AIFF/AIFC fájlt\n"
+ " 8 vagy 16 bit-es PCM kell hogy legyen.\n"
+
+-#: oggenc/audio.c:374
++#: oggenc/audio.c:357
+ msgid "Warning: Unrecognised format chunk in WAV header\n"
+ msgstr "Figyelmeztetés: Ismeretlen formátumú csonk a WAV fejlécben\n"
+
+-#: oggenc/audio.c:386
++#: oggenc/audio.c:369
+ msgid ""
+ "Warning: INVALID format chunk in wav header.\n"
+ " Trying to read anyway (may not work)...\n"
+@@ -614,7 +613,7 @@
+ "Figyelmeztetés: ÉRVÉNYTELEN formátumú csonk a wav fejlécben\n"
+ " Megprobálom mindenkép elolvasni (lehet hogy nem fog mûködni)...\n"
+
+-#: oggenc/audio.c:423
++#: oggenc/audio.c:406
+ msgid ""
+ "ERROR: Wav file is unsupported type (must be standard PCM\n"
+ " or type 3 floating point PCM\n"
+@@ -622,31 +621,19 @@
+ "HIBA: A Wav fájl nem támogatott típusú (normális PCM\n"
+ " vagy 5-as típusú lebegõ pontos PCM)\n"
+
+-#: oggenc/audio.c:475
+-#, fuzzy
++#: oggenc/audio.c:455
+ msgid ""
+-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
++"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+ "or floating point PCM\n"
+ msgstr ""
+ "HIBA: A WAV fájl nem támogatott alformátumott tartalmazz( 16-bites PCM \n"
+ "vagy lebegõ pontos PCM-nek kell lennie)\n"
+
+-#: oggenc/audio.c:550
+-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
+-msgstr ""
+-
+-#: oggenc/audio.c:556
+-#, c-format
+-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
++#: oggenc/audio.c:607
++msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+ msgstr ""
+
+-#: oggenc/audio.c:653
+-msgid ""
+-"BUG: Got zero samples from resampler: your file will be truncated. Please "
+-"report this.\n"
+-msgstr ""
+-
+-#: oggenc/audio.c:671
++#: oggenc/audio.c:625
+ msgid "Couldn't initialise resampler\n"
+ msgstr ""
+
+@@ -666,9 +653,7 @@
+ msgstr "%s: a `--%s' kapcsoló ismeretlen\n"
+
+ #: oggenc/encode.c:133
+-msgid ""
+-"255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
+-"more)\n"
++msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+ msgstr ""
+
+ #: oggenc/encode.c:141
+@@ -677,13 +662,11 @@
+
+ #: oggenc/encode.c:159
+ msgid "Mode initialisation failed: invalid parameters for quality\n"
+-msgstr ""
+-"Mód installáció nem sikerült: ennek a minõségnek érvénytelen a paramétere\n"
++msgstr "Mód installáció nem sikerült: ennek a minõségnek érvénytelen a paramétere\n"
+
+ #: oggenc/encode.c:183
+ msgid "Mode initialisation failed: invalid parameters for bitrate\n"
+-msgstr ""
+-"Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n"
++msgstr "Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n"
+
+ #: oggenc/encode.c:237
+ msgid "Failed writing header to output stream\n"
+@@ -696,12 +679,12 @@
+ #: oggenc/encode.c:349
+ #, c-format
+ msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+-msgstr "\t[%5.1f%%] [%2dm%.2ds átnevezés] %c"
++msgstr "\t[%5.1f%%] [%2dm%.2ds van még hátra] %c"
+
+ #: oggenc/encode.c:359
+ #, c-format
+ msgid "\tEncoding [%2dm%.2ds so far] %c"
+-msgstr "\tKódólás [%2dm%.2ds ] %c"
++msgstr "\tKódólás [%2dm%.2ds telt el eddig] %c"
+
+ #: oggenc/encode.c:377
+ #, c-format
+@@ -736,7 +719,7 @@
+ #: oggenc/encode.c:387
+ #, c-format
+ msgid "\tElapsed time: %dm %04.1fs\n"
+-msgstr "\tHátralévõ idõ: %dm %04.1fs\n"
++msgstr "\tEltelt idõ: %dm %04.1fs\n"
+
+ #: oggenc/encode.c:390
+ #, c-format
+@@ -814,7 +797,7 @@
+ " %s%s%s bitráta %d kbps,\n"
+ "teljes bitrátakezelõ motort használom\n"
+
+-#: oggenc/oggenc.c:98
++#: oggenc/oggenc.c:96
+ #, c-format
+ msgid ""
+ "%s%s\n"
+@@ -823,70 +806,57 @@
+ "%s%s\n"
+ "HIBA: Nincs bemeneti fájl meghatározva. Használja a '-h' segítségért.\n"
+
+-#: oggenc/oggenc.c:113
++#: oggenc/oggenc.c:111
+ msgid "ERROR: Multiple files specified when using stdin\n"
+ msgstr "HIBA: Több fájlt határozott meg amikor az stdin-t használta\n"
+
+-#: oggenc/oggenc.c:120
+-msgid ""
+-"ERROR: Multiple input files with specified output filename: suggest using -"
+-"n\n"
+-msgstr ""
+-"HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, "
+-"javaslom használja a '-n'-t\n"
++#: oggenc/oggenc.c:118
++msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
++msgstr "HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, javaslom használja a '-n'-t\n"
+
+-#: oggenc/oggenc.c:176
++#: oggenc/oggenc.c:172
+ #, c-format
+ msgid "ERROR: Cannot open input file \"%s\": %s\n"
+ msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n"
+
+-#: oggenc/oggenc.c:204
++#: oggenc/oggenc.c:200
+ #, c-format
+ msgid "Opening with %s module: %s\n"
+ msgstr "A %s megnyitása %s modullal \n"
+
+-#: oggenc/oggenc.c:213
++#: oggenc/oggenc.c:209
+ #, c-format
+ msgid "ERROR: Input file \"%s\" is not a supported format\n"
+ msgstr "HIBA Bemeneti fájl \"%s\" formátuma nem támogatott\n"
+
+-#: oggenc/oggenc.c:263
++#: oggenc/oggenc.c:259
+ msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
+-msgstr ""
+-"FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default."
+-"ogg\"-t használom\n"
++msgstr "FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default.ogg\"-t használom\n"
+
+-#: oggenc/oggenc.c:271
++#: oggenc/oggenc.c:267
+ #, c-format
+-msgid ""
+-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+-msgstr ""
+-"HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n"
++msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
++msgstr "HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n"
+
+-#: oggenc/oggenc.c:282
++#: oggenc/oggenc.c:278
+ #, c-format
+ msgid "ERROR: Cannot open output file \"%s\": %s\n"
+ msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s kimenet fájlt\n"
+
+-#: oggenc/oggenc.c:312
++#: oggenc/oggenc.c:308
+ #, c-format
+ msgid "Resampling input from %d Hz to %d Hz\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:319
++#: oggenc/oggenc.c:315
+ msgid "Downmixing stereo to mono\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:322
++#: oggenc/oggenc.c:318
+ msgid "ERROR: Can't downmix except from stereo to mono\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:333
+-#, c-format
+-msgid "Scaling input to %f\n"
+-msgstr ""
+-
+-#: oggenc/oggenc.c:377
++#: oggenc/oggenc.c:365
+ #, fuzzy, c-format
+ msgid ""
+ "%s%s\n"
+@@ -922,31 +892,23 @@
+ " -s, --serial Specify a serial number for the stream. If encoding\n"
+ " multiple files, this will be incremented for each\n"
+ " stream after the first.\n"
+-" --discard-comments Prevents comments in FLAC and Ogg FLAC files from\n"
+-" being copied to the output Ogg Vorbis file.\n"
+ "\n"
+ " Naming:\n"
+ " -o, --output=fn Write file to fn (only valid in single-file mode)\n"
+ " -n, --names=string Produce filenames as this string, with %%a, %%t, %%l,\n"
+-" %%n, %%d replaced by artist, title, album, track "
+-"number,\n"
+-" and date, respectively (see below for specifying "
+-"these).\n"
++" %%n, %%d replaced by artist, title, album, track number,\n"
++" and date, respectively (see below for specifying these).\n"
+ " %%%% gives a literal %%.\n"
+-" -X, --name-remove=s Remove the specified characters from parameters to "
+-"the\n"
++" -X, --name-remove=s Remove the specified characters from parameters to the\n"
+ " -n format string. Useful to ensure legal filenames.\n"
+ " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
+-" characters specified. If this string is shorter than "
+-"the\n"
++" characters specified. If this string is shorter than the\n"
+ " --name-remove list or is not specified, the extra\n"
+ " characters are just removed.\n"
+-" Default settings for the above two arguments are "
+-"platform\n"
++" Default settings for the above two arguments are platform\n"
+ " specific.\n"
+ " -c, --comment=c Add the given string as an extra comment. This may be\n"
+-" used multiple times. The argument should be in the\n"
+-" format \"tag=value\".\n"
++" used multiple times.\n"
+ " -d, --date Date for track (usually date of performance)\n"
+ " -N, --tracknum Track number for this track\n"
+ " -t, --title Title for this track\n"
+@@ -954,34 +916,24 @@
+ " -a, --artist Name of artist\n"
+ " -G, --genre Genre of track\n"
+ " If multiple input files are given, then multiple\n"
+-" instances of the previous five arguments will be "
+-"used,\n"
++" instances of the previous five arguments will be used,\n"
+ " in the order they are given. If fewer titles are\n"
+-" specified than files, OggEnc will print a warning, "
+-"and\n"
++" specified than files, OggEnc will print a warning, and\n"
+ " reuse the final one for the remaining files. If fewer\n"
+ " track numbers are given, the remaining files will be\n"
+-" unnumbered. For the others, the final tag will be "
+-"reused\n"
+-" for all others without warning (so you can specify a "
+-"date\n"
+-" once, for example, and have it used for all the "
+-"files)\n"
++" unnumbered. For the others, the final tag will be reused\n"
++" for all others without warning (so you can specify a date\n"
++" once, for example, and have it used for all the files)\n"
+ "\n"
+ "INPUT FILES:\n"
+-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
+-"AIFF/C\n"
+-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+-"Files\n"
+-" may be mono or stereo (or more channels) and any sample rate.\n"
+-" Alternatively, the --raw option may be used to use a raw PCM data file, "
+-"which\n"
+-" must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
+-"additional\n"
++" OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/C\n"
++" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
++" (or more channels) and any sample rate.\n"
++" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
++" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
+ " parameters for raw mode are specified.\n"
+-" You can specify taking the file from stdin by using - as the input "
+-"filename.\n"
+-" In this mode, output is to stdout unless an output filename is specified\n"
++" You can specify taking the file from stdin by using - as the input filename.\n"
++" In this mode, output is to stdout unless an outfile filename is specified\n"
+ " with -o\n"
+ "\n"
+ msgstr ""
+@@ -992,52 +944,38 @@
+ " Általásnos:\n"
+ " -Q, --quiet Nemír kisemmit az stderr-re\n"
+ " -h, --help Kiírja ezt a szöveget\n"
+-" -r, --raw Nyers mód. A bemeneti fájlt közvetleül mint PCM adat "
+-"olvassa\n"
+-" -B, --raw-bits=n Beállítja a bitenkénti minta vételezést a nyers "
+-"bemenethez. Alapból 16\n"
++" -r, --raw Nyers mód. A bemeneti fájlt közvetleül mint PCM adat olvassa\n"
++" -B, --raw-bits=n Beállítja a bitenkénti minta vételezést a nyers bemenethez. Alapból 16\n"
+ " -C, --raw-chan=n Beállítja a csatornák számát. Alapbólis 2\n"
+-" -R, --raw-rate=n Beállítja a másodpercenkéni mintavételezések számát a "
+-"nyers bemenethez. Alapból 44100\n"
+-" -b, --bitrate A kódólás átlagos bitrátájának kiválasztása. Ez "
+-"használja\n"
++" -R, --raw-rate=n Beállítja a másodpercenkéni mintavételezések számát a nyers bemenethez. Alapból 44100\n"
++" -b, --bitrate A kódólás átlagos bitrátájának kiválasztása. Ez használja\n"
+ " a kódólás átlagos bitrátájaként. Ez az érték\n"
+ " kbps-ban értendõ.\n"
+ " -m, --min-bitrate Meghatározza az minimális bitrátát(kbps-ban). Hasznos\n"
+ " fix méretû csatornáknál.\n"
+ " -M, --max-bitrate Meghatározza az maximális bitrátát(kbps-ban). Hasznos\n"
+ " az adatfolyamoknál.\n"
+-" -q, --quality A minõség meghatározása 0 (alacsony) és 10 (magas) "
+-"között,\n"
++" -q, --quality A minõség meghatározása 0 (alacsony) és 10 (magas) között,\n"
+ " használhatja a bitráta meghatározás helyett.\n"
+ " Ez a normális mûvelet.\n"
+ " Meghatározhat tört értékeket (pl. 2.75) \n"
+-" -s, --serial A folyamat sorozat számának a meghatározása. Ha több "
+-"fájlt\n"
++" -s, --serial A folyamat sorozat számának a meghatározása. Ha több fájlt\n"
+ " kódól akkor ez a szám automatikusan növekszik\n"
+ " minden folyamat után.\n"
+ "\n"
+ " Nevezés:\n"
+-" -o, --output=fn Kiírja a fájlt fn névvel (csak egy fájlos módban "
+-"használható)\n"
+-" -n, --names=sztring Ezzel a sztringgel nevezi el a fájlokat, ahol a %%a "
+-"az elõadót, %%t a címet\n"
+-" %%l az albumot,%%n a sáv számot és a %%d pedig "
+-"a dátumot jelenti\n"
++" -o, --output=fn Kiírja a fájlt fn névvel (csak egy fájlos módban használható)\n"
++" -n, --names=sztring Ezzel a sztringgel nevezi el a fájlokat, ahol a %%a az elõadót, %%t a címet\n"
++" %%l az albumot,%%n a sáv számot és a %%d pedig a dátumot jelenti\n"
+ " %%%% %%.\n"
+-" -X, --name-remove=s Eltávolítja a meghatározott karakterket a '-n' "
+-"formájú\n"
+-" sztringekbõl . Hasznos lehet az érvényes formátumú "
+-"fájlnevek létrehozását.\n"
+-" -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a --name-"
+-"remove-vel\n"
++" -X, --name-remove=s Eltávolítja a meghatározott karakterket a '-n' formájú\n"
++" sztringekbõl . Hasznos lehet az érvényes formátumú fájlnevek létrehozását.\n"
++" -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a --name-remove-vel\n"
+ " határozott. Ha a lista rövidebb mint a \n"
+-" --name-remove lista vagy nincs meghatározva akkor az "
+-"extra\n"
++" --name-remove lista vagy nincs meghatározva akkor az extra\n"
+ " karaktereket egyszerûen eltávolítja.\n"
+ " Az alapbeállítások platformfüggõ\n"
+-" -c, --comment=c A meghatározott sztringek megjegyzésként hozzádja a "
+-"fájlhoz. Ezt sok helyen\n"
++" -c, --comment=c A meghatározott sztringek megjegyzésként hozzádja a fájlhoz. Ezt sok helyen\n"
+ " használható.\n"
+ " -d, --date A sáv dátumának meghatározása \n"
+ " -N, --tracknum A sáv számának a meghatározása\n"
+@@ -1048,178 +986,144 @@
+ " Ha több bementi fájl ad meg akkor az elõzõ öt\n"
+ " paramétert használja fel,\n"
+ " Ha kevesebb címet határozz meg\n"
+-" mint ahány fájl van akkor az OggEnc egy figyelmezetést "
+-"küld\n"
+-" és felhasználja az utolsó címet a fájl átnevezésre. Ha "
+-"kevesebb\n"
++" mint ahány fájl van akkor az OggEnc egy figyelmezetést küld\n"
++" és felhasználja az utolsó címet a fájl átnevezésre. Ha kevesebb\n"
+ " sávot ad meg akkor nem fogja számozni a fájlokat.\n"
+ " Egyébként minden utolsó tagot újra felhasznál\n"
+-" minden további figyelmezetés nélkül(pl. így csak "
+-"egyszer kell meghatározni a dátumot\n"
++" minden további figyelmezetés nélkül(pl. így csak egyszer kell meghatározni a dátumot\n"
+ " és az összes fájl ezt használja)\n"
+ "\n"
+ "BEMENETI FÁJLOK:\n"
+-" Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy "
+-"AIFF/C\n"
+-" fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és "
+-"bármilyen mintavételezésû.\n"
++" Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy AIFF/C\n"
++" fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és bármilyen mintavételezésû.\n"
+ " Habár a kódoló csak 44.1 és 48 kHz mûködik és minden egyéb\n"
+ " frekvencia a minõség romlásához vezet.\n"
+ " Esetleg, a '--raw' opcióval használhat nyers PCM adat fájlokat, amelyek\n"
+-" 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de "
+-"semilyen egyéb\n"
++" 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de semilyen egyéb\n"
+ " paramétert nem használhat a nyers módban.\n"
+ " A '-' -el meghatározhatja hogy stdin-t használja mint bemeneti fájlnév.\n"
+ " Ebben a módban az alapértelemezett kimenet az stdout. A kimeneti fájlt \n"
+ "a '-o'-val hatázhatja meg\n"
+ "\n"
+
+-#: oggenc/oggenc.c:551
++#: oggenc/oggenc.c:536
+ #, c-format
+ msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
+ msgstr "FIGYELEM: Érvénytelen eszkép karakter a '%c' a névben\n"
+
+-#: oggenc/oggenc.c:577 oggenc/oggenc.c:697 oggenc/oggenc.c:710
++#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
+ msgid "Enabling bitrate management engine\n"
+ msgstr "A bitrára kezelés motor engedélyezése\n"
+
+-#: oggenc/oggenc.c:586
++#: oggenc/oggenc.c:571
+ #, fuzzy
+-msgid ""
+-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+-msgstr ""
+-"FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A "
+-"bemenetet nyersként használom.\n"
++msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
++msgstr "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A bemenetet nyersként használom.\n"
+
+-#: oggenc/oggenc.c:589
++#: oggenc/oggenc.c:574
+ #, c-format
+ msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:596
++#: oggenc/oggenc.c:581
+ #, c-format
+ msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:602
++#: oggenc/oggenc.c:587
+ #, c-format
+ msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:612
+-#, fuzzy, c-format
+-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
+-msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n"
+-
+-#: oggenc/oggenc.c:622
++#: oggenc/oggenc.c:599
+ msgid "No value for advanced encoder option found\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:637
++#: oggenc/oggenc.c:610
+ msgid "Internal error parsing command line options\n"
+ msgstr "Belsõ hiba a parancs sori opció elemzése során\n"
+
+-#: oggenc/oggenc.c:648
++#: oggenc/oggenc.c:621
+ #, c-format
+ msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
+ msgstr ""
+
+-#: oggenc/oggenc.c:683
++#: oggenc/oggenc.c:656
+ #, c-format
+ msgid "Warning: nominal bitrate \"%s\" not recognised\n"
+ msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
+
+-#: oggenc/oggenc.c:691
++#: oggenc/oggenc.c:664
+ #, c-format
+ msgid "Warning: minimum bitrate \"%s\" not recognised\n"
+ msgstr "Figyelmeztetés: minimális \"%s\" nem értelmezhetõ\n"
+
+-#: oggenc/oggenc.c:704
++#: oggenc/oggenc.c:677
+ #, c-format
+ msgid "Warning: maximum bitrate \"%s\" not recognised\n"
+ msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
+
+-#: oggenc/oggenc.c:716
++#: oggenc/oggenc.c:689
+ #, c-format
+ msgid "Quality option \"%s\" not recognised, ignoring\n"
+ msgstr "Minõség opciók \"%s\" nem értelmezhetõ\n"
+
+-#: oggenc/oggenc.c:724
++#: oggenc/oggenc.c:697
+ msgid "WARNING: quality setting too high, setting to maximum quality.\n"
+-msgstr ""
+-"FIGYELEM: a minõség túl magasra lett állítva, a maximálisra beállítva.\n"
++msgstr "FIGYELEM: a minõség túl magasra lett állítva, a maximálisra beállítva.\n"
+
+-#: oggenc/oggenc.c:730
++#: oggenc/oggenc.c:703
+ msgid "WARNING: Multiple name formats specified, using final\n"
+-msgstr ""
+-"FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n"
++msgstr "FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n"
+
+-#: oggenc/oggenc.c:739
++#: oggenc/oggenc.c:712
+ msgid "WARNING: Multiple name format filters specified, using final\n"
+-msgstr ""
+-"FIGYELEM: Többszörös név formátum szûröt hatázott meg, az utolsót használom\n"
++msgstr "FIGYELEM: Többszörös név formátum szûröt hatázott meg, az utolsót használom\n"
+
+-#: oggenc/oggenc.c:748
+-msgid ""
+-"WARNING: Multiple name format filter replacements specified, using final\n"
+-msgstr ""
+-"FIGYELEM: Többszörös név formátum szûrõ cserét hatázott meg, az utolsót "
+-"használom\n"
++#: oggenc/oggenc.c:721
++msgid "WARNING: Multiple name format filter replacements specified, using final\n"
++msgstr "FIGYELEM: Többszörös név formátum szûrõ cserét hatázott meg, az utolsót használom\n"
+
+-#: oggenc/oggenc.c:756
++#: oggenc/oggenc.c:729
+ msgid "WARNING: Multiple output files specified, suggest using -n\n"
+ msgstr "FIGYELEM: Több kimeneti fájlt hatázott meg használja a '-n'-t\n"
+
+-#: oggenc/oggenc.c:775
+-msgid ""
+-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+-msgstr ""
+-"FIGYELEM:Nyers bitmintát határozott meg nem nyers adatra. A bemenetet "
+-"nyersként használom.\n"
++#: oggenc/oggenc.c:748
++msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
++msgstr "FIGYELEM:Nyers bitmintát határozott meg nem nyers adatra. A bemenetet nyersként használom.\n"
+
+ #. Failed, so just set to 16
+-#: oggenc/oggenc.c:780 oggenc/oggenc.c:784
++#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
+ msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
+-msgstr ""
+-"FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n"
++msgstr "FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n"
+
+-#: oggenc/oggenc.c:791
+-msgid ""
+-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
+-"raw.\n"
+-msgstr ""
+-"FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A "
+-"bemenetet nyersként használom.\n"
++#: oggenc/oggenc.c:764
++msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
++msgstr "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A bemenetet nyersként használom.\n"
+
+ #. Failed, so just set to 2
+-#: oggenc/oggenc.c:796
++#: oggenc/oggenc.c:769
+ msgid "WARNING: Invalid channel count specified, assuming 2.\n"
+-msgstr ""
+-"FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n"
++msgstr "FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n"
+
+-#: oggenc/oggenc.c:807
+-msgid ""
+-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+-msgstr ""
+-"FIGYELEM:Nyers mintavételezést határozott meg nem nyers adatra. A bemenetet "
+-"nyersként használom.\n"
++#: oggenc/oggenc.c:780
++msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
++msgstr "FIGYELEM:Nyers mintavételezést határozott meg nem nyers adatra. A bemenetet nyersként használom.\n"
+
+ #. Failed, so just set to 44100
+-#: oggenc/oggenc.c:812
++#: oggenc/oggenc.c:785
+ msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
+-msgstr ""
+-"FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n"
++msgstr "FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n"
+
+-#: oggenc/oggenc.c:816
++#: oggenc/oggenc.c:789
+ msgid "WARNING: Unknown option specified, ignoring->\n"
+ msgstr "FIGYELEM Ismeretlen opciót határozott meg, elutasítva->\n"
+
+-#: oggenc/oggenc.c:838
++#: oggenc/oggenc.c:811
+ msgid "Couldn't convert comment to UTF-8, cannot add\n"
+-msgstr ""
+-"Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
++msgstr "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
+
+-#: oggenc/oggenc.c:857
++#: oggenc/oggenc.c:830
+ msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
+ msgstr "FIGYELEM: Kevés címet adott meg, az utolsó címet használom.\n"
+
+@@ -1238,268 +1142,221 @@
+ msgid "Error: path segment \"%s\" is not a directory\n"
+ msgstr "Hiba: az útvonal \"%s\" része nem könyvtár\n"
+
+-#: ogginfo/ogginfo2.c:159
++#: ogginfo/ogginfo2.c:156
+ #, c-format
+-msgid ""
+-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
++msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:166
++#: ogginfo/ogginfo2.c:164
+ #, c-format
+-msgid ""
+-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+-"header page contains additional packets or has non-zero granulepos\n"
++msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:170
++#: ogginfo/ogginfo2.c:168
+ #, c-format
+ msgid "Vorbis headers parsed for stream %d, information follows...\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:173
++#: ogginfo/ogginfo2.c:171
+ #, fuzzy, c-format
+ msgid "Version: %d\n"
+ msgstr "Verzió: %s"
+
+-#: ogginfo/ogginfo2.c:177
++#: ogginfo/ogginfo2.c:175
+ #, fuzzy, c-format
+ msgid "Vendor: %s (%s)\n"
+ msgstr "forgalmazó=%s\n"
+
+-#: ogginfo/ogginfo2.c:184
++#: ogginfo/ogginfo2.c:182
+ #, fuzzy, c-format
+ msgid "Vendor: %s\n"
+ msgstr "forgalmazó=%s\n"
+
+-#: ogginfo/ogginfo2.c:185
++#: ogginfo/ogginfo2.c:183
+ #, c-format
+ msgid "Channels: %d\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:186
++#: ogginfo/ogginfo2.c:184
+ #, fuzzy, c-format
+ msgid ""
+ "Rate: %ld\n"
+ "\n"
+ msgstr "Dátum: %s"
+
+-#: ogginfo/ogginfo2.c:189
++#: ogginfo/ogginfo2.c:187
+ #, fuzzy, c-format
+ msgid "Nominal bitrate: %f kb/s\n"
+ msgstr ""
+ "\tÁtlagos bitráta: %.1f kb/s\n"
+ "\n"
+
+-#: ogginfo/ogginfo2.c:192
++#: ogginfo/ogginfo2.c:190
+ #, fuzzy
+ msgid "Nominal bitrate not set\n"
+ msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
+
+-#: ogginfo/ogginfo2.c:195
++#: ogginfo/ogginfo2.c:193
+ #, fuzzy, c-format
+ msgid "Upper bitrate: %f kb/s\n"
+ msgstr ""
+ "\tÁtlagos bitráta: %.1f kb/s\n"
+ "\n"
+
+-#: ogginfo/ogginfo2.c:198
++#: ogginfo/ogginfo2.c:196
+ msgid "Upper bitrate not set\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:201
++#: ogginfo/ogginfo2.c:199
+ #, fuzzy, c-format
+ msgid "Lower bitrate: %f kb/s\n"
+ msgstr ""
+ "\tÁtlagos bitráta: %.1f kb/s\n"
+ "\n"
+
+-#: ogginfo/ogginfo2.c:204
++#: ogginfo/ogginfo2.c:202
+ msgid "Lower bitrate not set\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:207
++#: ogginfo/ogginfo2.c:205
+ msgid "User comments section follows...\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:219
++#: ogginfo/ogginfo2.c:217
+ #, c-format
+-msgid ""
+-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
+-"'=': \"%s\"\n"
++msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:228
++#: ogginfo/ogginfo2.c:226
+ #, c-format
+ msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:259 ogginfo/ogginfo2.c:268
++#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
+ #, c-format
+-msgid ""
+-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+-"wrong\n"
++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:276
++#: ogginfo/ogginfo2.c:274
+ #, c-format
+-msgid ""
+-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:337
++#: ogginfo/ogginfo2.c:335
+ #, c-format
+-msgid ""
+-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
++msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:349
++#: ogginfo/ogginfo2.c:347
+ msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:367
+-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+-msgstr ""
+-
+-#: ogginfo/ogginfo2.c:370
++#: ogginfo/ogginfo2.c:364
+ #, c-format
+-msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
++msgid "Warning: granulepos in stream %d decreases from "
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:376
+-msgid ""
+-"Negative granulepos on vorbis stream outside of headers. This file was "
+-"created by a buggy encoder\n"
++#: ogginfo/ogginfo2.c:365
++msgid " to "
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:397
+-msgid ""
+-"Vorbis stream %d:\n"
+-"\tTotal data length: %I64d bytes\n"
+-"\tPlayback length: %ldm:%02lds\n"
+-"\tAverage bitrate: %f kbps\n"
++#: ogginfo/ogginfo2.c:365
++msgid "\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:403
++#: ogginfo/ogginfo2.c:384
+ #, c-format
+ msgid ""
+ "Vorbis stream %d:\n"
+-"\tTotal data length: %lld bytes\n"
++"\tTotal data length: %ld bytes\n"
+ "\tPlayback length: %ldm:%02lds\n"
+ "\tAverage bitrate: %f kbps\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:438
++#: ogginfo/ogginfo2.c:418
+ #, c-format
+ msgid "Warning: EOS not set on stream %d\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:562
++#: ogginfo/ogginfo2.c:537
+ msgid "Warning: Invalid header page, no packet found\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:574
++#: ogginfo/ogginfo2.c:549
+ #, c-format
+ msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:588
+-#, c-format
+-msgid ""
+-"Note: Stream %d has serial number %d, which is legal but may cause problems "
+-"with some tools."
+-msgstr ""
+-
+-#: ogginfo/ogginfo2.c:605
+-msgid ""
+-"Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
+-"ogg.\n"
++#: ogginfo/ogginfo2.c:574
++msgid "Warning: Hole in data found at approximate offset "
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:607
+-#, c-format
+-msgid ""
+-"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+-"ogg.\n"
++#: ogginfo/ogginfo2.c:575
++msgid " bytes. Corrupted ogg.\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:632
++#: ogginfo/ogginfo2.c:599
+ #, fuzzy, c-format
+ msgid "Error opening input file \"%s\": %s\n"
+ msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n"
+
+-#: ogginfo/ogginfo2.c:637
++#: ogginfo/ogginfo2.c:604
+ #, fuzzy, c-format
+ msgid ""
+ "Processing file \"%s\"...\n"
+ "\n"
+ msgstr "Feldolgozás sikertelen\n"
+
+-#: ogginfo/ogginfo2.c:646
++#: ogginfo/ogginfo2.c:613
+ #, fuzzy
+ msgid "Could not find a processor for stream, bailing\n"
+ msgstr "A '%s'-t nem lehet megnyitni olvasásra\n"
+
+-#: ogginfo/ogginfo2.c:654
+-msgid "Page found for stream after EOS flag"
+-msgstr ""
+-
+-#: ogginfo/ogginfo2.c:657
+-msgid ""
+-"Ogg muxing constraints violated, new stream before EOS of all previous "
+-"streams"
+-msgstr ""
+-
+-#: ogginfo/ogginfo2.c:661
+-msgid "Error unknown."
+-msgstr ""
+-
+-#: ogginfo/ogginfo2.c:664
++#: ogginfo/ogginfo2.c:618
+ #, c-format
+ msgid ""
+ "Warning: illegally placed page(s) for logical stream %d\n"
+-"This indicates a corrupt ogg file: %s.\n"
++"This indicates a corrupt ogg file.\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:676
++#: ogginfo/ogginfo2.c:625
+ #, c-format
+ msgid "New logical stream (#%d, serial: %08x): type %s\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:679
++#: ogginfo/ogginfo2.c:628
+ #, fuzzy, c-format
+ msgid "Warning: stream start flag not set on stream %d\n"
+ msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
+
+-#: ogginfo/ogginfo2.c:683
++#: ogginfo/ogginfo2.c:632
+ #, c-format
+ msgid "Warning: stream start flag found in mid-stream on stream %d\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:688
++#: ogginfo/ogginfo2.c:637
+ #, c-format
+-msgid ""
+-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
+-"ld. Indicates missing data.\n"
++msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:703
++#: ogginfo/ogginfo2.c:652
+ #, c-format
+ msgid "Logical stream %d ended\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:711
++#: ogginfo/ogginfo2.c:659
+ #, c-format
+ msgid ""
+ "Error: No ogg data found in file \"%s\".\n"
+ "Input probably not ogg.\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:722
++#: ogginfo/ogginfo2.c:670
+ msgid ""
+ "ogginfo 1.0\n"
+-"(c) 2002 Michael Smith <msmith at xiph.org>\n"
++"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+ "\n"
+-"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
++"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
+ "Flags supported:\n"
+ "\t-h Show this help message\n"
+ "\t-q Make less verbose. Once will remove detailed informative\n"
+@@ -1509,7 +1366,7 @@
+ "\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:743
++#: ogginfo/ogginfo2.c:691
+ msgid ""
+ "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
+ "\n"
+@@ -1518,7 +1375,7 @@
+ "Full help shown with \"ogginfo -h\".\n"
+ msgstr ""
+
+-#: ogginfo/ogginfo2.c:772
++#: ogginfo/ogginfo2.c:720
+ #, fuzzy
+ msgid "No input files specified. \"ogginfo -h\" for help\n"
+ msgstr ""
+@@ -1584,27 +1441,27 @@
+ msgid "%s: option `-W %s' doesn't allow an argument\n"
+ msgstr "%s: a `-W %s' kapcsoló nem enged meg argumentumot\n"
+
+-#: vcut/vcut.c:133
++#: vcut/vcut.c:131
+ msgid "Page error. Corrupt input.\n"
+ msgstr "Lap hiba. Sérült bemenet.\n"
+
+-#: vcut/vcut.c:150
++#: vcut/vcut.c:148
+ msgid "Bitstream error, continuing\n"
+ msgstr "Bitfolyamat hiba, folyatatás\n"
+
+-#: vcut/vcut.c:175
++#: vcut/vcut.c:173
+ msgid "Found EOS before cut point.\n"
+ msgstr "EOS-t találtam a kivágási pont elõtt.\n"
+
+-#: vcut/vcut.c:184
++#: vcut/vcut.c:182
+ msgid "Setting eos: update sync returned 0\n"
+ msgstr "EOS beállítás: szinkronizálás 0-val tért vissza\n"
+
+-#: vcut/vcut.c:194
++#: vcut/vcut.c:192
+ msgid "Cutpoint not within stream. Second file will be empty\n"
+ msgstr "Nincs kivágási pont az adatfolyamban. A második fájl üres lesz\n"
+
+-#: vcut/vcut.c:227
++#: vcut/vcut.c:225
+ msgid "Unhandled special case: first file too short?\n"
+ msgstr "Kezelhetlen speciális eset: az elsõ fájl túl rövid?\n"
+
+@@ -1612,7 +1469,7 @@
+ #. * spectacularly unlucky? Doubt it, but let's check for it just
+ #. * in case.
+ #.
+-#: vcut/vcut.c:286
++#: vcut/vcut.c:284
+ msgid ""
+ "ERROR: First two audio packets did not fit into one\n"
+ " ogg page. File may not decode correctly.\n"
+@@ -1620,49 +1477,47 @@
+ "HIBA: Az elsõ két audio csomagot nem lehet egy\n"
+ " ogg lapra helyezni. A fájl visszakódólás nem helyes.\n"
+
+-#: vcut/vcut.c:299
++#: vcut/vcut.c:297
+ msgid "Recoverable bitstream error\n"
+ msgstr "Helyrehozható adatfolyam hiba\n"
+
+-#: vcut/vcut.c:309
++#: vcut/vcut.c:307
+ msgid "Bitstream error\n"
+ msgstr "Adatfolyam hiba\n"
+
+-#: vcut/vcut.c:332
++#: vcut/vcut.c:330
+ msgid "Update sync returned 0, setting eos\n"
+ msgstr "A szinkronizálás 0-val tért vissza, EOS beállítása\n"
+
+-#: vcut/vcut.c:381
++#: vcut/vcut.c:376
+ msgid "Input not ogg.\n"
+ msgstr "A bemenet nem ogg.\n"
+
+-#: vcut/vcut.c:391
++#: vcut/vcut.c:386
+ msgid "Error in first page\n"
+ msgstr "Hiba elsõ oldalon\n"
+
+-#: vcut/vcut.c:396
++#: vcut/vcut.c:391
+ msgid "error in first packet\n"
+ msgstr "hiba az elsõ csomagban\n"
+
+-#: vcut/vcut.c:402
++#: vcut/vcut.c:397
+ msgid "Error in primary header: not vorbis?\n"
+ msgstr "Hiba az elsõdleges fejlécben: lehet, hogy nem vorbis?\n"
+
+-#: vcut/vcut.c:422
++#: vcut/vcut.c:417
+ msgid "Secondary header corrupt\n"
+ msgstr "Másodlagos fejléc sérült\n"
+
+-#: vcut/vcut.c:435
++#: vcut/vcut.c:430
+ msgid "EOF in headers\n"
+ msgstr "Fájl vég jel a fejlécben\n"
+
+-#: vcut/vcut.c:468
+-#, fuzzy
+-msgid ""
+-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
++#: vcut/vcut.c:456
++msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
+ msgstr "Használat: vcut befájl.ogg kifájl1.ogg kifájl2.ogg vágásipont\n"
+
+-#: vcut/vcut.c:472
++#: vcut/vcut.c:460
+ msgid ""
+ "WARNING: vcut is still experimental code.\n"
+ "Check that the output files are correct before deleting sources.\n"
+@@ -1672,85 +1527,77 @@
+ " Ellenõrizze a kimeneti fájl helyeséges mielõtt letörli az eredetit\n"
+ "\n"
+
+-#: vcut/vcut.c:477
++#: vcut/vcut.c:465
+ #, c-format
+ msgid "Couldn't open %s for reading\n"
+ msgstr "A '%s'-t nem lehet megnyitni olvasásra\n"
+
+-#: vcut/vcut.c:482 vcut/vcut.c:487
++#: vcut/vcut.c:470 vcut/vcut.c:475
+ #, c-format
+ msgid "Couldn't open %s for writing\n"
+ msgstr "A '%s'-t nem lehet megnyitni írásra\n"
+
+-#: vcut/vcut.c:493 vcut/vcut.c:498
++#: vcut/vcut.c:480
+ #, c-format
+ msgid "Couldn't parse cutpoint \"%s\"\n"
+ msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n"
+
+-#: vcut/vcut.c:503
+-#, fuzzy, c-format
+-msgid "Processing: Cutting at %lld seconds\n"
+-msgstr "Feldolgozás: Vágás a %lld -nél\n"
+-
+-#: vcut/vcut.c:505
+-#, fuzzy, c-format
+-msgid "Processing: Cutting at %lld samples\n"
++#: vcut/vcut.c:484
++#, c-format
++msgid "Processing: Cutting at %lld\n"
+ msgstr "Feldolgozás: Vágás a %lld -nél\n"
+
+-#: vcut/vcut.c:515
++#: vcut/vcut.c:493
+ msgid "Processing failed\n"
+ msgstr "Feldolgozás sikertelen\n"
+
+-#: vcut/vcut.c:537
++#: vcut/vcut.c:514
+ msgid "Error reading headers\n"
+ msgstr "Hiba a fejléc olvasása közben\n"
+
+-#: vcut/vcut.c:560
++#: vcut/vcut.c:537
+ msgid "Error writing first output file\n"
+ msgstr "Hiba az elsõ kimeneti fájl írása közben\n"
+
+-#: vcut/vcut.c:568
++#: vcut/vcut.c:545
+ msgid "Error writing second output file\n"
+ msgstr "Hiba az második kimeneti fájl írása közben\n"
+
+-#: vorbiscomment/vcedit.c:229
++#: vorbiscomment/vcedit.c:220
+ msgid "Input truncated or empty."
+ msgstr "A bemenet megcsonkított vagy üres."
+
+-#: vorbiscomment/vcedit.c:231
++#: vorbiscomment/vcedit.c:222
+ msgid "Input is not an Ogg bitstream."
+ msgstr "A bemenet nem Ogg adatfolyam."
+
+-#: vorbiscomment/vcedit.c:249
++#: vorbiscomment/vcedit.c:239
+ msgid "Error reading first page of Ogg bitstream."
+ msgstr "Hiba az elsõ oldal Ogg adatfolyam olvasása közben."
+
+-#: vorbiscomment/vcedit.c:255
++#: vorbiscomment/vcedit.c:245
+ msgid "Error reading initial header packet."
+ msgstr "Hiba a kezdõ fejléc csomag olvasása közben."
+
+-#: vorbiscomment/vcedit.c:261
++#: vorbiscomment/vcedit.c:251
+ msgid "Ogg bitstream does not contain vorbis data."
+ msgstr "Ogg adatfolyam nem tartalmaz vorbis adatokat."
+
+-#: vorbiscomment/vcedit.c:284
++#: vorbiscomment/vcedit.c:274
+ msgid "Corrupt secondary header."
+ msgstr "Sérült másodlagos fejléc."
+
+-#: vorbiscomment/vcedit.c:305
++#: vorbiscomment/vcedit.c:295
+ msgid "EOF before end of vorbis headers."
+ msgstr "Fájl vég jel a vorbis fejléc vége elõtt."
+
+-#: vorbiscomment/vcedit.c:458
++#: vorbiscomment/vcedit.c:448
+ msgid "Corrupt or missing data, continuing..."
+ msgstr "Sérült vagy hiányzó adatok, folytatás..."
+
+-#: vorbiscomment/vcedit.c:495
+-msgid ""
+-"Error writing stream to output. Output stream may be corrupted or truncated."
+-msgstr ""
+-"Hiba az adatfolyam írása közben. A kimeneti adatfolyam lehet hogy sérült "
+-"vagy megcsonkított."
++#: vorbiscomment/vcedit.c:487
++msgid "Error writing stream to output. Output stream may be corrupted or truncated."
++msgstr "Hiba az adatfolyam írása közben. A kimeneti adatfolyam lehet hogy sérült vagy megcsonkított."
+
+ #: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+ #, c-format
+@@ -1779,8 +1626,7 @@
+
+ #: vorbiscomment/vcomment.c:269
+ msgid "Couldn't convert comment to UTF8, cannot add\n"
+-msgstr ""
+-"Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
++msgstr "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
+
+ #: vorbiscomment/vcomment.c:287
+ #, fuzzy
+@@ -1832,43 +1678,40 @@
+ msgid "Internal error parsing command options\n"
+ msgstr "Belsõ hiba a parancs opciójának az értelmezése során\n"
+
+-#: vorbiscomment/vcomment.c:457
++#: vorbiscomment/vcomment.c:456
+ #, c-format
+ msgid "Error opening input file '%s'.\n"
+ msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n"
+
+-#: vorbiscomment/vcomment.c:466
++#: vorbiscomment/vcomment.c:465
+ msgid "Input filename may not be the same as output filename\n"
+ msgstr ""
+
+-#: vorbiscomment/vcomment.c:477
++#: vorbiscomment/vcomment.c:476
+ #, c-format
+ msgid "Error opening output file '%s'.\n"
+ msgstr "Hiba a '%s' kimeneti fájl megnyitása során.\n"
+
+-#: vorbiscomment/vcomment.c:492
++#: vorbiscomment/vcomment.c:491
+ #, c-format
+ msgid "Error opening comment file '%s'.\n"
+ msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
+
+-#: vorbiscomment/vcomment.c:509
++#: vorbiscomment/vcomment.c:508
+ #, c-format
+ msgid "Error opening comment file '%s'\n"
+ msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
+
+-#: vorbiscomment/vcomment.c:537
++#: vorbiscomment/vcomment.c:536
+ #, fuzzy, c-format
+ msgid "Error removing old file %s\n"
+ msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
+
+-#: vorbiscomment/vcomment.c:539
++#: vorbiscomment/vcomment.c:538
+ #, fuzzy, c-format
+ msgid "Error renaming %s to %s\n"
+ msgstr "Hiba a fejléc olvasása közben\n"
+
+-#~ msgid "malloc"
+-#~ msgstr "malloc"
+-
+ #~ msgid "Internal error: long option given when none expected.\n"
+ #~ msgstr "Belsõ hiba: hosszú opciót használt amikor nem azt vártam.\n"
+
+@@ -1884,9 +1727,6 @@
+ #~ msgid "Title: %s"
+ #~ msgstr "Cím: %s"
+
+-#~ msgid "Track number: %s"
+-#~ msgstr "Sáv szám: %s"
+-
+ #~ msgid "Organization: %s"
+ #~ msgstr "Szervezet: %s"
+
+@@ -1899,29 +1739,18 @@
+ #~ msgid "Location: %s"
+ #~ msgstr "Helyszín: %s"
+
+-#~ msgid "Copyright %s"
+-#~ msgstr "Copyright %s"
+-
+-#~ msgid "Comment: %s"
+-#~ msgstr "Megjegyzés: %s"
+-
+-#~ msgid "Version is %d"
+-#~ msgstr "Verzió: %d"
+-
+ #~ msgid ""
+ #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+ #~ " At other than 44.1/48 kHz quality will be degraded.\n"
+ #~ msgstr ""
+-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f "
+-#~ "kHz).\n"
++#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n"
+ #~ " Minden 44.1/48 kHz-tõl eltérõ frekvencia a minõség romlásához vezethet.\n"
+
+ #~ msgid ""
+ #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+ #~ " At other than 44.1/48 kHz quality will be significantly degraded.\n"
+ #~ msgstr ""
+-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f "
+-#~ "kHz).\n"
++#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n"
+ #~ " Minden 44.1/48 kHz-tõl eltérõ frekvencia a minõség romlásához vezethet.\n"
+
+ #~ msgid ""
+@@ -1944,16 +1773,13 @@
+ #~ "Javaslom hogy CSAK végszükség esetén használja\n"
+ #~ "(pl. bizonyos audio folyam alkalmazásoknál).\n"
+ #~ "A bitráta kezelõ motor általában minõség romláshoz vezet,\n"
+-#~ "használja a normális VBR módokat (a minõséget a '-q'val határozhatja "
+-#~ "meg) \n"
++#~ "használja a normális VBR módokat (a minõséget a '-q'val határozhatja meg) \n"
+ #~ "nagyon ajánlott, hogy értse a dolgát.\n"
+ #~ "A -managed opció használata kötelezõ lesz a következõ kiadásban.\n"
+ #~ "\n"
+
+ #~ msgid "WARNING: negative quality specified, setting to minimum.\n"
+-#~ msgstr ""
+-#~ "FIGYELEM: a minõség túl alacsonyra lett állítva, a minimálisra "
+-#~ "beállítva.\n"
++#~ msgstr "FIGYELEM: a minõség túl alacsonyra lett állítva, a minimálisra beállítva.\n"
+
+ #~ msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
+ #~ msgstr "Használat: %s [fájlnév1.ogg] ... [fájlnévN.ogg]\n"
Added: trunk/packages/vorbis-tools/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches.off/mooch-improve_vorbiscomment_help_output.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,61 @@
+* Modified the manpage/help message for vorbiscomment to make it a bit more
+ userfiendly:
+--- vorbis-tools-1.0.1.orig/vorbiscomment/vcomment.c
++++ vorbis-tools-1.0.1/vorbiscomment/vcomment.c
+@@ -285,28 +285,35 @@
+ {
+ fprintf(stderr,
+ _("Usage: \n"
+- " vorbiscomment [-l] file.ogg (to list the comments)\n"
+- " vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+- " vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+- " in the write case, a new set of comments in the form\n"
+- " 'TAG=value' is expected on stdin. This set will\n"
+- " completely replace the existing set.\n"
+- " Either of -a and -w can take only a single filename,\n"
+- " in which case a temporary file will be used.\n"
+- " -c can be used to take comments from a specified file\n"
+- " instead of stdin.\n"
+- " Example: vorbiscomment -a in.ogg -c comments.txt\n"
+- " will append the comments in comments.txt to in.ogg\n"
+- " Finally, you may specify any number of tags to add on\n"
+- " the command line using the -t option. e.g.\n"
++ " vorbiscomment [-Vh]\n"
++ " vorbiscomment [-lR] file\n"
++ " vorbiscomment [-qR] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
++ "\n"
++ " -l list the comments\n"
++ " -a append comments\n"
++ " -w write comments, replacing the existing ones\n"
++ " -c <file> read the comments from the specified file\n"
++ " -q quiet mode\n"
++ " -V version\n"
++ " -h help\n"
++ " -R, --raw read and write comments in utf8\n"
++ "\n"
++ " If no OUTPUTFILE is specified, vorbiscomment will use a temporary file\n"
++ "\n"
++ " vorbiscomment reads comments from:\n"
++ " - stdin in the form of 'TAG=value'\n"
++ " - a specified file instead of stdin, using '-c <FILE>'\n"
++ " - the command line, using '-t <TAG>' (disables reading from stdin)\n"
++ "\n"
++ " Examples:\n"
++ " vorbiscomment -a in.ogg -c comments.txt\n"
+ " vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
+- " (note that when using this, reading comments from the comment\n"
+- " file or stdin is disabled)\n"
+- " Raw mode (--raw, -R) will read and write comments in utf8,\n"
+- " rather than converting to the user's character set. This is\n"
+- " useful for using vorbiscomment in scripts. However, this is\n"
+- " not sufficient for general round-tripping of comments in all\n"
+- " cases.\n")
++ "\n"
++ " NOTE: Raw mode (--raw, -R) will read and write comments in utf8,\n"
++ " rather than converting to the user's character set. This is\n"
++ " useful for using vorbiscomment in scripts. However, this is\n"
++ " not sufficient for general round-tripping of comments in all\n"
++ " cases.\n")
+
+ );
+ }
Added: trunk/packages/vorbis-tools/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/patches.off/mooch-no_unescaped_dashes_in_manpages.diff 2005-12-22 02:35:43 UTC (rev 8)
@@ -0,0 +1,450 @@
+* Escaped dashes in manpage: Closes: #264365.
+diff -u vorbis-tools-1.0.1/oggenc/man/oggenc.1 vorbis-tools-1.0.1/oggenc/man/oggenc.1
+--- vorbis-tools-1.0.1/oggenc/man/oggenc.1
++++ vorbis-tools-1.0.1/oggenc/man/oggenc.1
+@@ -9,73 +9,73 @@
+ .SH SYNOPSIS
+ .B oggenc
+ [
+-.B -hrQ
++.B \-hrQ
+ ]
+ [
+-.B -B
++.B \-B
+ .I raw input sample size
+ ]
+ [
+-.B -C
++.B \-C
+ .I raw input number of channels
+ ]
+ [
+-.B -R
++.B \-R
+ .I raw input samplerate
+ ]
+ [
+-.B -b
++.B \-b
+ .I nominal bitrate
+ ]
+ [
+-.B -m
++.B \-m
+ .I minimum bitrate
+ ]
+ [
+-.B -M
++.B \-M
+ .I maximum bitrate
+ ]
+ [
+-.B -q
++.B \-q
+ .I quality
+ ]
+ [
+-.B --resample
++.B \-\-resample
+ .I frequency
+ ]
+ [
+-.B --downmix
++.B \-\-downmix
+ ]
+ [
+-.B -s
++.B \-s
+ .I serial
+ ]
+ [
+-.B -o
++.B \-o
+ .I output_file
+ ]
+ [
+-.B -n
++.B \-n
+ .I pattern
+ ]
+ [
+-.B -c
++.B \-c
+ .I extra_comment
+ ]
+ [
+-.B -a
++.B \-a
+ .I artist
+ ]
+ [
+-.B -t
++.B \-t
+ .I title
+ ]
+ [
+-.B -l
++.B \-l
+ .I album
+ ]
+ [
+-.B -G
++.B \-G
+ .I genre
+ ]
+ .I input_files \fR...
+@@ -91,103 +91,103 @@
+ and the Vorbis stream is written to
+ .I stdout
+ unless the
+-.B -o
++.B \-o
+ option is used to redirect the output. By default, disk files are
+ output to Ogg Vorbis files of the same name, with the extension
+ changed to ".ogg". This naming convention can be overridden by the
+-.B -o
++.B \-o
+ option (in the case of one file) or the
+-.B -n
++.B \-n
+ option (in the case of several files). Finally, if none of these
+ are available, the output filename will be the input filename with the
+ extension (that part after the final dot) replaced with ogg, so file.wav
+ will become file.ogg
+
+ .SH OPTIONS
+-.IP "-h, --help"
++.IP "\-h, \-\-help"
+ Show command help.
+-.IP "-r, --raw"
+-Assume input data is raw little-endian audio data with no
++.IP "\-r, \-\-raw"
++Assume input data is raw little\-endian audio data with no
+ header information. If other options are not specified, defaults to 44.1kHz
+ stereo 16 bit. See next three options for how to change this.
+-.IP "-B n, --raw-bits=n"
++.IP "\-B n, \-\-raw\-bits=n"
+ Sets raw mode input sample size in bits. Default is 16.
+-.IP "-C n, --raw-chan=n"
++.IP "\-C n, \-\-raw\-chan=n"
+ Sets raw mode input number of channels. Default is 2.
+-.IP "-R n, --raw-rate=n"
++.IP "\-R n, \-\-raw\-rate=n"
+ Sets raw mode input samplerate. Default is 44100.
+-.IP "--raw-endianness n
++.IP "\-\-raw\-endianness n
+ Sets raw mode endianness to big endian (1) or little endian (0). Default is
+ little endian.
+-.IP "-Q, --quiet"
++.IP "\-Q, \-\-quiet"
+ Quiet mode. No messages are displayed.
+-.IP "-b n, --bitrate=n"
++.IP "\-b n, \-\-bitrate=n"
+ Sets encoding to the bitrate closest to n (in kb/s).
+-.IP "-m n, --min-bitrate=n"
++.IP "\-m n, \-\-min\-bitrate=n"
+ Sets minimum bitrate to n (in kb/s).
+-.IP "-M n, --max-bitrate=n"
++.IP "\-M n, \-\-max\-bitrate=n"
+ Sets maximum bitrate to n (in kb/s).
+-.IP "--managed"
++.IP "\-\-managed"
+ Set bitrate management mode. This turns off the normal VBR encoding, but allows
+ hard or soft bitrate constraints to be enforced by the encoder. This mode is
+ much slower, and may also be lower quality. It is primarily useful for creating
+ files for streaming.
+-.IP "-q n, --quality=n"
+-Sets encoding quality to n, between -1 (low) and 10 (high). This is the default mode of operation, with a default quality level of 3. Fractional quality levels such as 2.5 are permitted. Normal quality range is 0 - 10.
+-.IP "--resample n"
++.IP "\-q n, \-\-quality=n"
++Sets encoding quality to n, between \-1 (low) and 10 (high). This is the default mode of operation, with a default quality level of 3. Fractional quality levels such as 2.5 are permitted. Normal quality range is 0 \- 10.
++.IP "\-\-resample n"
+ Resample input to the given sample rate (in Hz) before encoding. Primarily
+-useful for downsampling for lower-bitrate encoding.
+-.IP "--downmix"
+-Downmix input from stereo to mono (has no effect on non-stereo streams). Useful
+-for lower-bitrate encoding.
+-.IP "--advanced-encode-option optionname=value"
++useful for downsampling for lower\-bitrate encoding.
++.IP "\-\-downmix"
++Downmix input from stereo to mono (has no effect on non\-stereo streams). Useful
++for lower\-bitrate encoding.
++.IP "\-\-advanced\-encode\-option optionname=value"
+ Sets an advanced option. See the Advanced Options section for details.
+-.IP "-s, --serial"
++.IP "\-s, \-\-serial"
+ Forces a specific serial number in the output stream. This is primarily useful for testing.
+-.IP "--discard-comments"
++.IP "\-\-discard\-comments"
+ Prevents comments in FLAC and Ogg FLAC files from being copied to the
+ output Ogg Vorbis file.
+-.IP "-o output_file, --output=output_file"
++.IP "\-o output_file, \-\-output=output_file"
+ Write the Ogg Vorbis stream to
+ .I output_file
+ (only valid if a single input file is specified).
+
+-.IP "-n pattern, --names=pattern"
++.IP "\-n pattern, \-\-names=pattern"
+ Produce filenames as this string, with %g, %a, %l, %n, %t, %d replaced by
+ genre, artist, album, track number, title, and date, respectively (see below
+ for specifying these). Also, %% gives a literal %.
+
+-.IP "-c comment, --comment comment"
++.IP "\-c comment, \-\-comment comment"
+ Add the string
+ .I comment
+ as an extra comment. This may be used multiple times, and all
+ instances will be added to each of the input files specified. The argument
+ should be in the form "tag=value".
+
+-.IP "-a artist, --artist artist"
++.IP "\-a artist, \-\-artist artist"
+ Set the artist comment field in the comments to
+ .I artist.
+
+-.IP "-G genre, --genre genre"
++.IP "\-G genre, \-\-genre genre"
+ Set the genre comment field in the comments to
+ .I genre.
+
+-.IP "-d date, --date date"
++.IP "\-d date, \-\-date date"
+ Sets the date comment field to the given value. This should be the date of recording.
+
+-.IP "-N n, --tracknum n"
++.IP "\-N n, \-\-tracknum n"
+ Sets the track number comment field to the given value.
+
+-.IP "-t title, --title title"
++.IP "\-t title, \-\-title title"
+ Set the track title comment field to
+ .I title.
+
+-.IP "-l album, --album album"
++.IP "\-l album, \-\-album album"
+ Set the album comment field to
+ .I album.
+ .PP
+
+-Note that the \fB-a\fR, \fB-t\fR, and \fB-l\fR options can be given
++Note that the \fB\-a\fR, \fB\-t\fR, and \fB\-l\fR options can be given
+ multiple times. They will be applied, one to each file, in the order
+ given. If there are fewer album, title, or artist comments given than
+ there are input files,
+@@ -198,7 +198,7 @@
+ .SH ADVANCED ENCODER OPTIONS
+
+ Oggenc allows you to set a number of advanced encoder options using the
+-.B --advanced-encode-option
++.B \-\-advanced\-encode\-option
+ option. These are intended for very advanced users only, and should be
+ approached with caution. They may significantly degrade audio quality
+ if misused. Not all these options are currently documented.
+@@ -221,57 +221,57 @@
+
+ Specifying an output filename:
+ .RS
+-oggenc somefile.wav -o out.ogg
++oggenc somefile.wav \-o out.ogg
+ .RE
+ .PP
+
+-Specifying a high-quality encoding averaging 256 kbps (but still VBR).
++Specifying a high\-quality encoding averaging 256 kbps (but still VBR).
+ .RS
+-oggenc infile.wav -b 256 out.ogg
++oggenc infile.wav \-b 256 out.ogg
+ .RE
+ .PP
+
+ Specifying a maximum and average bitrate, and enforcing these.
+ .RS
+-oggenc infile.wav --managed -b 128 -M 160 out.ogg
++oggenc infile.wav \-\-managed \-b 128 \-M 160 out.ogg
+ .RE
+ .PP
+
+ Specifying quality rather than bitrate (to a very high quality mode)
+ .RS
+-oggenc infile.wav -q 6 out.ogg
++oggenc infile.wav \-q 6 out.ogg
+ .RE
+ .PP
+
+ Downsampling and downmixing to 11 kHz mono before encoding.
+ .RS
+-oggenc --resample 11025 --downmix infile.wav -q 1 out.ogg
++oggenc \-\-resample 11025 \-\-downmix infile.wav \-q 1 out.ogg
+ .RE
+ .PP
+
+ Adding some info about the track:
+ .RS
+-oggenc somefile.wav -t "The track title" -a "artist who performed this" -l
+-"name of album" -c
+-"OTHERFIELD=contents of some other field not explictly supported"
++oggenc somefile.wav \-t "The track title" \-a "artist who performed this" \-l
++"name of album" \-c
++"OTHERFIELD=contents of some other field not explicitly supported"
+ .RE
+ .PP
+
+ This encodes the three files, each with the
+ same artist/album tag, but with different title tags on each one. The
+-string given as an argument to -n is used to generate filenames, as shown
++string given as an argument to \-n is used to generate filenames, as shown
+ in the section above. This example gives filenames
+-like "The Tea Party - Touch.ogg":
++like "The Tea Party \- Touch.ogg":
+ .RS
+-oggenc -b 192 -a "The Tea Party" -l "Triptych" -t "Touch" track01.wav -t
+-"Underground" track02.wav -t "Great Big Lie" track03.wav -n "%a - %t.ogg"
++oggenc \-b 192 \-a "The Tea Party" \-l "Triptych" \-t "Touch" track01.wav \-t
++"Underground" track02.wav \-t "Great Big Lie" track03.wav \-n "%a \- %t.ogg"
+ .RE
+ .PP
+
+ Encoding from stdin, to stdout (you can also use the various tagging
+-options, like -t, -a, -l, etc.):
++options, like \-t, \-a, \-l, etc.):
+ .RS
+-oggenc -
++oggenc \-
+ .RE
+ .PP
+
+--- vorbis-tools-1.0.1.orig/oggdec/oggdec.1
++++ vorbis-tools-1.0.1/oggdec/oggdec.1
+@@ -1,60 +1,60 @@
+ .TH "oggdec" "1" "2002 July 03" "" "Vorbis Tools"
+
+ .SH "NAME"
+-oggdec - simple decoder, Ogg Vorbis file to PCM audio file (WAV or RAW).
++oggdec \- simple decoder, Ogg Vorbis file to PCM audio file (WAV or RAW).
+
+ .SH "SYNOPSIS"
+ .B oggdec
+ [
+-.B -Qhv
++.B \-Qhv
+ ] [
+-.B -b bits_per_sample
++.B \-b bits_per_sample
+ ] [
+-.B -e endianness
++.B \-e endianness
+ ] [
+-.B -R
++.B \-R
+ ] [
+-.B -s signedness
++.B \-s signedness
+ ] [
+-.B -o outputfile
++.B \-o outputfile
+ ]
+ .B file ...
+
+ .SH "DESCRIPTION"
+
+ .B oggdec
+-decodes Ogg Vorbis files into PCM-encoded ("uncompressed") audio files, either WAV or RAW format.
++decodes Ogg Vorbis files into PCM\-encoded ("uncompressed") audio files, either WAV or RAW format.
+
+ For each input file,
+ .B oggdec
+ writes to a filename based on the input filename, but with the extension changed to ".wav" or ".raw" as appropriate.
+
+ If the input file is specified as
+-.B "-"
++.B "\-"
+ , then
+ .B oggdec
+ will read from stdin, and write to stdout unless an output filename is specified. Likewise, an output filename of
+-.B -
++.B \-
+ will cause output to be to stdout.
+
+ Writing WAV format to stdout is a bad idea. WAV requires a seekable medium for the header to be rewritten after all the data is written out; stdout is not seekable.
+
+ .SH "OPTIONS"
+-.IP "-q, --quiet"
++.IP "\-q, \-\-quiet"
+ Suppresses program output.
+-.IP "-h, --help"
++.IP "\-h, \-\-help"
+ Print help message.
+-.IP "-v, --version"
++.IP "\-v, \-\-version"
+ Display version information.
+-.IP "-b n, --bits=n"
++.IP "\-b n, \-\-bits=n"
+ Bits per sample. Valid values are 8 or 16.
+-.IP "-e n, --endian=n"
+-Set endianness for 16-bit output. 0 (default) is little-endian (Intel byte order). 1 is big-endian (sane byte order).
+-.IP "-R, --raw"
++.IP "\-e n, \-\-endian=n"
++Set endianness for 16\-bit output. 0 (default) is little\-endian (Intel byte order). 1 is big\-endian (sane byte order).
++.IP "\-R, \-\-raw"
+ Output in raw format. If not specified, writes WAV file (RIFF headers).
+-.IP "-s n, --sign=n"
++.IP "\-s n, \-\-sign=n"
+ Set signedness for output. 0 for unsigned, 1 (default) for signed.
+-.IP "-o filename, --output=filename"
++.IP "\-o filename, \-\-output=filename"
+ Write output to specified filename. This option is only valid if one input [file] is specified.
+
+ .SH "EXAMPLES"
+@@ -62,7 +62,7 @@
+ .B enabler.ogg
+ to
+ .B enabler.wav
+- as little-endian unsigned 16-bit (default options):
++ as little\-endian unsigned 16\-bit (default options):
+ .RS
+ oggdec enabler.ogg
+ .RE
+@@ -71,33 +71,33 @@
+ .B enabler.ogg
+ to
+ .B enabler.raw
+-as headerless little-endian unsigned 16-bit:
++as headerless little\-endian unsigned 16\-bit:
+ .RS
+-oggdec --raw=1 enabler.ogg
++oggdec \-\-raw=1 enabler.ogg
+ .RE
+
+ Decode
+ .B enabler.ogg
+ to
+ .B enabler.crazymonkey
+-as unsigned 8-bit:
++as unsigned 8\-bit:
+ .RS
+-oggdec -b 8 -s 0 -o enabler.crazymonkey enabler.ogg
++oggdec \-b 8 \-s 0 \-o enabler.crazymonkey enabler.ogg
+ .RE
+
+ Decode
+ .B enabler.ogg
+ to
+ .B enabler.raw
+-as big-endian signed 16-bit (any of the following):
++as big\-endian signed 16\-bit (any of the following):
+ .RS
+-oggdec -R -e 1 -b 16 enabler.ogg
++oggdec \-R \-e 1 \-b 16 enabler.ogg
+ .RE
+ .RS
+-oggdec -R -e 1 -b 16 -o enabler.raw - < enabler.ogg
++oggdec \-R \-e 1 \-b 16 \-o enabler.raw \- < enabler.ogg
+ .RE
+ .RS
+-oggdec -R -e 1 -b 16 - < enabler.ogg > enabler.raw
++oggdec \-R \-e 1 \-b 16 \- < enabler.ogg > enabler.raw
+ .RE
+
+ Mass decoding (foo.ogg to foo.wav, bar.ogg to bar.wav, quux.ogg to quux.wav, etc.):
Modified: trunk/packages/vorbis-tools/debian/rules
===================================================================
--- trunk/packages/vorbis-tools/debian/rules 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/rules 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,145 +1,109 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
+#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+###
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
+# Configure arguments
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+confflags = --prefix=/usr --enable-vcut
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+confflags += --build $(DEB_BUILD_GNU_TYPE)
-export CFLAGS = -Wall -g -I/usr/include/speex
+# Only specify --host when cross-compiling
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --host $(DEB_HOST_GNU_TYPE)
+endif
+###
+
+# Directory to make the build on
+
+objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
+
+###
+
+# CFLAGS
+
+CFLAGS = -Wall -g -I/usr/include/speex
+
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+###
+
configure: configure-stamp
configure-stamp:
dh_testdir
- # make build directory
- mkdir $(objdir)
+ ln -sf /usr/share/misc/config.sub .
+ ln -sf /usr/share/misc/config.guess .
- # run configure with build tree $(objdir)
- # change ../configure to ../autogen.sh for CVS build
+ sh debian/do-patches.sh apply
+
+ -mkdir $(objdir)
cd $(objdir) && \
- ../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
- --prefix=/usr
+ env CFLAGS="$(CFLAGS)" ../configure $(confflags)
- touch configure-stamp
+ touch $@
-#Architecture
-build: build-arch build-indep
+#
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+build: build-stamp
+build-stamp: configure-stamp
cd $(objdir) && \
- $(MAKE) debug
-else
- cd $(objdir) && \
$(MAKE)
-endif
- touch build-arch-stamp
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
+ touch $@
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch build-indep-stamp
+#
-debian-clean:
+clean:
dh_testdir
dh_testroot
- dh_clean
+ sh debian/do-patches.sh unapply
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp
+ rm -f configure-stamp build-stamp install-stamp
+ rm -f config.guess config.sub
# Remove build tree
rm -rf $(objdir)
- # if Makefile exists run distclean
- if test -f Makefile; then \
- $(MAKE) distclean; \
- fi
-
- #if test -d CVS; then \
- $(MAKE) cvs-clean ;\
- fi
-
dh_clean
- rm -rf po/*gmo
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
-# dh_clean -k -i
-# dh_installdirs -i
+#
-# dh_install -i --list-missing
-
-install-arch:
+install: install-stamp
+install-stamp:
dh_testdir
dh_testroot
- dh_clean -k -s
- dh_installdirs -s
+ dh_clean
+ dh_installdirs
+ cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ dh_install --list-missing
+ touch $@
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+#
- dh_install -s --list-missing
+binary: binary-arch
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
+binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
@@ -147,13 +111,9 @@
dh_md5sums
dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-indep:
+ @echo "Nothing to do."
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+#
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: configure build clean install binary binary-arch binary-indep
Modified: trunk/packages/vorbis-tools/debian/vorbis-tools.install
===================================================================
--- trunk/packages/vorbis-tools/debian/vorbis-tools.install 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/vorbis-tools.install 2005-12-22 02:35:43 UTC (rev 8)
@@ -4,14 +4,4 @@
debian/tmp/usr/bin/ogginfo
debian/tmp/usr/bin/vcut
debian/tmp/usr/bin/vorbiscomment
-debian/tmp/usr/share/locale/be/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/cs/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/da/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/es/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/fr/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/hr/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/hu/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/nl/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/ro/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/ru/LC_MESSAGES/vorbis-tools.mo
-debian/tmp/usr/share/locale/sv/LC_MESSAGES/vorbis-tools.mo
+debian/tmp/usr/share/locale/*
Modified: trunk/packages/vorbis-tools/debian/vorbis-tools.manpages
===================================================================
--- trunk/packages/vorbis-tools/debian/vorbis-tools.manpages 2005-12-22 02:30:51 UTC (rev 7)
+++ trunk/packages/vorbis-tools/debian/vorbis-tools.manpages 2005-12-22 02:35:43 UTC (rev 8)
@@ -1,6 +1,6 @@
-ogg123/ogg123.1
-oggdec/oggdec.1
-oggenc/man/oggenc.1
-ogginfo/ogginfo.1
-vcut/vcut.1
-vorbiscomment/vorbiscomment.1
+debian/tmp/usr/man/man1/ogg123.1
+debian/tmp/usr/man/man1/oggdec.1
+debian/tmp/usr/man/man1/oggenc.1
+debian/tmp/usr/man/man1/ogginfo.1
+debian/tmp/usr/man/man1/vcut.1
+debian/tmp/usr/man/man1/vorbiscomment.1
More information about the pkg-xiph-commits
mailing list