Attached is the full diff for the changes made in the two NMUs. The package now builds with gcc-4.3.
-- James GPG Key: 1024D/61326D40 2003-09-02 James Vega <[EMAIL PROTECTED]>
diff -Naur debian-xcontrol-0.0.2~pre1/debian/changelog debian-xcontrol-0.0.2~pre1+nmu2/debian/changelog
--- debian-xcontrol-0.0.2~pre1/debian/changelog 2007-09-09 16:59:22.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/debian/changelog 2008-04-26 17:38:58.000000000 -0400
@@ -1,3 +1,19 @@
+debian-xcontrol (0.0.2~pre1+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc-4.3. Based on a patch from Kumar Appaiah.
+ (Closes: 474530)
+
+ -- James Vega <[EMAIL PROTECTED]> Sat, 26 Apr 2008 17:30:45 -0400
+
+debian-xcontrol (0.0.2~pre1+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added cstdlib to includes for src/architecture.cc as suggested by Kumar
+ Appaiah (Closes: #455673)
+
+ -- Alexander Schmehl <[EMAIL PROTECTED]> Sun, 06 Apr 2008 12:53:42 +0200
+
debian-xcontrol (0.0.2~pre1) unstable; urgency=low
* Added rudimentary xdpkg-checkbuilddeps (APT based)
diff -Naur debian-xcontrol-0.0.2~pre1/include/sjr/deb822.h debian-xcontrol-0.0.2~pre1+nmu2/include/sjr/deb822.h
--- debian-xcontrol-0.0.2~pre1/include/sjr/deb822.h 2007-08-16 15:38:18.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/include/sjr/deb822.h 2008-04-26 17:29:28.000000000 -0400
@@ -47,8 +47,8 @@
class pair
{
public:
- typedef key<CharT_, Traits_> key_type;
- typedef value<CharT_, Traits_> value_type;
+ typedef sjr::deb822::key<CharT_, Traits_> key_type;
+ typedef sjr::deb822::value<CharT_, Traits_> value_type;
key_type key;
value_type value;
diff -Naur debian-xcontrol-0.0.2~pre1/src/architecture.cc debian-xcontrol-0.0.2~pre1+nmu2/src/architecture.cc
--- debian-xcontrol-0.0.2~pre1/src/architecture.cc 2007-08-18 22:12:14.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/src/architecture.cc 2008-04-06 06:56:13.000000000 -0400
@@ -2,6 +2,8 @@
#include <config.h>
#endif
+#include <cstdlib>
+
#include "architecture.h"
#include "command.h"
diff -Naur debian-xcontrol-0.0.2~pre1/src/attribute.h debian-xcontrol-0.0.2~pre1+nmu2/src/attribute.h
--- debian-xcontrol-0.0.2~pre1/src/attribute.h 2007-08-16 14:10:18.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/src/attribute.h 2008-04-26 17:26:45.000000000 -0400
@@ -2,6 +2,7 @@
#define xcontrol_attribute_h_ 1
#include <stdexcept>
+#include <memory>
template<typename Visible_>
class attribute
diff -Naur debian-xcontrol-0.0.2~pre1/src/binary_section.h debian-xcontrol-0.0.2~pre1+nmu2/src/binary_section.h
--- debian-xcontrol-0.0.2~pre1/src/binary_section.h 2007-09-09 16:04:10.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/src/binary_section.h 2008-04-26 17:25:57.000000000 -0400
@@ -16,7 +16,7 @@
typedef std::string attribute_selector_type;
- typedef attribute<std::string> attribute;
+ typedef ::attribute<std::string> attribute;
attribute operator[](attribute_selector_type const &);
diff -Naur debian-xcontrol-0.0.2~pre1/src/command.cc debian-xcontrol-0.0.2~pre1+nmu2/src/command.cc
--- debian-xcontrol-0.0.2~pre1/src/command.cc 2007-08-18 21:23:49.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/src/command.cc 2008-04-26 17:27:23.000000000 -0400
@@ -9,6 +9,7 @@
#include <algorithm>
#include <cerrno>
+#include <cstring>
extern "C" {
#include <sys/types.h>
diff -Naur debian-xcontrol-0.0.2~pre1/src/source_section.h debian-xcontrol-0.0.2~pre1+nmu2/src/source_section.h
--- debian-xcontrol-0.0.2~pre1/src/source_section.h 2007-08-16 15:50:47.000000000 -0400
+++ debian-xcontrol-0.0.2~pre1+nmu2/src/source_section.h 2008-04-26 17:27:40.000000000 -0400
@@ -14,7 +14,7 @@
public:
source_section(package_name const &);
- typedef attribute<std::string> attribute;
+ typedef ::attribute<std::string> attribute;
typedef std::string attribute_selector_type;
signature.asc
Description: Digital signature
