[Debian-iot-packaging] [alljoyn-services-1509] 01/01: Import Debian patch 15.09-2

[Thorsten Alteholz]

This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository alljoyn-services-1509.

commit 9b3069035439aa3e3a0775a9cc736de14b7271a6
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Sat Jun 25 14:28:32 2016 +0200

    Import Debian patch 15.09-2
---
 debian/changelog | 8 ++++++++
 debian/control   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a9fc3b2..5f11cd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alljoyn-services-1509 (15.09-2) unstable; urgency=medium
+
+  * it makes no sense to have alljoyn-services-1509 and 
+    alljoyn-services-1504 installed together, so introduce
+    Conflicts: (Closes: #828712)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Sat, 25 Jun 2016 14:28:32 +0200
+
 alljoyn-services-1509 (15.09-1) unstable; urgency=medium
 
   * Initial release (Closes: #828134)
diff --git a/debian/control b/debian/control
index f7f7ad8..05f9640 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Description: AllJoyn base services C++ development library
 Package: alljoyn-services-1509
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: alljoyn-services-1504
 Description: AllJoyn base services for 1509
  AllJoyn is a collaborative open-source software framework that makes 
  it easy for developers to write applications that can discover nearby

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-services-1509.git