Move dbus launch script into libmoonshot1 because of multi-arch path

diff --git a/debian/changelog b/debian/changelog
index f2ff5dc..b720e47 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 moonshot-ui (0.7.1-1) unstable; urgency=medium
 
   * New upstream version
+  * Move dbus launch script to libmoonshot1
+  * Because the dbus interface between moonshot-ui and libmoonshot1 may
+    not be entirely stable, create versioned dependency.
+  * Initial upload to Debian, Closes: #760411
 
- -- Sam Hartman <hartmans@debian.org>  Wed, 03 Sep 2014 15:00:33 -0400
+ -- Sam Hartman <hartmans@debian.org>  Wed, 03 Sep 2014 15:34:52 -0400
 
 moonshot-ui (0.7-2) unstable; urgency=medium
 
@@ -166,6 +170,6 @@ moonshot-ui (0.0.2+20110621-1) unstable; urgency=low
 
 moonshot-ui (0.0.1+20110504-1) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release
 
  -- Sam Hartman <hartmans@debian.org>  Wed, 04 May 2011 13:28:57 -0400

diff --git a/debian/control b/debian/control
index 2b0d611..dd15906 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: moonshot-ui
 Architecture: any
 Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11, libmoonshot1 (= ${binary:Version})
 Description: Moonshot Identity Selector
  Project moonshot provides federated authentication using EAP, RADIUS
  and SAML to applications beyond the web platform. 
@@ -45,6 +45,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
+Breaks: moonshot-ui (<< 0.7.1-1)
 Pre-Depends: ${misc:Pre-Depends}
 Description: Moonshot Identity Shared Library
  Project moonshot provides federated authentication using EAP, RADIUS

diff --git a/debian/libmoonshot1.install b/debian/libmoonshot1.install
index db3cbb3..6e984eb 100644 (file)
--- a/debian/libmoonshot1.install
+++ b/debian/libmoonshot1.install
@@ -1,2 +1,2 @@
 usr/lib/*/libmoonshot.so.*
-
+usr/lib/*/moonshot-ui/*

diff --git a/debian/moonshot-ui.install b/debian/moonshot-ui.install
index 2640c2b..4befca1 100644 (file)
--- a/debian/moonshot-ui.install
+++ b/debian/moonshot-ui.install
@@ -1,4 +1,4 @@
 etc/moonshot/*
 usr/bin/*
 usr/share/*
-usr/lib/moonshot-ui/*
+