Merge lp:~mterry/unity-greeter-session-broadcast/no-lib into lp:unity-greeter-session-broadcast/13.10

[Michael Terry]

Don't build or install the library right now. It's not finished and isn't used yet.

Don't build or install the library right now. It's not finished and isn't used yet.

Leaves code in place for future revival. Just disables it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-greeter-session-broadcast-saucy-amd64-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-greeter-session-broadcast-ci/8/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Oh yeah, and I added a versioned upstart Depends, just for the fun.

[Ted Gould (ted)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-28 16:37:47 +0000
+++ CMakeLists.txt	2013-08-30 18:39:38 +0000
@@ -67,7 +67,7 @@
 
 add_subdirectory(data)
 add_subdirectory(service)
-add_subdirectory(libunity-greeter-session-broadcast)
+#add_subdirectory(libunity-greeter-session-broadcast)
 
 # TODO
 # enable_testing()

=== modified file 'debian/control'
--- debian/control	2013-07-09 19:31:17 +0000
+++ debian/control	2013-08-30 18:39:38 +0000
@@ -21,7 +21,8 @@
 
 Package: unity-greeter-session-broadcast
 Architecture: any
-Depends: upstart-app-launch,
+Depends: upstart (>= 1.10),
+         upstart-app-launch,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Service to allow the greeter to communicate to sessions
@@ -30,30 +31,30 @@
  .
  This package provides a service for Unity's Greeter Session Broadcast
 
-Package: libunity-greeter-session-broadcast1
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Recommends: unity-greeter-session-broadcast (= ${binary:Version}),
-Description: library for sending requests to the user session
- Sends requests to the broadcast service so that they can be seen
- by the user session.
- .
- This package contains shared libraries to be used by the greeter.
-
-Package: libunity-greeter-session-broadcast1-dev
-Section: libdevel
-Architecture: any
-Depends: libglib2.0-dev,
-         libunity-greeter-session-broadcast1 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Multi-Arch: same
-Description: library for sending requests to the user session
- Sends requests to the broadcast service so that they can be seen
- by the user session.
- .
- This package contains files that are needed to build the greeter.
+#Package: libunity-greeter-session-broadcast1
+#Section: libs
+#Architecture: any
+#Depends: ${misc:Depends},
+#         ${shlibs:Depends},
+#Pre-Depends: ${misc:Pre-Depends},
+#Multi-Arch: same
+#Recommends: unity-greeter-session-broadcast (= ${binary:Version}),
+#Description: library for sending requests to the user session
+# Sends requests to the broadcast service so that they can be seen
+# by the user session.
+# .
+# This package contains shared libraries to be used by the greeter.
+#
+#Package: libunity-greeter-session-broadcast1-dev
+#Section: libdevel
+#Architecture: any
+#Depends: libglib2.0-dev,
+#         libunity-greeter-session-broadcast1 (= ${binary:Version}),
+#         ${misc:Depends},
+#         ${shlibs:Depends},
+#Multi-Arch: same
+#Description: library for sending requests to the user session
+# Sends requests to the broadcast service so that they can be seen
+# by the user session.
+# .
+# This package contains files that are needed to build the greeter.

=== modified file 'debian/rules'
--- debian/rules	2013-06-27 16:36:41 +0000
+++ debian/rules	2013-08-30 18:39:38 +0000
@@ -2,10 +2,12 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 export G_MESSAGES_DEBUG=all
-export DEBIAN_TARGET_DIR="${CURDIR}/debian/tmp"
 
 %:
 	dh $@
 
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+
 override_dh_install:
 	dh_install --fail-missing