Merge lp:~michihenning/unity-scopes-api/single-tree into lp:unity-scopes-api/devel

[Michi Henning]

Butchered down the dummy control file to the bare bones, so no-one will mistake it for the real thing.

Butchered down the dummy control file to the bare bones, so no-one will mistake it for the real thing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:399
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1549/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1549/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/single-tree]

400. By Michi Henning on 2015-09-15

Removed Replaces: and Conflicts: entries for Qt library.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1551/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/92

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1551/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/single-tree]

401. By Michi Henning on 2015-09-15

Add rudimentary build deps, otherwise things won't build in a silo.

402. By Michi Henning on 2015-09-15

Add lsb-release to build deps.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:402
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1552/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/93/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1552/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/single-tree]

403. By Michi Henning on 2015-09-15

Added missing empty line to control.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1553/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-wily-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1553/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-08-25 02:25:05 +0000
+++ debian/control	2015-09-15 11:19:07 +0000
@@ -4,119 +4,11 @@
 # This file is regenerated automatically in the clean target.
 #
 Source: unity-scopes-api
-Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: capnproto,
-               click-dev (>= 0.2.2),
-               cmake,
-               dbus-test-runner,
+Maintainer: This not the real control file because it is generated during the build from control.in.
+Build-Depends: click-dev (>= 0.2.2),
                debhelper (>= 9),
-               doxygen,
-               google-mock,
-               graphviz,
-               libaccounts-glib-dev,
-               libapparmor-dev,
-               libboost-filesystem-dev,
-               libboost-log-dev,
-               libboost-regex-dev,
-               libboost-serialization-dev,
-               libcapnp-dev (>= 0.4.0),
-               libdbustest1-dev,
-               libjsoncpp-dev,
-               liblttng-ust-dev,
-               libnet-cpp-dev (>= 1.2.0),
-               libprocess-cpp-dev (>= 1.0.1),
-               libsignon-glib-dev,
-               libunity-api-dev (>= 7.80.7~),
-               libzmq3-dev,
-               libzmqpp-dev,
                lsb-release,
-               lttng-tools,
-               pkg-config,
-               python3:any,
-               python-tornado,
-               valgrind,
-Standards-Version: 3.9.6
-XS-Testsuite: autopkgtest
-Section: libs
-Homepage: https://launchpad.net/unity-scopes-api
-# if you don't have have commit access to this branch but would like to upload
-# directly to Ubuntu, don't worry: your changes will be merged back into the
-# upstream branch
-Vcs-Bzr: lp:unity-scopes-api
-Vcs-Browser: https://code.launchpad.net/unity-scopes-api
 
 Package: libunity-scopes1.0
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: libunity-scopes0,
-          libunity-scopes1,
-          libunity-scopes2,
-Conflicts: libunity-scopes0,
-           libunity-scopes1,
-           libunity-scopes2,
-Description: API for Unity scopes integration
- Library to integrate scopes with the Unity shell
-
-Package: libunity-scopes-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libproperties-cpp-dev,
-         libunity-api-dev,
-         libunity-scopes1.0 (= ${binary:Version}),
-         ${misc:Depends},
-Description: Header files for Unity scopes API
- Library to integrate scopes with the Unity shell (dev files)
-
-Package: libunity-scopes-cli
-Section: devel
-Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libunity-scopes1.0 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client utility for Unity scopes API
- Commandline client utility for querying Unity scopes, useful for testing.
-
-Package: libunity-scopes-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Documentation for Unity scopes API
- Library to integrate scopes with the Unity shell (documentation)
-
-Package: libunity-scopes-qt0.1
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: Qt library for Unity scopes API
- Library that integrates classes based on Qt for convenience
-
-Package: libunity-scopes-qt-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: libunity-scopes-dev (= ${binary:Version}),
-         libunity-scopes-qt0.1 (= ${binary:Version}),
-         libnet-cpp-dev (>=1.2.0),
-         ${misc:Depends},
-Description: Header files for Qt library for Unity scopes API
- Library that integrates classes based on Qt for convenience (dev files)
-
-Package: libunity-scopes-qt-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Documentation for Unity Qt library
- Library that integrates classes based on Qt for convenience (documentation)
+Description: This not the real control file because it is generated during the build from control.in.

=== modified file 'debian/control.in'
--- debian/control.in	2015-09-03 05:09:41 +0000
+++ debian/control.in	2015-09-15 11:19:07 +0000
@@ -91,8 +91,6 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Replaces: libunity-scopes-qt0.1.0,
-Conflicts: libunity-scopes-qt0.1.0,
 Description: Qt library for Unity scopes API
  Library that integrates classes based on Qt for convenience
 

=== modified file 'debian/gen-debian-files.sh'
--- debian/gen-debian-files.sh	2015-09-07 02:51:53 +0000
+++ debian/gen-debian-files.sh	2015-09-15 11:19:07 +0000
@@ -67,7 +67,6 @@
 qt_major_minor="${qt_major}.${qt_minor}"
 
 vivid_soversion=$(expr $minor + 3)
-vivid_qt_soversion=$(expr $qt_minor)
 
 if [ "$distro" = "vivid" ]
 then
@@ -110,10 +109,6 @@
 \          libunity-scopes${vivid_soversion}," \
            -e "/Conflicts: libunity-scopes0,/a\
 \           libunity-scopes${vivid_soversion}," \
-           -e "/Replaces: libunity-scopes-qt0.1.0,/a\
-\          libunity-scopes-qt${vivid_qt_soversion}," \
-           -e "/Conflicts: libunity-scopes-qt0.1.0,/a\
-\           libunity-scopes-qt${vivid_qt_soversion}," \
         "$outfile"
 }