Merge lp:~unity-api-team/connectivity-api/ci-testrun into lp:connectivity-api/14.10

[Antti Kaijanmäki]

Changes based on packaging review.

Waiting for packaging review as NEW universe package.

This is a prerequisite for the new indicator-network used solely in unity8 and thus the catch-all unity8 FFe should apply.

[Antti Kaijanmäki (kaijanmaki)]

From ubuntu-core-dev the proposed branch needs a complete packaging review.

[Antti Kaijanmäki (kaijanmaki)]

The purpose of this MP is to get through the initial ci train landing and to introduce a new source package to the universe.

The initial code is already in lp:connectivity-api and this MR contains no code changes. The only meaningful review comes from the ubuntu-core-dev team and thus I'm claiming the Unity API Team side of the review myself.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/36/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Review done by IRC: This change is fine itself, however, it will need some modification to enter the archive, so maybe use that branch?

09:07:47 didrocks | Wellark: as we try to standardize the packaging, can you move the "Section" stenza just after Priority please?
                  | (nitpick)
09:07:59 didrocks | in debian/control
09:09:05 didrocks | Wellark: you're forcing gcc 4.7 because of properties-cpp? :)
09:09:55 didrocks | Wellark: not sure why are you depending on libdbus-1-dev, shouldn't libdbus-cpp-dev brings it in? (and you only
                  | use the cpp bindings, right?)
09:10:59 didrocks | Wellark: same, to standardize, can you put recommends after depends?
09:11:15 didrocks | Wellark: also, on Package: libconnectivity-cpp0
09:11:25 didrocks | no need to repeat the section as it matches the source one
09:11:52 didrocks | Wellark: also, please suggest the -doc, not recommends
09:13:34 didrocks | Wellark: just a note once you will want to enter main: you will need a symbols file
09:13:46 didrocks | so bonus point if you add it now :)
09:14:42 didrocks | Wellark: your version should be 0.0.1-0ubuntu1 btw in debian/changelog
09:18:46 didrocks | Wellark: your .pc file Requires: dbus-cpp
09:19:02 didrocks | so Package: libconnectivity-cpp-dev
09:19:13 didrocks | shouldn't dep on libproperties-cpp-dev, but on libdbus-cpp-dev
09:19:22 didrocks | (bonus for trailing stenza)

[Didier Roche-Tolomelli (didrocks)]

review: Needs Fixing

[Antti Kaijanmäki (kaijanmaki)]

> Review done by IRC: This change is fine itself, however, it will need some
> modification to enter the archive, so maybe use that branch?

Yep. let's fix it all here.

[lp:~unity-api-team/connectivity-api/ci-testrun]

7. By Antti Kaijanmäki on 2014-03-12

debian/control: Section after Priority.

8. By Antti Kaijanmäki on 2014-03-12

Clarify why to force g++-4.7.

9. By Antti Kaijanmäki on 2014-03-12

Recommends after depends.

10. By Antti Kaijanmäki on 2014-03-12

Remove redundant Section.

11. By Antti Kaijanmäki on 2014-03-12

Suggests -dev instead of Recommends

12. By Antti Kaijanmäki on 2014-03-12

Fix debian/changelog version

13. By Antti Kaijanmäki on 2014-03-12

add -dev Depends on libdbus-cpp-dev

[Antti Kaijanmäki (kaijanmaki)]

> 09:07:47 didrocks | Wellark: as we try to standardize the packaging, can you
> move the "Section" stenza just after Priority please?
> | (nitpick)

Done.

> 09:07:59 didrocks | in debian/control
> 09:09:05 didrocks | Wellark: you're forcing gcc 4.7 because of properties-cpp?
> :)

Added a comment.

> 09:09:55 didrocks | Wellark: not sure why are you depending on libdbus-1-dev,
> shouldn't libdbus-cpp-dev brings it in? (and you only
> | use the cpp bindings, right?)

Known bug:
https://bugs.launchpad.net/ubuntu/+source/dbus-cpp/+bug/1272105

> 09:10:59 didrocks | Wellark: same, to standardize, can you put recommends
> after depends?

Done.

> 09:11:15 didrocks | Wellark: also, on Package: libconnectivity-cpp0
> 09:11:25 didrocks | no need to repeat the section as it matches the source one

Done.

> 09:11:52 didrocks | Wellark: also, please suggest the -doc, not recommends

Done.

> 09:13:34 didrocks | Wellark: just a note once you will want to enter main: you
> will need a symbols file
> 09:13:46 didrocks | so bonus point if you add it now :)

Noted. I don't want to deal with the pain right now.
The library will still get modifications and dealing with the symbols pain this early will just slow everything down to a halt.

> 09:14:42 didrocks | Wellark: your version should be 0.0.1-0ubuntu1 btw in
> debian/changelog

Fixed.

> 09:18:46 didrocks | Wellark: your .pc file Requires: dbus-cpp
> 09:19:02 didrocks | so Package: libconnectivity-cpp-dev
> 09:19:13 didrocks | shouldn't dep on libproperties-cpp-dev, but on libdbus-
> cpp-dev

