Please find attached the source debdiff for my NMU. Mraw KiBi.
diff -u barry-0.14/debian/rules barry-0.14/debian/rules
--- barry-0.14/debian/rules
+++ barry-0.14/debian/rules
@@ -5,6 +5,7 @@
# This file is public domain software, originally written by Joey Hess.
#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
#include /usr/share/cdbs/1/rules/simple-patchsys.mk
diff -u barry-0.14/debian/changelog barry-0.14/debian/changelog
--- barry-0.14/debian/changelog
+++ barry-0.14/debian/changelog
@@ -1,3 +1,19 @@
+barry (0.14-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with new boost (>= 1.37.0) by using the “-mt” suffix for
+ boost libraries since starting with this version, only this variant
+ is available (Closes: #529722). Add the following patch:
+ - fix-ftbfs-with-new-boost.diff (thanks to Steve M. Robbins)
+ * Fix FTBFS with gcc-4.4 (Closes: #505342):
+ - fix-ftbfs-with-gcc-4.4.diff (thanks to Martin Michlmayr)
+ * debian/rules: Add the simple-patchsys.mk include to get both patches
+ applied.
+ * Set urgency to “medium”, both bugs affect testing too.
+ * Add ${misc:Depends} to all Depends fields.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 18 Jul 2009 12:54:03 +0200
+
barry (0.14-2) unstable; urgency=low
* debian/rules: Fix libbarry-dbg name
diff -u barry-0.14/debian/control barry-0.14/debian/control
--- barry-0.14/debian/control
+++ barry-0.14/debian/control
@@ -8,7 +8,7 @@
Package: libbarry0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library for using the BlackBerry handheld on Linux
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -18,7 +18,7 @@
Section: libs
Priority: extra
Architecture: any
-Depends: libbarry0 (= ${binary:Version})
+Depends: libbarry0 (= ${binary:Version}), ${misc:Depends}
Description: Library for using the BlackBerry handheld on Linux
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -27,7 +27,7 @@
Package: libbarry-dev
Section: libdevel
Architecture: any
-Depends: libbarry0 (= ${binary:Version}), libusb-dev
+Depends: libbarry0 (= ${binary:Version}), libusb-dev, ${misc:Depends}
Description: Development files for libbarry
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -37,7 +37,7 @@
Package: barry-util
Section: utils
Architecture: any
-Depends: udev (>= 0.056), ${shlibs:Depends}
+Depends: udev (>= 0.056), ${shlibs:Depends}, ${misc:Depends}
Suggests: ppp
Description: Command line utilities for working with the RIM BlackBerry Handheld
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
@@ -49,7 +49,7 @@
Section: utils
Priority: extra
Architecture: any
-Depends: barry-util (= ${binary:Version})
+Depends: barry-util (= ${binary:Version}), ${misc:Depends}
Description: Command line utilities for working with the RIM BlackBerry Handheld
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -58,7 +58,7 @@
Package: barrybackup-gui
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: GTK+ based GUI for backing up the RIM BlackBerry Handheld
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -68,7 +68,7 @@
Section: utils
Priority: extra
Architecture: any
-Depends: barrybackup-gui (= ${binary:Version})
+Depends: barrybackup-gui (= ${binary:Version}), ${misc:Depends}
Description: GTK+ based GUI for backing up the RIM BlackBerry Handheld
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -77,7 +77,7 @@
Package: opensync-plugin-barry
Section: libs
Architecture: any
-Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), ${shlibs:Depends}
+Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), ${shlibs:Depends}, ${misc:Depends}
Description: Opensync Blackberry plugin, based on the Barry project
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
@@ -87,7 +87,7 @@
Section: libs
Priority: extra
Architecture: any
-Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), opensync-plugin-barry (= ${binary:Version})
+Depends: libopensync0 (>= 0.22), libopensync0 (<< 0.30), opensync-plugin-barry (= ${binary:Version}), ${misc:Depends}
Description: Opensync Blackberry plugin, based on the Barry project
Barry is a GPL C++ library for interfacing with the RIM BlackBerry Handheld.
.
only in patch2:
unchanged:
--- barry-0.14.orig/debian/patches/fix-ftbfs-with-gcc-4.4.diff
+++ barry-0.14/debian/patches/fix-ftbfs-with-gcc-4.4.diff
@@ -0,0 +1,30 @@
+--- a/opensync-plugin/src/trace.h
++++ b/opensync-plugin/src/trace.h
+@@ -24,6 +24,7 @@
+
+ #include <opensync/opensync.h>
+ #include <stdarg.h>
++#include <cstdio>
+
+ class Trace
+ {
+--- a/src/base64.cc
++++ b/src/base64.cc
+@@ -11,6 +11,7 @@
+ */
+
+ #include "base64.h"
++#include <cstdio>
+ #include <string>
+ #include <iterator>
+
+--- a/src/record.cc
++++ b/src/record.cc
+@@ -32,6 +32,7 @@
+ #include "time.h"
+ #include "error.h"
+ #include "endian.h"
++#include <cstdio>
+ #include <sstream>
+ #include <iomanip>
+ #include <time.h>
only in patch2:
unchanged:
--- barry-0.14.orig/debian/patches/fix-ftbfs-with-new-boost.diff
+++ barry-0.14/debian/patches/fix-ftbfs-with-new-boost.diff
@@ -0,0 +1,40 @@
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -20,7 +20,7 @@ btool_LDFLAGS = -...@boost_lib_path@
+ else
+ btool_CXXFLAGS = -D__BARRY_BOOST_MODE__ -D_REENTRANT $(AM_CXXFLAGS)
+ endif
+-btool_LDADD += -lboost_serialization
++btool_LDADD += -lboost_serialization-mt
+ endif
+
+ if WITH_BOOST
+@@ -32,7 +32,7 @@ bs11nread_LDFLAGS = -...@boost_lib_path@
+ else
+ bs11nread_CXXFLAGS = -D_REENTRANT $(AM_CXXFLAGS)
+ endif
+-bs11nread_LDADD += -lboost_serialization
++bs11nread_LDADD += -lboost_serialization-mt
+ endif
+
+ bidentify_SOURCES = bidentify.cc
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -41,7 +41,7 @@ bin_PROGRAMS = btool$(EXEEXT) bidentify$
+ $(am__EXEEXT_1)
+ @with_boost_t...@am__append_1 = bs11nread
+ sbin_PROGRAMS = bcharge$(EXEEXT) breset$(EXEEXT) pppob$(EXEEXT)
+...@with_boost_true@am__append_2 = -lboost_serialization
+...@with_boost_true@am__append_2 = -lboost_serialization-mt
+ subdir = tools
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -243,7 +243,7 @@ btool_LDADD = ../src/libbarry.la $(LIBUS
+ @WITH_BOOST_PATHS_TRUE@@with_boost_t...@btool_ldflags = -...@boost_lib_path@
+ @with_boost_t...@bs11nread_sources = bs11nread.cc
+ @with_boost_t...@bs11nread_ldadd = ../src/libbarry.la $(LIBUSB_LIBS) \
+...@with_boost_true@ -lpthread -lboost_serialization
+...@with_boost_true@ -lpthread -lboost_serialization-mt
+ @WITH_BOOST_PATHS_FALSE@@with_boost_t...@bs11nread_cxxflags = -D_REENTRANT $(AM_CXXFLAGS)
+ @WITH_BOOST_PATHS_TRUE@@with_boost_t...@bs11nread_cxxflags = -D_REENTRANT -...@boost_inc_path@ $(AM_CXXFLAGS)
+ @WITH_BOOST_PATHS_TRUE@@with_boost_t...@bs11nread_ldflags = -...@boost_lib_path@
signature.asc
Description: Digital signature
