#! /bin/sh /usr/share/dpatch/dpatch-run
## 11_gxx43.dpatch.dpatch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
only in patch2:
unchanged:
--- aptitude-0.4.6.1.orig/tests/Makefile.am
+++ aptitude-0.4.6.1/tests/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
+INCLUDES = -Wall $(WERROR) -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/generic/apt/libgeneric-apt.a $(top_builddir)/src/generic/problemresolver/dummy_universe.o $(top_builddir)/src/generic/util/libgeneric-util.a $(top_builddir)/src/vscreen/libvscreen.a -lcppunit
 
 check_PROGRAMS = test
only in patch2:
unchanged:
--- aptitude-0.4.6.1.orig/tests/Makefile.in
+++ aptitude-0.4.6.1/tests/Makefile.in
@@ -202,7 +202,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
+INCLUDES = -Wall $(WERROR) -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
 LDADD = $(top_builddir)/src/generic/apt/libgeneric-apt.a $(top_builddir)/src/generic/problemresolver/dummy_universe.o $(top_builddir)/src/generic/util/libgeneric-util.a $(top_builddir)/src/vscreen/libvscreen.a -lcppunit
 TESTS = test
 EXTRADIST = data
only in patch2:
unchanged:
--- aptitude-0.4.6.1.orig/tests/main.cc
+++ aptitude-0.4.6.1/tests/main.cc
@@ -20,7 +20,7 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
 
-int main(int argc, char **argv[])
+int main(int argc, char *argv[])
 {
   CppUnit::TextUi::TestRunner runner;
   CppUnit::TestFactoryRegistry &registry =
only in patch2:
unchanged:
--- aptitude-0.4.6.1.orig/tests/test_temp.cc
+++ aptitude-0.4.6.1/tests/test_temp.cc
@@ -26,6 +26,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cstdlib>
+#include <cstring>
 
 #define ASSERT_STAT(s, buf) \
   do \