From 7b4979cffd2041e51cb623a5fb7644fb1f859eee Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Wed, 19 Sep 2012 10:04:57 +0200
Subject: Add G_BEGIN/END_DECL to fix #131

---
 src/cameras/uca-mock-camera.h | 4 ++++
 src/cameras/uca-pco-camera.h  | 4 ++++
 src/cameras/uca-pf-camera.h   | 4 ++++
 src/cameras/uca-ufo-camera.h  | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'src')

diff --git a/src/cameras/uca-mock-camera.h b/src/cameras/uca-mock-camera.h
index aa196db..92030f8 100644
--- a/src/cameras/uca-mock-camera.h
+++ b/src/cameras/uca-mock-camera.h
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "uca-camera.h"
 
+G_BEGIN_DECLS
+
 #define UCA_TYPE_MOCK_CAMERA             (uca_mock_camera_get_type())
 #define UCA_MOCK_CAMERA(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_MOCK_CAMERA, UcaMockCamera))
 #define UCA_IS_MOCK_CAMERA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_MOCK_CAMERA))
@@ -60,4 +62,6 @@ UcaMockCamera *uca_mock_camera_new(GError **error);
 
 GType uca_mock_camera_get_type(void);
 
+G_END_DECLS
+
 #endif
diff --git a/src/cameras/uca-pco-camera.h b/src/cameras/uca-pco-camera.h
index 87f4277..fdb709a 100644
--- a/src/cameras/uca-pco-camera.h
+++ b/src/cameras/uca-pco-camera.h
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "uca-camera.h"
 
+G_BEGIN_DECLS
+
 #define UCA_TYPE_PCO_CAMERA             (uca_pco_camera_get_type())
 #define UCA_PCO_CAMERA(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PCO_CAMERA, UcaPcoCamera))
 #define UCA_IS_PCO_CAMERA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PCO_CAMERA))
@@ -86,4 +88,6 @@ UcaPcoCamera *uca_pco_camera_new(GError **error);
 
 GType uca_pco_camera_get_type(void);
 
+G_END_DECLS
+
 #endif
diff --git a/src/cameras/uca-pf-camera.h b/src/cameras/uca-pf-camera.h
index 11ac55a..7e3fe2c 100644
--- a/src/cameras/uca-pf-camera.h
+++ b/src/cameras/uca-pf-camera.h
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "uca-camera.h"
 
+G_BEGIN_DECLS
+
 #define UCA_TYPE_PF_CAMERA             (uca_pf_camera_get_type())
 #define UCA_PF_CAMERA(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_PF_CAMERA, UcaPfCamera))
 #define UCA_IS_PF_CAMERA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_PF_CAMERA))
@@ -69,4 +71,6 @@ UcaPfCamera *uca_pf_camera_new(GError **error);
 
 GType uca_pf_camera_get_type(void);
 
+G_END_DECLS
+
 #endif
diff --git a/src/cameras/uca-ufo-camera.h b/src/cameras/uca-ufo-camera.h
index e97eb17..0b52ffb 100644
--- a/src/cameras/uca-ufo-camera.h
+++ b/src/cameras/uca-ufo-camera.h
@@ -21,6 +21,8 @@
 #include <glib-object.h>
 #include "uca-camera.h"
 
+G_BEGIN_DECLS
+
 #define UCA_TYPE_UFO_CAMERA             (uca_ufo_camera_get_type())
 #define UCA_UFO_CAMERA(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), UCA_TYPE_UFO_CAMERA, UcaUfoCamera))
 #define UCA_IS_UFO_CAMERA(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), UCA_TYPE_UFO_CAMERA))
@@ -71,4 +73,6 @@ UcaUfoCamera *uca_ufo_camera_new(GError **error);
 
 GType uca_ufo_camera_get_type(void);
 
+G_END_DECLS
+
 #endif
-- 
cgit v1.2.3


From 178298f53bd6bf68cda6f2780281f0893ef2dc73 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Wed, 26 Sep 2012 12:20:36 +0200
Subject: Set SO version to major not minor version

Fortunately, no one really used the 0.6-rc1 version which would have a higher SO
version than 1.0.
---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9508c5c..05fd37f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -155,7 +155,7 @@ add_library(uca SHARED
 
 set_target_properties(uca PROPERTIES
       VERSION ${UCA_ABI_VERSION}
-      SOVERSION ${UCA_VERSION_MINOR})
+      SOVERSION ${UCA_VERSION_MAJOR})
 
 target_link_libraries(uca
     ${uca_LIBS})
-- 
cgit v1.2.3