Merge branch 'develop' of https://github.com/azure/azure-iot-sdks int…

…o develop
Azure · Mar 28, 2016 · 1c31ffe · 1c31ffe
2 parents 35e5033 + 40c6bd4
commit 1c31ffe
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/c/build_all/packaging/linux/debian/azure-iot-sdk-c-dev.dirs b/c/build_all/packaging/linux/debian/azure-iot-sdk-c-dev.dirs
@@ -1,2 +1,2 @@
 usr/include
-usr/include/azureiotsdk
+usr/include/azureiot
diff --git a/c/build_all/packaging/linux/debian/azure-iot-sdk-c-dev.install b/c/build_all/packaging/linux/debian/azure-iot-sdk-c-dev.install
@@ -1 +1 @@
-usr/include/azureiotsdk/*
+usr/include/azureiot/*
diff --git a/c/build_all/packaging/linux/debian/changelog-vivid b/c/build_all/packaging/linux/debian/changelog-vivid
@@ -1,4 +1,4 @@
-azure-iot-sdk-c (0.1.0-10) vivid; urgency=low
+azure-iot-sdk-c (0.1.0-12) vivid; urgency=low
 
   * Initial release
 
@@ -16,4 +16,6 @@ azure-iot-sdk-c (0.1.0-10) vivid; urgency=low
 
   * Fixed memory leaks on AMQP and MQTT client transports (#6f6210c)
 
+  * Introduce _setoption in modules which implement XIO interface (#e721b5c)
+
  -- AzureIoT User <[email protected]>  Fri, 11 Mar 2016 17:24:51 +0000
diff --git a/c/build_all/packaging/linux/debian/changelog-wily b/c/build_all/packaging/linux/debian/changelog-wily
@@ -1,4 +1,4 @@
-azure-iot-sdk-c (0.1.0.1-3) wily; urgency=low
+azure-iot-sdk-c (0.1.0.1-4) wily; urgency=low
 
   * Initial release
 
@@ -12,4 +12,6 @@ azure-iot-sdk-c (0.1.0.1-3) wily; urgency=low
 
   * Fix message settlement bug in AMQP Transport (#91bfe82)
 
+  * Introduce _setoption in modules which implement XIO interface (#e721b5c)
+
  -- AzureIoT User <[email protected]>  Tue, 20 Oct 2015 17:24:51 +0000
diff --git a/c/build_all/packaging/linux/debian/control b/c/build_all/packaging/linux/debian/control
@@ -11,15 +11,15 @@ Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/azure-iot-sdk-c.git;a=sum
 Package: azure-iot-sdk-c-dev
 Section: libdevel
 Architecture: any
-Depends: azure-iot-sdk-c-lib (= ${binary:Version}), ${misc:Depends}
+Depends: azure-iot-sdk-c-lib (= ${binary:Version}), ${misc:Depends}, libssl-dev, libcurl4-openssl-dev, curl, azure-c-shared-util-dev, azure-uamqp-c-dev, azure-umqtt-c-dev
 Description: Microsoft Azure IoT device SDK for C Library
  The Microsoft Azure IoT device libraries for C contain code that
  facilitates building devices and applications that connect to and
  are managed by Azure IoT Hub services
 
 Package: azure-iot-sdk-c-lib
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl-dev, libcurl4-openssl-dev, curl, azure-c-shared-util-dev, azure-uamqp-c-dev, azure-umqtt-c-dev
 Description: Microsoft Azure IoT device SDK for C Library
  The Microsoft Azure IoT device libraries for C contain code that
  facilitates building devices and applications that connect to and

diff --git a/c/build_all/packaging/linux/debian/rules b/c/build_all/packaging/linux/debian/rules
@@ -30,11 +30,11 @@ override_dh_auto_install:
 	mkdir $$(pwd)/debian/tmp/usr
 	mkdir $$(pwd)/debian/tmp/usr/lib
 	mkdir $$(pwd)/debian/tmp/usr/include
-	mkdir $$(pwd)/debian/tmp/usr/include/azureiotsdk
+	mkdir $$(pwd)/debian/tmp/usr/include/azureiot
 	cp $$(pwd)/obj-*/iothub_client/*.a $$(pwd)/debian/tmp/usr/lib/
 	cp $$(pwd)/obj-*/serializer/*.a $$(pwd)/debian/tmp/usr/lib/
-	cp $$(pwd)/iothub_client/inc/* $$(pwd)/debian/tmp/usr/include/azureiotsdk
-	cp $$(pwd)/serializer/inc/* $$(pwd)/debian/tmp/usr/include/azureiotsdk
+	cp $$(pwd)/iothub_client/inc/* $$(pwd)/debian/tmp/usr/include/azureiot
+	cp $$(pwd)/serializer/inc/* $$(pwd)/debian/tmp/usr/include/azureiot