Actually I need to depend on both. I need the dbus-cpp.pc to get the linker flags from pkg-config, although I'm not exposing any of the dbus-cpp on my public interface.

And libproperties-cpp-dev is needed as I'm using it on my public interface.

> 09:19:22 didrocks | (bonus for trailing stenza)

Don't know what that means..

[lp:~unity-api-team/connectivity-api/ci-testrun]

14. By Antti Kaijanmäki on 2014-03-12

.pc: add properties-cpp to the Requires.

15. By Antti Kaijanmäki on 2014-03-12

Trailing comma on Depends.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/37/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/connectivity-api-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/connectivity-api-trusty-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/connectivity-api-ci/38/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Perfect, thanks a lot!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-11 16:07:46 +0000
+++ CMakeLists.txt	2014-03-12 10:34:29 +0000
@@ -18,6 +18,13 @@
 cmake_minimum_required(VERSION 2.8)
 project(connectivity-cpp)
 
+# We are doing this because dbus-cpp and friends are stuck with 4.7 because of
+# platform-api and there is an ABI break between 4.7 and 4.8.
+# After we switch to 4.8 there is a mandatory soname bump.
+message(STATUS "Remember, you need to compile this with GCC 4.7 or there will be bugs.")
+message(STATUS "Package builds to this automatically. To do it manually do this:")
+message(STATUS "CC=gcc-4.7 CXX=g++-4.7 cmake <your opts>")
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 include(EnableCoverageReport)
@@ -109,7 +116,3 @@
 
 enable_coverage_report(TARGETS connectivity-cpp
                        FILTER ${CMAKE_SOURCE_DIR}/tests/* ${CMAKE_BINARY_DIR}/*)
-
-message(STATUS "Remember, you need to compile this with GCC 4.7 or there will be bugs.")
-message(STATUS "Package builds to this automatically. To do it manually do this:")
-message(STATUS "CC=gcc-4.7 CXX=g++-4.7 cmake <your opts>")
 
=== modified file 'data/connectivity-cpp.pc.in'
--- data/connectivity-cpp.pc.in	2014-02-05 19:32:11 +0000
+++ data/connectivity-cpp.pc.in	2014-03-12 10:34:29 +0000
@@ -8,4 +8,4 @@
 Version: @CONNECTIVITY_CPP_VERSION_MAJOR@.@CONNECTIVITY_CPP_VERSION_MINOR@.@CONNECTIVITY_CPP_VERSION_PATCH@
 Cflags: -I${includedir}/connectivity-cpp-@CONNECTIVITY_CPP_VERSION_MAJOR@
 Libs: -L${libdir} -lconnectivity-cpp
-Requires: dbus-cpp
+Requires: dbus-cpp properties-cpp
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-11 21:08:34 +0000
+++ debian/changelog	2014-03-12 10:34:29 +0000
@@ -1,4 +1,4 @@
-connectivity-api (0.0.1) UNRELEASED; urgency=low
+connectivity-api (0.0.1-0ubuntu1) UNRELEASED; urgency=low
 
   * Initial release.
 
 
=== modified file 'debian/control'
--- debian/control	2014-03-11 21:08:34 +0000
+++ debian/control	2014-03-12 10:34:29 +0000
@@ -1,5 +1,6 @@
 Source: connectivity-api
 Priority: optional
+Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                dbus,
@@ -18,13 +19,11 @@
                network-manager-dev,
                pkg-config,
 Standards-Version: 3.9.5
-Section: libs
 Homepage: https://launchpad.net/connectivity-api
 Vcs-Bzr: lp:connectivity-api
 Vcs-Browser: https://bazaar.launchpad.net/~unity-api-team/connectivity-api/trunk.14.04/files
 
 Package: libconnectivity-cpp0
-Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -39,10 +38,11 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Recommends: libconnectivity-cpp-doc
 Depends: ${misc:Depends},
          libconnectivity-cpp0 (= ${binary:Version}),
-         libproperties-cpp-dev
+         libdbus-cpp-dev,
+         libproperties-cpp-dev,
+Suggests: libconnectivity-cpp-doc
 Description: C++11 library providing connectivity API. - dev headers
  All the development headers and libraries for libconnectivity-cpp.
 
 
=== modified file 'debian/copyright'
--- debian/copyright	2014-01-23 22:09:36 +0000
+++ debian/copyright	2014-03-12 10:34:29 +0000
@@ -15,7 +15,7 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
  .
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU Lesser General
 
=== removed file 'src/platform/nmofono/link.cpp'
=== removed file 'src/platform/nmofono/link.h'
--- src/platform/nmofono/link.h	2014-01-23 22:09:36 +0000
+++ src/platform/nmofono/link.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- *     Antti Kaijanmäki <[e-mail]>
- */
-
-#ifndef PLATFORM_TEST_LINK
-#define PLATFORM_TEST_LINK
-
-#include <com/ubuntu/connectivity/networking/link.h>
-
-namespace platform {
-namespace test {
-    class Link;
-}
-}
-
-class platform::test::Link : public com::ubuntu::connectivity::networking::Link
-{
-public:
-
-};
-
-#endif