--- Begin Message ---
Package: vorbis-tools
Version: 1.1.1-5
hi... thanks for trying to fix bug#359068 ... but unfortunately your fix
didn't work :) i think after seeing the patches below you might want to
consider the easy fix i suggested in the bug... changing CFLAGS directly.
there are a few problems... one is that you didn't run autoheader after
the AC_SYS_LARGEFILE change -- so config.h.in doesn't have the necessary
definitions.
but that's not enough ...because _FILE_OFFSET_BITS=64 has to be defined before
<features.h> is included, and every system header file includes
<features.h>. so you have to #include <config.h> at the top of every C
file *before* any system headers.
for kicks (i wanted to learn quilt), i've done the work required to use
AC_SYS_LARGEFILE... it's ugly... your call.
hmm i wonder the best way to include two quilt patches here... i'm gonna
use shar, sorry. there are two patches... doesn't really matter the order
you apply them in (and really i only split them up because i wanted to
learn quilt).
thanks
-dean
#!/bin/sh
# This is a shell archive (produced by GNU sharutils 4.2.1).
# To extract the files from this archive, save it to some FILE, remove
# everything before the `!/bin/sh' line above, then type `sh FILE'.
#
# Made on 2006-04-23 18:14 PDT by <[EMAIL PROTECTED]>.
# Source directory was `/home/dean/tmp/vorbis-tools/vorbis-tools-1.1.1'.
#
# Existing files will *not* be overwritten unless `-c' is specified.
#
# This shar contains:
# length mode name
# ------ ---------- ------------------------------------------
# 10408 -rw-r--r-- debian/patches/config_h_cleanup
# 15171 -rw-r--r-- debian/patches/include_config_h_everywhere
#
save_IFS="${IFS}"
IFS="${IFS}:"
gettext_dir=FAILED
locale_dir=FAILED
first_param="$1"
for dir in $PATH
do
if test "$gettext_dir" = FAILED && test -f $dir/gettext \
&& ($dir/gettext --version >/dev/null 2>&1)
then
set `$dir/gettext --version 2>&1`
if test "$3" = GNU
then
gettext_dir=$dir
fi
fi
if test "$locale_dir" = FAILED && test -f $dir/shar \
&& ($dir/shar --print-text-domain-dir >/dev/null 2>&1)
then
locale_dir=`$dir/shar --print-text-domain-dir`
fi
done
IFS="$save_IFS"
if test "$locale_dir" = FAILED || test "$gettext_dir" = FAILED
then
echo=echo
else
TEXTDOMAINDIR=$locale_dir
export TEXTDOMAINDIR
TEXTDOMAIN=sharutils
export TEXTDOMAIN
echo="$gettext_dir/gettext -s"
fi
if touch -am -t 200112312359.59 $$.touch >/dev/null 2>&1 && test ! -f
200112312359.59 -a -f $$.touch; then
shar_touch='touch -am -t $1$2$3$4$5$6.$7 "$8"'
elif touch -am 123123592001.59 $$.touch >/dev/null 2>&1 && test ! -f
123123592001.59 -a ! -f 123123592001.5 -a -f $$.touch; then
shar_touch='touch -am $3$4$5$6$1$2.$7 "$8"'
elif touch -am 1231235901 $$.touch >/dev/null 2>&1 && test ! -f 1231235901 -a
-f $$.touch; then
shar_touch='touch -am $3$4$5$6$2 "$8"'
else
shar_touch=:
echo
$echo 'WARNING: not restoring timestamps. Consider getting and'
$echo "installing GNU \`touch', distributed in GNU File Utilities..."
echo
fi
rm -f 200112312359.59 123123592001.59 123123592001.5 1231235901 $$.touch
#
if mkdir _sh15409; then
$echo 'x -' 'creating lock directory'
else
$echo 'failed to create lock directory'
exit 1
fi
# ============= debian/patches/config_h_cleanup ==============
if test ! -d 'debian'; then
$echo 'x -' 'creating directory' 'debian'
mkdir 'debian'
fi
if test ! -d 'debian/patches'; then
$echo 'x -' 'creating directory' 'debian/patches'
mkdir 'debian/patches'
fi
if test -f 'debian/patches/config_h_cleanup' && test "$first_param" != -c; then
$echo 'x -' SKIPPING 'debian/patches/config_h_cleanup' '(file already exists)'
else
$echo 'x -' extracting 'debian/patches/config_h_cleanup' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'debian/patches/config_h_cleanup' &&
need to re-run autoheader after adding AC_SYS_LARGEFILE ... otherwise
the required definitions are missing from config.h.in.
X
also there's an unnecessary/confusing copy of config.h at the top-level --
it's not necessary now that all building occurs in a subdir... so remove
it to avoid confusion/problems.
X
-dean
Index: vorbis-tools-1.1.1/config.h
===================================================================
--- vorbis-tools-1.1.1.orig/config.h 2006-04-23 18:03:41.846607837 -0700
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,311 +0,0 @@
-/* config.h. Generated by configure. */
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if translation of program messages to the user's native
- language is requested. */
-#define ENABLE_NLS 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#define HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the <argz.h> header file. */
-#define HAVE_ARGZ_H 1
-
-/* Define to 1 if you have the `asprintf' function. */
-#define HAVE_ASPRINTF 1
-
-/* Define to 1 if you have the `atexit' function. */
-#define HAVE_ATEXIT 1
-
-/* Define if you have libcurl. */
-#define HAVE_CURL 1
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
- */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
- don't. */
-#define HAVE_DECL_FEOF_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
- you don't. */
-#define HAVE_DECL_FGETS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
- don't. */
-#define HAVE_DECL_GETC_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
- don't. */
-#define HAVE_DECL__SNPRINTF 0
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
- don't. */
-#define HAVE_DECL__SNWPRINTF 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `dlopen' function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the `fwprintf' function. */
-#define HAVE_FWPRINTF 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-#define HAVE_GETEGID 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
-/* Define if you have the iconv() function. */
-#define HAVE_ICONV 1
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_INTMAX_T 1
-
-/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
- declares uintmax_t. */
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Defined if we have libFLAC */
-#define HAVE_LIBFLAC 1
-
-/* Defined if we have libspeex */
-#define HAVE_LIBSPEEX 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the 'long double' type. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you have the 'long long' type. */
-#define HAVE_LONG_LONG 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-#define HAVE_MEMPCPY 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `munmap' function. */
-#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the <nl_types.h> header file. */
-#define HAVE_NL_TYPES_H 1
-
-/* Define to 1 if you have the `on_exit' function. */
-#define HAVE_ON_EXIT 1
-
-/* Define if your printf() function supports format strings with positions. */
-#define HAVE_POSIX_PRINTF 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
- uintmax_t. */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-#define HAVE_STPCPY 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `tsearch' function. */
-#define HAVE_TSEARCH 1
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_UINTMAX_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the 'unsigned long long' type. */
-#define HAVE_UNSIGNED_LONG_LONG 1
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* Define if you have the 'wint_t' type. */
-#define HAVE_WINT_T 1
-
-/* Define to 1 if you have the `__argz_count' function. */
-#define HAVE___ARGZ_COUNT 1
-
-/* Define to 1 if you have the `__argz_next' function. */
-#define HAVE___ARGZ_NEXT 1
-
-/* Define to 1 if you have the `__argz_stringify' function. */
-#define HAVE___ARGZ_STRINGIFY 1
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-#define HAVE___FSETLOCKING 1
-
-/* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#define INTDIV0_RAISES_SIGFPE 0
-
-/* Name of package */
-#define PACKAGE "vorbis-tools"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-/* #undef PRI_MACROS_BROKEN */
-
-/* Define to the necessary symbol if this constant uses a non-standard name on
- your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
- it. */
-/* #undef SIZE_MAX */
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.1.1"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define as the type of the result of subtracting two pointers, if the system
- doesn't define it. */
-/* #undef ptrdiff_t */
-
-/* Define to empty if the C compiler doesn't support this keyword. */
-/* #undef signed */
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
- <inttypes.h> don't define. */
-/* #undef uintmax_t */
Index: vorbis-tools-1.1.1/config.h.in
===================================================================
--- vorbis-tools-1.1.1.orig/config.h.in 2006-04-23 18:03:41.931601837 -0700
+++ vorbis-tools-1.1.1/config.h.in 2006-04-23 18:03:49.249085330 -0700
@@ -283,6 +283,12 @@
X /* Version number of package */
X #undef VERSION
X
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
X /* Define to empty if `const' does not conform to ANSI C. */
X #undef const
X
SHAR_EOF
(set 20 06 04 23 18 05 11 'debian/patches/config_h_cleanup'; eval
"$shar_touch") &&
chmod 0644 'debian/patches/config_h_cleanup' ||
$echo 'restore of' 'debian/patches/config_h_cleanup' 'failed'
if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'debian/patches/config_h_cleanup:' 'MD5 check failed'
414817aea08dd510649c596f9e6e666f debian/patches/config_h_cleanup
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c <
'debian/patches/config_h_cleanup'`"
test 10408 -eq "$shar_count" ||
$echo 'debian/patches/config_h_cleanup:' 'original size' '10408,' 'current
size' "$shar_count!"
fi
fi
# ============= debian/patches/include_config_h_everywhere ==============
if test -f 'debian/patches/include_config_h_everywhere' && test "$first_param"
!= -c; then
$echo 'x -' SKIPPING 'debian/patches/include_config_h_everywhere' '(file
already exists)'
else
$echo 'x -' extracting 'debian/patches/include_config_h_everywhere' '(text)'
sed 's/^X//' << 'SHAR_EOF' > 'debian/patches/include_config_h_everywhere' &&
the annoying thing about config.h is that it needs to be included
everywhere... and if _FILE_OFFSET_BITS is defined in config.h then it
needs to be included before any system headers.
X
-dean
Index: vorbis-tools-1.1.1/ogg123/audio.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/audio.c 2006-04-23 17:53:43.850697817
-0700
+++ vorbis-tools-1.1.1/ogg123/audio.c 2006-04-23 17:55:36.461306094 -0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <string.h>
X #include <limits.h>
Index: vorbis-tools-1.1.1/ogg123/buffer.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/buffer.c 2006-04-23 17:53:43.922693754
-0700
+++ vorbis-tools-1.1.1/ogg123/buffer.c 2006-04-23 17:55:36.464305923 -0700
@@ -15,6 +15,9 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <sys/types.h>
X #include <sys/wait.h>
Index: vorbis-tools-1.1.1/ogg123/callbacks.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/callbacks.c 2006-04-23 17:53:43.955691892
-0700
+++ vorbis-tools-1.1.1/ogg123/callbacks.c 2006-04-23 17:55:36.466305808
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <string.h>
X
Index: vorbis-tools-1.1.1/ogg123/cfgfile_options.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/cfgfile_options.c 2006-04-23
17:53:43.988690029 -0700
+++ vorbis-tools-1.1.1/ogg123/cfgfile_options.c 2006-04-23 17:55:36.470305580
-0700
@@ -20,6 +20,10 @@
X * function for your platform / compiler.
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include <stdio.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/cmdline_options.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/cmdline_options.c 2006-04-23
17:53:44.018688336 -0700
+++ vorbis-tools-1.1.1/ogg123/cmdline_options.c 2006-04-23 17:55:36.472305466
-0700
@@ -15,14 +15,14 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
X #include <ao/ao.h>
X
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
X #include "getopt.h"
X #include "cmdline_options.h"
X #include "status.h"
Index: vorbis-tools-1.1.1/ogg123/easyflac.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/easyflac.c 2006-04-23 17:53:44.051686474
-0700
+++ vorbis-tools-1.1.1/ogg123/easyflac.c 2006-04-23 17:55:36.474305352
-0700
@@ -33,6 +33,10 @@
X *
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include "easyflac.h"
X
Index: vorbis-tools-1.1.1/ogg123/file_transport.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/file_transport.c 2006-04-23
17:55:35.278373604 -0700
+++ vorbis-tools-1.1.1/ogg123/file_transport.c 2006-04-23 17:55:36.475305295
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/flac_format.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/flac_format.c 2006-04-23
17:53:44.116682805 -0700
+++ vorbis-tools-1.1.1/ogg123/flac_format.c 2006-04-23 17:55:36.477305181
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include <stdio.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/format.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/format.c 2006-04-23 17:53:44.151680830
-0700
+++ vorbis-tools-1.1.1/ogg123/format.c 2006-04-23 17:55:36.478305124 -0700
@@ -15,12 +15,13 @@
X
X ********************************************************************/
X
-#include <stdio.h>
-#include <string.h>
-
X #ifdef HAVE_CONFIG_H
X #include "config.h"
X #endif
+
+#include <stdio.h>
+#include <string.h>
+
X #include "transport.h"
X #include "format.h"
X #include "i18n.h"
Index: vorbis-tools-1.1.1/ogg123/ogg123.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/ogg123.c 2006-04-23 17:55:36.405309290
-0700
+++ vorbis-tools-1.1.1/ogg123/ogg123.c 2006-04-23 17:55:36.480305009 -0700
@@ -18,6 +18,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <sys/types.h>
X #include <string.h>
X #include <stdlib.h>
Index: vorbis-tools-1.1.1/ogg123/oggvorbis_format.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/oggvorbis_format.c 2006-04-23
17:53:44.248675355 -0700
+++ vorbis-tools-1.1.1/ogg123/oggvorbis_format.c 2006-04-23
17:55:36.482304895 -0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/playlist.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/playlist.c 2006-04-23 17:53:44.278673662
-0700
+++ vorbis-tools-1.1.1/ogg123/playlist.c 2006-04-23 17:55:36.483304838
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/speex_format.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/speex_format.c 2006-04-23
17:53:44.313671686 -0700
+++ vorbis-tools-1.1.1/ogg123/speex_format.c 2006-04-23 17:55:36.485304724
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogg123/status.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/status.c 2006-04-23 17:55:36.408309119
-0700
+++ vorbis-tools-1.1.1/ogg123/status.c 2006-04-23 17:55:36.488304553 -0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <pthread.h>
Index: vorbis-tools-1.1.1/ogg123/transport.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/transport.c 2006-04-23 17:53:44.377668074
-0700
+++ vorbis-tools-1.1.1/ogg123/transport.c 2006-04-23 17:55:36.490304439
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <string.h>
X
Index: vorbis-tools-1.1.1/ogg123/vorbis_comments.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogg123/vorbis_comments.c 2006-04-23
17:53:44.409666268 -0700
+++ vorbis-tools-1.1.1/ogg123/vorbis_comments.c 2006-04-23 17:55:36.491304382
-0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/oggdec/oggdec.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggdec/oggdec.c 2006-04-23 17:53:43.817699680
-0700
+++ vorbis-tools-1.1.1/oggdec/oggdec.c 2006-04-23 17:55:36.493304268 -0700
@@ -7,6 +7,10 @@
X *
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include <stdio.h>
X #include <getopt.h>
Index: vorbis-tools-1.1.1/oggenc/audio.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/audio.c 2006-04-23 17:53:43.583712886
-0700
+++ vorbis-tools-1.1.1/oggenc/audio.c 2006-04-23 17:55:36.495304153 -0700
@@ -8,6 +8,9 @@
X ** AIFF/AIFC support from OggSquish, (c) 1994-1996 Monty <[EMAIL PROTECTED]>
X **/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <stdlib.h>
X #include <stdio.h>
@@ -15,10 +18,6 @@
X #include <sys/types.h>
X #include <math.h>
X
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
X #include "audio.h"
X #include "platform.h"
X #include "i18n.h"
Index: vorbis-tools-1.1.1/oggenc/easyflac.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/easyflac.c 2006-04-23 17:53:43.613711192
-0700
+++ vorbis-tools-1.1.1/oggenc/easyflac.c 2006-04-23 17:55:36.497304039
-0700
@@ -33,6 +33,10 @@
X *
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include "easyflac.h"
X
Index: vorbis-tools-1.1.1/oggenc/encode.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/encode.c 2006-04-23 17:53:43.644709443
-0700
+++ vorbis-tools-1.1.1/oggenc/encode.c 2006-04-23 17:55:36.499303925 -0700
@@ -9,6 +9,9 @@
X ** and libvorbis examples, (c) Monty <[EMAIL PROTECTED]>
X **/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <stdlib.h>
X #include <stdio.h>
Index: vorbis-tools-1.1.1/oggenc/flac.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/flac.c 2006-04-23 17:53:43.680707411
-0700
+++ vorbis-tools-1.1.1/oggenc/flac.c 2006-04-23 17:55:36.500303868 -0700
@@ -7,6 +7,9 @@
X **
X **/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <stdlib.h>
X #include <stdio.h>
Index: vorbis-tools-1.1.1/oggenc/oggenc.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/oggenc.c 2006-04-23 17:55:35.500360935
-0700
+++ vorbis-tools-1.1.1/oggenc/oggenc.c 2006-04-23 17:55:36.503303697 -0700
@@ -9,6 +9,10 @@
X * and libvorbis examples, (c) Monty <[EMAIL PROTECTED]>
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include <stdio.h>
X #include <math.h>
Index: vorbis-tools-1.1.1/oggenc/platform.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/platform.c 2006-04-23 17:53:43.746703687
-0700
+++ vorbis-tools-1.1.1/oggenc/platform.c 2006-04-23 17:55:36.504303640
-0700
@@ -11,6 +11,9 @@
X
X /* Platform support routines - win32, OS/2, unix */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include "platform.h"
X #include "encode.h"
Index: vorbis-tools-1.1.1/oggenc/resample.c
===================================================================
--- vorbis-tools-1.1.1.orig/oggenc/resample.c 2006-04-23 17:53:43.782701655
-0700
+++ vorbis-tools-1.1.1/oggenc/resample.c 2006-04-23 17:55:36.522302613
-0700
@@ -1,5 +1,9 @@
X /* resample.c: see resample.h for interesting stuff */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <math.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/ogginfo/ogginfo2.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogginfo/ogginfo2.c 2006-04-23 17:53:44.778645441
-0700
+++ vorbis-tools-1.1.1/ogginfo/ogginfo2.c 2006-04-23 17:55:36.525302441
-0700
@@ -6,6 +6,9 @@
X * Licensed under the GNU GPL, distributed with this program.
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <stdio.h>
X #include <stdlib.h>
Index: vorbis-tools-1.1.1/ogginfo/theora.c
===================================================================
--- vorbis-tools-1.1.1.orig/ogginfo/theora.c 2006-04-23 17:53:44.811643579
-0700
+++ vorbis-tools-1.1.1/ogginfo/theora.c 2006-04-23 17:55:36.527302327 -0700
@@ -15,6 +15,10 @@
X
X ********************************************************************/
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdlib.h>
X #include <string.h>
X #include "theora.h"
Index: vorbis-tools-1.1.1/share/charset_test.c
===================================================================
--- vorbis-tools-1.1.1.orig/share/charset_test.c 2006-04-23
17:53:44.571657124 -0700
+++ vorbis-tools-1.1.1/share/charset_test.c 2006-04-23 17:55:36.528302270
-0700
@@ -16,6 +16,10 @@
X * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <assert.h>
X #include <string.h>
X
Index: vorbis-tools-1.1.1/share/makemap.c
===================================================================
--- vorbis-tools-1.1.1.orig/share/makemap.c 2006-04-23 17:53:44.706649505
-0700
+++ vorbis-tools-1.1.1/share/makemap.c 2006-04-23 17:55:36.530302156 -0700
@@ -16,6 +16,10 @@
X * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <errno.h>
X #include <iconv.h>
X #include <stdio.h>
Index: vorbis-tools-1.1.1/vcut/vcut.c
===================================================================
--- vorbis-tools-1.1.1.orig/vcut/vcut.c 2006-04-23 17:53:44.442664405 -0700
+++ vorbis-tools-1.1.1/vcut/vcut.c 2006-04-23 17:55:36.531302099 -0700
@@ -10,6 +10,10 @@
X * last modified: $Id: vcut.c,v 1.9 2003/09/03 07:58:05 calc Exp $
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <ogg/ogg.h>
Index: vorbis-tools-1.1.1/vorbiscomment/vcedit.c
===================================================================
--- vorbis-tools-1.1.1.orig/vorbiscomment/vcedit.c 2006-04-23
17:53:44.473662656 -0700
+++ vorbis-tools-1.1.1/vorbiscomment/vcedit.c 2006-04-23 17:55:36.534301928
-0700
@@ -9,6 +9,10 @@
X * last modified: $Id: vcedit.c,v 1.23 2003/09/03 07:58:05 calc Exp $
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
Index: vorbis-tools-1.1.1/vorbiscomment/vcomment.c
===================================================================
--- vorbis-tools-1.1.1.orig/vorbiscomment/vcomment.c 2006-04-23
17:55:35.331370579 -0700
+++ vorbis-tools-1.1.1/vorbiscomment/vcomment.c 2006-04-23 17:55:36.536301814
-0700
@@ -8,16 +8,15 @@
X * Of limited usability on its own, but could be useful.
X */
X
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
X
X #include <stdio.h>
X #include <string.h>
X #include <stdlib.h>
X #include <locale.h>
X
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
X #include "getopt.h"
X #include "utf8.h"
X #include "i18n.h"
SHAR_EOF
(set 20 06 04 23 18 05 29 'debian/patches/include_config_h_everywhere'; eval
"$shar_touch") &&
chmod 0644 'debian/patches/include_config_h_everywhere' ||
$echo 'restore of' 'debian/patches/include_config_h_everywhere' 'failed'
if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
&& ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
md5sum -c << SHAR_EOF >/dev/null 2>&1 \
|| $echo 'debian/patches/include_config_h_everywhere:' 'MD5 check failed'
a1c45f97006578c540ce317b3fb9d7fc debian/patches/include_config_h_everywhere
SHAR_EOF
else
shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c <
'debian/patches/include_config_h_everywhere'`"
test 15171 -eq "$shar_count" ||
$echo 'debian/patches/include_config_h_everywhere:' 'original size'
'15171,' 'current size' "$shar_count!"
fi
fi
rm -fr _sh15409
exit 0
--- End Message ---
