--- adplug-2.0.1.dfsg.orig/debian/libadplug-dev.install
+++ adplug-2.0.1.dfsg/debian/libadplug-dev.install
@@ -0,0 +1,5 @@
+/usr/include/*
+/usr/lib/*.a
+/usr/lib/*.so
+/usr/lib/pkgconfig/*
+/usr/lib/*.la
--- adplug-2.0.1.dfsg.orig/debian/rules
+++ adplug-2.0.1.dfsg/debian/rules
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: configure patch-stamp
+ dh_testdir
+
+ # Configuring package
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+
+ # Building package
+ $(MAKE)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Cleaning package
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Installing package
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ # Installing lintian overrides
+ for LINTIAN in debian/lintian/*; \
+ do \
+ install -D -m 0644 $$LINTIAN debian/`basename $$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
+ done
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_install --sourcedir=debian/tmp
+ dh_installinfo
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- adplug-2.0.1.dfsg.orig/debian/libadplug0c2a.shlibs
+++ adplug-2.0.1.dfsg/debian/libadplug0c2a.shlibs
@@ -0,0 +1 @@
+libadplug-2.0.1 0 libadplug0c2a (>= 2.0.1-2)
--- adplug-2.0.1.dfsg.orig/debian/changelog
+++ adplug-2.0.1.dfsg/debian/changelog
@@ -0,0 +1,117 @@
+adplug (2.0.1.dfsg-1) unstable; urgency=low
+
+ * QA upload.
+ * Repack upstream tarball to not include test/ directory as it contains
+ non-DFSG compliant samples from proprietary games. (Closes: #532974)
+ * Bump Standards-Version to 3.8.2.
+
+ -- Chris Lamb <lamby@debian.org> Mon, 27 Jul 2009 10:40:47 +0200
+
+adplug (2.0.1-7) unstable; urgency=low
+
+ * QA upload.
+ * Fix FTBFS with gcc-4.3 by fixing missing includes (Closes: #417078).
+ + debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch
+ * No longer ignore “make distclean” errors.
+ * Move the Homepage from the descriptions to a source field.
+ * Bump Standards-Version (no changes needed).
+
+ -- Cyril Brulebois <cyril.brulebois@enst-bretagne.fr> Mon, 17 Mar 2008 02:24:23 +0100
+
+adplug (2.0.1-6) unstable; urgency=low
+
+ * Orphaning package, setting maintainer to the Debian QA Group.
+
+ -- Ana Beatriz Guerrero Lopez <ana@debian.org> Wed, 05 Dec 2007 16:12:15 +0100
+
+adplug (2.0.1-5) unstable; urgency=low
+
+ * New Maintainer. (Closes: #407626)
+
+ -- Gürkan Sengün <gurkan@linuks.mine.nu> Mon, 16 Apr 2007 12:31:08 +0200
+
+adplug (2.0.1-4) unstable; urgency=low
+
+ * Debian QA Group <packages@qa.debian.org>.
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 20 Jan 2007 09:57:00 +0100
+
+adplug (2.0.1-3) unstable; urgency=low
+
+ * Minor cleanups.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 19 Jan 2007 10:14:00 +0100
+
+adplug (2.0.1-2) unstable; urgency=low
+
+ * The previous upload did not take care about the bumped soname, therefore
+ updated the shlibs now. This requires all packages build-depending on adplug
+ to be recompiled against 2.0.1-2. Fortunately, this affects only ocp and
+ adplay*.
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 17 Sep 2006 18:37:00 +0200
+
+adplug (2.0.1-1) unstable; urgency=high
+
+ * New upstream release:
+ - fixes multiple remote stack-based buffer overflows CVE-2006-3582
+ CVE-2006-3581 (Closes: #378279).
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 17 Jul 2006 19:48:00 +0200
+
+adplug (2.0-3) unstable; urgency=low
+
+ * New email address.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 6 Jul 2006 07:17:00 +0200
+
+adplug (2.0-2) unstable; urgency=low
+
+ * Fixed build-depends (Closes: #375713).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Wed, 28 Jun 2006 08:36:00 +0200
+
+adplug (2.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Sun, 25 Jun 2006 12:43:00 +0200
+
+adplug (1.5.1-6) unstable; urgency=low
+
+ * Rebuild and rename due to new libstdc++ configuration (Closes: #339143).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Sun, 20 Nov 2005 17:01:00 +0200
+
+adplug (1.5.1-5) unstable; urgency=low
+
+ * Added patch to update includes of new libbinio1c2 (Closes: #335825).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Sat, 29 Aug 2005 16:49:00 +0200
+
+adplug (1.5.1-4) unstable; urgency=low
+
+ * Recompiled against fixed libbinio1c2 to correct depends (Closes: #321573).
+ * Added override for libadplug0c2 complaining about package name.
+ * Removed unnecessary provides-fields.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Sat, 6 Aug 2005 13:34:00 +0200
+
+adplug (1.5.1-3) unstable; urgency=low
+
+ * C++ ABI change.
+ * bumped policy to 3.6.2.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Fri, 8 Jul 2005 15:18:00 +0200
+
+adplug (1.5.1-2) unstable; urgency=low
+
+ * debian/rules: reverted binary-targets to default (Closes: #312025).
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Sun, 5 Jun 2005 16:52:00 +0100
+
+adplug (1.5.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Daniel Baumann <daniel.baumann@panthera-systems.net> Wed, 11 May 2005 12:38:00 +0200
--- adplug-2.0.1.dfsg.orig/debian/libadplug0c2a.install
+++ adplug-2.0.1.dfsg/debian/libadplug0c2a.install
@@ -0,0 +1 @@
+/usr/lib/*.so.*
--- adplug-2.0.1.dfsg.orig/debian/libadplug0c2a.info
+++ adplug-2.0.1.dfsg/debian/libadplug0c2a.info
@@ -0,0 +1 @@
+/usr/share/info/*
--- adplug-2.0.1.dfsg.orig/debian/copyright
+++ adplug-2.0.1.dfsg/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Daniel Baumann <daniel@debian.org> on
+Wed, 11 May 2005 12:38:00 +0200.
+
+It was downloaded from <http://adplug.sourceforge.net/>.
+
+Upstream Author: Simon Peter <dn.tlp@gmx.net>
+
+License:
+
+ Copyright (C) 1999-2006 Simon Peter <dn.tlp@gmx.net>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General Public License
+can be found in /usr/share/common-licenses/LGPL file.
+
+The Debian packaging is (C) 2005-2007, Daniel Baumann <daniel@debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- adplug-2.0.1.dfsg.orig/debian/adplug-utils.install
+++ adplug-2.0.1.dfsg/debian/adplug-utils.install
@@ -0,0 +1,2 @@
+/usr/bin/*
+/usr/share/man/*
--- adplug-2.0.1.dfsg.orig/debian/libadplug0c2a.docs
+++ adplug-2.0.1.dfsg/debian/libadplug0c2a.docs
@@ -0,0 +1,5 @@
+AUTHORS
+BUGS
+NEWS
+README
+TODO
--- adplug-2.0.1.dfsg.orig/debian/compat
+++ adplug-2.0.1.dfsg/debian/compat
@@ -0,0 +1 @@
+5
--- adplug-2.0.1.dfsg.orig/debian/control
+++ adplug-2.0.1.dfsg/debian/control
@@ -0,0 +1,42 @@
+Source: adplug
+Section: libs
+Priority: optional
+Maintainer: Debian QA Group <packages@qa.debian.org>
+Build-Depends: debhelper (>= 5), dpatch, libbinio-dev, pkg-config
+Standards-Version: 3.8.2
+Homepage: http://adplug.sourceforge.net/
+
+Package: libadplug0c2a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: adplug-utils
+Description: free AdLib sound library
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+
+Package: libadplug-dev
+Section: libdevel
+Architecture: any
+Depends: libadplug0c2a (= ${binary:Version})
+Description: free AdLib sound library (development)
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+ .
+ This package contains the development files.
+
+Package: adplug-utils
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: free AdLib sound library (utils)
+ AdPlug is a free, multi-platform, hardware independent AdLib sound library,
+ mainly written in C++. AdPlug plays sound data, originally created for the
+ AdLib (OPL2) audio board, on top of an OPL2 emulator or by using the real
+ hardware. No OPL2 chip is required for playback.
+ .
+ This package contains additional utilities.
--- adplug-2.0.1.dfsg.orig/debian/lintian/libadplug0c2a
+++ adplug-2.0.1.dfsg/debian/lintian/libadplug0c2a
@@ -0,0 +1 @@
+libadplug0c2a: package-name-doesnt-match-sonames
--- adplug-2.0.1.dfsg.orig/debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch
+++ adplug-2.0.1.dfsg/debian/patches/02-fix-ftbfs-with-gcc-4.3.dpatch
@@ -0,0 +1,216 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-fix-ftbfs-with-gcc-4.3.dpatch by Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
+##
+## DP: Fix missing includes, needed for gcc-4.3 transition.
+
+@DPATCH@
+
+--- a/src/a2m.cpp
++++ b/src/a2m.cpp
+@@ -33,6 +33,8 @@
+
+ #include "a2m.h"
+
++#include <cstring>
++
+ const unsigned int Ca2mLoader::MAXFREQ = 2000,
+ Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY,
+ Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY,
+--- a/src/bmf.cpp
++++ b/src/bmf.cpp
+@@ -43,6 +43,8 @@
+ #include "bmf.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] =
+ {
+ 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3,
+--- a/src/cff.cpp
++++ b/src/cff.cpp
+@@ -28,6 +28,8 @@
+
+ #include "cff.h"
+
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+
+ CPlayer *CcffLoader::factory(Copl *newopl)
+--- a/src/dro.cpp
++++ b/src/dro.cpp
+@@ -27,6 +27,8 @@
+
+ #include "dro.h"
+
++#include <cstring>
++
+ /*** public methods *************************************/
+
+ CPlayer *CdroPlayer::factory(Copl *newopl)
+--- a/src/dtm.cpp
++++ b/src/dtm.cpp
+@@ -24,6 +24,8 @@
+
+ #include "dtm.h"
+
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+
+ CPlayer *CdtmLoader::factory(Copl *newopl)
+--- a/src/fmc.cpp
++++ b/src/fmc.cpp
+@@ -21,6 +21,8 @@
+
+ #include "fmc.h"
+
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+
+ CPlayer *CfmcLoader::factory(Copl *newopl)
+--- a/src/mad.cpp
++++ b/src/mad.cpp
+@@ -21,6 +21,8 @@
+
+ #include "mad.h"
+
++#include <cstring>
++
+ /* -------- Public Methods -------------------------------- */
+
+ CPlayer *CmadLoader::factory(Copl *newopl)
+--- a/src/mkj.cpp
++++ b/src/mkj.cpp
+@@ -24,6 +24,8 @@
+ #include "mkj.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ CPlayer *CmkjPlayer::factory(Copl *newopl)
+ {
+ return new CmkjPlayer(newopl);
+--- a/src/msc.cpp
++++ b/src/msc.cpp
+@@ -24,6 +24,8 @@
+ #include "msc.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = {
+ 'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ',
+ 'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' };
+--- a/src/mtk.cpp
++++ b/src/mtk.cpp
+@@ -21,6 +21,8 @@
+
+ #include "mtk.h"
+
++#include <cstring>
++
+ /*** public methods **************************************/
+
+ CPlayer *CmtkLoader::factory(Copl *newopl)
+--- a/src/protrack.cpp
++++ b/src/protrack.cpp
+@@ -28,6 +28,8 @@
+ #include "protrack.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ #define SPECIALARPLEN 256 // Standard length of special arpeggio lists
+ #define JUMPMARKER 0x80 // Orderlist jump marker
+
+--- a/src/rad.cpp
++++ b/src/rad.cpp
+@@ -24,6 +24,8 @@
+
+ #include "rad.h"
+
++#include <cstring>
++
+ CPlayer *CradLoader::factory(Copl *newopl)
+ {
+ return new CradLoader(newopl);
+--- a/src/rat.cpp
++++ b/src/rat.cpp
+@@ -32,6 +32,8 @@
+ #include "rat.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ const unsigned char CxadratPlayer::rat_adlib_bases[18] =
+ {
+ 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12,
+--- a/src/raw.cpp
++++ b/src/raw.cpp
+@@ -21,6 +21,8 @@
+
+ #include "raw.h"
+
++#include <cstring>
++
+ /*** public methods *************************************/
+
+ CPlayer *CrawPlayer::factory(Copl *newopl)
+--- a/src/rix.cpp
++++ b/src/rix.cpp
+@@ -23,6 +23,9 @@
+ #include "rix.h"
+ #include "debug.h"
+
++#include <cstdlib>
++#include <cstring>
++
+ const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
+ const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
+ const unsigned char CrixPlayer::ad_C0_offs[] = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
+--- a/src/rol.h
++++ b/src/rol.h
+@@ -25,6 +25,7 @@
+
+ #include <vector>
+ #include <string>
++#include <cstring>
+
+ #include "player.h"
+
+--- a/src/s3m.cpp
++++ b/src/s3m.cpp
+@@ -24,6 +24,8 @@
+
+ #include "s3m.h"
+
++#include <cstring>
++
+ const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
+ {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
+
+--- a/src/sa2.cpp
++++ b/src/sa2.cpp
+@@ -25,6 +25,8 @@
+ #include "sa2.h"
+ #include "debug.h"
+
++#include <cstring>
++
+ CPlayer *Csa2Loader::factory(Copl *newopl)
+ {
+ return new Csa2Loader(newopl);
+--- a/src/sng.cpp
++++ b/src/sng.cpp
+@@ -21,6 +21,8 @@
+
+ #include "sng.h"
+
++#include <cstring>
++
+ CPlayer *CsngPlayer::factory(Copl *newopl)
+ {
+ return new CsngPlayer(newopl);
--- adplug-2.0.1.dfsg.orig/debian/patches/03-no-tests.dpatch
+++ adplug-2.0.1.dfsg/debian/patches/03-no-tests.dpatch
@@ -0,0 +1,51 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-no-tests.dpatch by Chris Lamb <lamby@debian.org>
+##
+## DP: Don't run tests; we have stripped that directory from the tarball.
+
+@DPATCH@
+
+diff -urNd adplug-2.0.1.orig/configure adplug-2.0.1/configure
+--- adplug-2.0.1.orig/configure 2009-07-27 11:11:55.000000000 +0200
++++ adplug-2.0.1/configure 2009-07-27 11:13:07.000000000 +0200
+@@ -1528,7 +1528,7 @@
+
+
+
+- ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc"
++ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc"
+
+ am__api_version="1.9"
+ ac_aux_dir=
+@@ -21725,7 +21725,6 @@
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "adplugdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES adplugdb/Makefile" ;;
+- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+ "adplug.pc" ) CONFIG_FILES="$CONFIG_FILES adplug.pc" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+diff -urNd adplug-2.0.1.orig/configure.in adplug-2.0.1/configure.in
+--- adplug-2.0.1.orig/configure.in 2009-07-27 11:11:55.000000000 +0200
++++ adplug-2.0.1/configure.in 2009-07-27 11:12:29.000000000 +0200
+@@ -1,7 +1,7 @@
+ # Tell autoconf we're compiling a C++ library, using automake & libtool
+ AC_INIT(adplug,2.0.1)
+ AC_CONFIG_SRCDIR(src/adplug.cpp)
+-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc])
++AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc])
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AM_PROG_LIBTOOL
+diff -urNd adplug-2.0.1.orig/Makefile.in adplug-2.0.1/Makefile.in
+--- adplug-2.0.1.orig/Makefile.in 2009-07-27 11:11:55.000000000 +0200
++++ adplug-2.0.1/Makefile.in 2009-07-27 11:12:18.000000000 +0200
+@@ -185,7 +185,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = src doc adplugdb test
++SUBDIRS = src doc adplugdb
+ EXTRA_DIST = adplug.spec adplug.qpg BUGS adplug.pc.in
+ AUTOMAKE_OPTIONS = dist-bzip2
+ pkgconfigdir = $(libdir)/pkgconfig
--- adplug-2.0.1.dfsg.orig/debian/patches/00list
+++ adplug-2.0.1.dfsg/debian/patches/00list
@@ -0,0 +1,3 @@
+01-include
+02-fix-ftbfs-with-gcc-4.3.dpatch
+03-no-tests.dpatch
--- adplug-2.0.1.dfsg.orig/debian/patches/01-include.dpatch
+++ adplug-2.0.1.dfsg/debian/patches/01-include.dpatch
@@ -0,0 +1,95 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-include.dpatch by Daniel Baumann <daniel@debian.org>
+##
+## DP: Updates includes for libbinio 1.4.1.
+
+@DPATCH@
+
+diff -Naur adplug-1.5.1.orig/adplugdb/adplugdb.cpp adplug-1.5.1/adplugdb/adplugdb.cpp
+--- adplug-1.5.1.orig/adplugdb/adplugdb.cpp 2004-08-08 19:20:07.000000000 +0000
++++ adplug-1.5.1/adplugdb/adplugdb.cpp 2005-10-29 15:01:35.233532720 +0000
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+ #include <string>
+ #include <iostream>
+
+diff -Naur adplug-1.5.1.orig/src/adplug.cpp adplug-1.5.1/src/adplug.cpp
+--- adplug-1.5.1.orig/src/adplug.cpp 2005-05-12 16:48:10.000000000 +0000
++++ adplug-1.5.1/src/adplug.cpp 2005-10-29 15:01:45.570961192 +0000
+@@ -20,7 +20,7 @@
+ */
+
+ #include <string>
+-#include <binfile.h>
++#include <libbinio/binfile.h>
+
+ #include "adplug.h"
+ #include "debug.h"
+diff -Naur adplug-1.5.1.orig/src/database.cpp adplug-1.5.1/src/database.cpp
+--- adplug-1.5.1.orig/src/database.cpp 2003-03-01 18:51:59.000000000 +0000
++++ adplug-1.5.1/src/database.cpp 2005-10-29 15:02:52.226827960 +0000
+@@ -21,8 +21,8 @@
+ * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+ */
+
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+ #include <string.h>
+
+ #include "database.h"
+diff -Naur adplug-1.5.1.orig/src/database.h adplug-1.5.1/src/database.h
+--- adplug-1.5.1.orig/src/database.h 2003-03-01 18:51:59.000000000 +0000
++++ adplug-1.5.1/src/database.h 2005-10-29 15:02:36.282251904 +0000
+@@ -26,7 +26,7 @@
+
+ #include <iostream>
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+
+ class CAdPlugDatabase
+ {
+diff -Naur adplug-1.5.1.orig/src/dmo.cpp adplug-1.5.1/src/dmo.cpp
+--- adplug-1.5.1.orig/src/dmo.cpp 2004-09-02 19:48:12.000000000 +0000
++++ adplug-1.5.1/src/dmo.cpp 2005-10-29 15:03:10.603034352 +0000
+@@ -26,7 +26,7 @@
+ */
+
+ #include <string.h>
+-#include <binstr.h>
++#include <libbinio/binstr.h>
+
+ #include "dmo.h"
+ #include "debug.h"
+diff -Naur adplug-1.5.1.orig/src/fprovide.cpp adplug-1.5.1/src/fprovide.cpp
+--- adplug-1.5.1.orig/src/fprovide.cpp 2003-02-17 16:42:50.000000000 +0000
++++ adplug-1.5.1/src/fprovide.cpp 2005-10-29 15:02:43.765114336 +0000
+@@ -20,8 +20,8 @@
+ */
+
+ #include <string.h>
+-#include <binio.h>
+-#include <binfile.h>
++#include <libbinio/binio.h>
++#include <libbinio/binfile.h>
+
+ #include "fprovide.h"
+
+diff -Naur adplug-1.5.1.orig/src/fprovide.h adplug-1.5.1/src/fprovide.h
+--- adplug-1.5.1.orig/src/fprovide.h 2003-01-28 13:34:35.000000000 +0000
++++ adplug-1.5.1/src/fprovide.h 2005-10-29 15:02:27.742550136 +0000
+@@ -23,7 +23,7 @@
+ #define H_ADPLUG_FILEPROVIDER
+
+ #include <string>
+-#include <binio.h>
++#include <libbinio/binio.h>
+
+ class CFileProvider
+ {