From 72341baea5103dc0ccc086a145b4423a38cf1f21 Mon Sep 17 00:00:00 2001
From: aleax <alexey.bondarchuk@aleax.me>
Date: Wed, 5 Dec 2012 21:24:58 +0200
Subject: [PATCH 1/2] Modify C header files to include from C++ code

---
 mbus/mbus-protocol-aux.h |  8 ++++++++
 mbus/mbus-protocol.h     |  8 ++++++++
 mbus/mbus-serial.h       | 10 ++++++++++
 mbus/mbus-tcp.h          |  9 +++++++++
 mbus/mbus.h              |  8 ++++++++
 5 files changed, 43 insertions(+)

diff --git a/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h
index 02694d9..2f18b98 100755
--- a/mbus/mbus-protocol-aux.h
+++ b/mbus/mbus-protocol-aux.h
@@ -65,6 +65,10 @@
 
 #include "mbus-protocol.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MBUS_PROBE_NOTHING   0
 #define MBUS_PROBE_SINGLE    1
 #define MBUS_PROBE_COLLISION 2
@@ -433,4 +437,8 @@ char * mbus_frame_data_xml_normalized(mbus_frame_data *data);
  */
 int mbus_scan_2nd_address_range(mbus_handle * handle, int pos, char *addr_mask);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // __MBUS_PROTOCOL_AUX_H__
diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h
index f23d72c..3a9c99a 100755
--- a/mbus/mbus-protocol.h
+++ b/mbus/mbus-protocol.h
@@ -22,6 +22,10 @@
 #include <sys/types.h>
 #include <time.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // Packet formats:
 //
@@ -633,5 +637,9 @@ u_char mbus_dif_datalength_lookup(u_char dif);
 char *mbus_frame_get_secondary_address(mbus_frame *frame);
 int   mbus_frame_select_secondary_pack(mbus_frame *frame, char *address);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _MBUS_PROTOCOL_H_ */
 
diff --git a/mbus/mbus-serial.h b/mbus/mbus-serial.h
index 6203784..4080aef 100755
--- a/mbus/mbus-serial.h
+++ b/mbus/mbus-serial.h
@@ -22,6 +22,11 @@
 #include "mbus-protocol-aux.h"
 #include "mbus-protocol.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 typedef struct _mbus_serial_data
 {
     char *device;
@@ -34,6 +39,11 @@ int                 mbus_serial_send_frame(mbus_handle *handle, mbus_frame *fram
 int                 mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame);
 int                 mbus_serial_set_baudrate(mbus_handle *handle, int baudrate);
 void                mbus_serial_data_free(mbus_handle *handle);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MBUS_SERIAL_H */
 
 
diff --git a/mbus/mbus-tcp.h b/mbus/mbus-tcp.h
index 6de12a7..085c9dc 100755
--- a/mbus/mbus-tcp.h
+++ b/mbus/mbus-tcp.h
@@ -21,6 +21,11 @@
 #include "mbus-protocol.h"
 #include "mbus-protocol-aux.h"
 
+#ifdef __cplusplus
+extern "C" {
+        #endif
+
+
 typedef struct _mbus_tcp_data
 {
     char *host;
@@ -33,6 +38,10 @@ int              mbus_tcp_send_frame(mbus_handle *handle, mbus_frame *frame);
 int              mbus_tcp_recv_frame(mbus_handle *handle, mbus_frame *frame);
 void             mbus_tcp_data_free(mbus_handle *handle);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MBUS_TCP_H */
 
 
diff --git a/mbus/mbus.h b/mbus/mbus.h
index 8f3efc1..3dae6aa 100644
--- a/mbus/mbus.h
+++ b/mbus/mbus.h
@@ -38,9 +38,17 @@
 #include <mbus/mbus-tcp.h>
 #include <mbus/mbus-serial.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 //
 //
 int mbus_init();
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _MBUS_H_ */

From 49c5c751eeb93269412e09e84e53ac1ee4d8725b Mon Sep 17 00:00:00 2001
From: aleax <alexey.bondarchuk@aleax.me>
Date: Wed, 5 Dec 2012 21:38:12 +0200
Subject: [PATCH 2/2] Improve debian build scripts

1. Add calling autoreconf to debian/rules for purpose of automatic build
in chroot environment with pbuilder.
2. Copy missing pkg-config file libmbus.pc to /usr/lib/pkgconfig/
3. Remove unnecessary (IMHO) debian/files, becouse it automaticly deletes
by debian/rules clean action
---
 debian/control             | 2 +-
 debian/files               | 2 --
 debian/libmbus-dev.install | 1 +
 debian/rules               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 debian/files

diff --git a/debian/control b/debian/control
index d5b94ec..fa51c17 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libmbus
 Priority: extra
 Maintainer: Robert Johansson <rob@raditex.nu>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf
+Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf
 Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.rscada.se/libmbus
diff --git a/debian/files b/debian/files
deleted file mode 100644
index fe9e249..0000000
--- a/debian/files
+++ /dev/null
@@ -1,2 +0,0 @@
-libmbus-dev_0.8.0_amd64.deb libdevel extra
-libmbus1_0.8.0_amd64.deb libs extra
diff --git a/debian/libmbus-dev.install b/debian/libmbus-dev.install
index f882277..f6e83a8 100644
--- a/debian/libmbus-dev.install
+++ b/debian/libmbus-dev.install
@@ -2,3 +2,4 @@ usr/include/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/*.la
+usr/lib/pkgconfig/libmbus.pc
diff --git a/debian/rules b/debian/rules
index 52100f9..f2f150f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh --with autoreconf $@
 
 #override_dh_auto_configure:
 #	dh_auto_configure -- --prefix=/usr/local/freescada