Merge lp:~robru/location-service/pre_release_hook into lp:location-service/trunk

[Robert Bruce Park]

Use new bileto_pre_release_hook.

Train behaviour has changed; this change is required for all future builds of location-service in CI Train.

[lp:~robru/location-service/pre_release_hook]

231. By Robert Bruce Park on 2016-04-05

Simplify symlinks.

[Robert Bruce Park (robru)]

Untested, but based off near-identical changes I made on 6 other projects, so should work.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/location-service-ci/427/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/99/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/99/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/99/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/427/rebuild

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

(failure unrelated to these simple packaging changes)

[Thomas Voß (thomas-voss)]

With the MP applied in https://requests.ci-train.ubuntu.com/#/ticket/1099, the build fails for both vivid and xenial, with the packaging setup complaining about etc/gps.conf being present in the build dir, but not installed to anywhere. The file itself is required and it should definitely be installed.

review: Needs Fixing

[lp:~robru/location-service/pre_release_hook]

232. By Robert Bruce Park on 2016-04-12

Fix ln.

[Robert Bruce Park (robru)]

Ok, fix confirmed locally & pushed, please re-add this to the silo and rebuild.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/location-service-ci/428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/100
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/100/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/428/rebuild

review: Approve (continuous-integration)

=== renamed file 'debian/gen-debian-files.sh' => 'debian/bileto_pre_release_hook'
--- debian/gen-debian-files.sh	2016-03-11 11:01:55 +0000
+++ debian/bileto_pre_release_hook	2016-04-12 06:37:06 +0000
@@ -16,6 +16,7 @@
 #
 # Authored by: Michi Henning <[e-mail]>
 #              Thomas Voß <[e-mail]>
+#              Robert Bruce Park <[e-mail]>
 
 #
 # Script to generate debian files for dual landing in Vivid (gcc 4.9 ABI)
@@ -27,85 +28,48 @@
 # - libubuntu-location-service${soversion}.install.${target_arch}
 #
 # For all but control, this is a straight substition and/or renaming exercise for each file.
-# For control, if building on Wily or later, we also fix the "Replaces:" and "Conflicts:"
-# entries, so we don't end up with two packages claiming ownership of the same places
-# in the file system.
-#
-# Because the debian files for the different distributions are generated on the fly,
-# this allows us to keep a single source tree for both distributions. See ../HACKING
-# for more explanations.
 #
 
 set -e  # Fail if any command fails.
 
 progname=$(basename $0)
 
-[ $# -ne 1 ] && {
-    echo "usage: $progname path-to-debian-dir" >&2
+[ $# -gt 1 ] && {
+    echo "usage: $progname [path-to-debian-dir]" >&2
     exit 1
 }
 dir=$1
 version_dir=$(mktemp -d)
 
+[ -n "$dir" ] || dir="./debian"
+[ -n "$SERIES" ] || SERIES="$(lsb_release -c -s)"
+
 # Dump version numbers into files and initialize vars from those files.
-
 sh ${dir}/get-versions.sh ${dir} ${version_dir}
 
-full_version=$(cat "${version_dir}"/libubuntu-location-service.full-version)
-major_minor=$(cat "${version_dir}"/libubuntu-location-service.major-minor-version)
-soversion=$(cat "${version_dir}"/libubuntu-location-service.soversion)
-vivid_soversion=$(cat "${version_dir}"/libubuntu-location-service.vivid-soversion)
-
-warning=$(mktemp -t gen-debian-files-msg.XXX)
-
-trap "rm -fr $warning $version_dir" 0 INT TERM QUIT
-
-warning_msg()
+export UBUNTU_LOCATION_SERVICE_SOVERSION=$(cat $version_dir/libubuntu-location-service.soversion)
+
+trap "rm -fr $version_dir" 0 INT TERM QUIT
+
+process()
 {
-    cat >$warning <<EOF
+    cat <<EOF
 # This file is autogenerated. DO NOT EDIT!
 #
 # Modifications should be made to $(basename "$1") instead.
 # This file is regenerated automatically in the clean target.
 #
 EOF
-}
-
-# Generate debian/control from debian/control.in, substituting the soversion for both libs.
-# For wily onwards, we also add an entry for the vivid versions to "Conflicts:" and "Replaces:".
-
-infile="${dir}"/control.in
-outfile="${dir}"/control
-warning_msg $infile
-cat $warning $infile \
-    | sed -e "s/@UBUNTU_LOCATION_SERVICE_SOVERSION@/${soversion}/" > "$outfile"
-
-[ "$distro" != "vivid" ] && {
-    sed -i -e "/Replaces: libubuntu-location-service2,/a\
-\          libubuntu-location-service${vivid_soversion}," \
-        "$outfile"
-}
-
-# Generate the install files, naming them according to the soversion.
-
-# Install file for binary package
-infile="${dir}"/libubuntu-location-service.install.in
-outfile="${dir}"/libubuntu-location-service${soversion}.install
-warning_msg "$infile"
-cat $warning "$infile" >"$outfile"
-
-infile="${dir}"/libubuntu-location-service.install.with-gps.in
-outfile="${dir}"/libubuntu-location-service${soversion}.install.with-gps
-warning_msg "$infile"
-cat $warning "$infile" >"$outfile"
-
-infile="${dir}"/libubuntu-location-service-dev.install.in
-outfile="${dir}"/libubuntu-location-service-dev.install
-warning_msg "$infile"
-cat $warning $infile | sed -e "s/@UBUNTU_LOCATION_SERVICE_SOVERSION@/${soversion}/" > "$outfile"
-
-ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.amd64
-ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.armhf
-ln -s "${dir}"/libubuntu-location-service${soversion}.install.with-gps "${dir}"/libubuntu-location-service${soversion}.install.i386
+    perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"
+}
+
+process "$dir/control.in" >"$dir/control"
+process "$dir/libubuntu-location-service.install.in" >"$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install"
+process "$dir/libubuntu-location-service.install.with-gps.in" >"$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps"
+process "$dir/libubuntu-location-service-dev.install.in" >"$dir/libubuntu-location-service-dev.install"
+
+ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.amd64"
+ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.armhf"
+ln -vsf "libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.with-gps" "$dir/libubuntu-location-service${UBUNTU_LOCATION_SERVICE_SOVERSION}.install.i386"
 
 exit 0

=== modified file 'debian/control'
--- debian/control	2016-03-11 10:00:24 +0000
+++ debian/control	2016-04-12 06:37:06 +0000
@@ -41,7 +41,7 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
 
-Package: libubuntu-location-service2
+Package: libubuntu-location-service3
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -58,7 +58,7 @@
 Architecture: any
 Multi-Arch: foreign
 Recommends: ubuntu-location-service-doc,
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          libdbus-1-dev,
          libdbus-cpp-dev,
          libboost-dev,
@@ -74,7 +74,7 @@
 Section: debug
 Architecture: any
 Multi-Arch: foreign
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
 Description: location service aggregating position/velocity/heading
  updates and exporting them over dbus.
@@ -92,7 +92,7 @@
 
 Package: ubuntu-location-service-bin
 Architecture: any
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          trust-store-bin,
@@ -106,7 +106,7 @@
 Package: ubuntu-location-service-examples
 Architecture: any
 Multi-Arch: same
-Depends: libubuntu-location-service2 (= ${binary:Version}),
+Depends: libubuntu-location-service3 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          ubuntu-location-service-doc,

=== modified file 'debian/get-versions.sh'
--- debian/get-versions.sh	2016-03-11 11:01:55 +0000
+++ debian/get-versions.sh	2016-04-12 06:37:06 +0000
@@ -36,9 +36,9 @@
 [ $# -eq 2 ] && output_dir=$2
 
 # Write the various version numbers into a bunch of files. This allows
-# us to easily pick them up from both gen-debian-files.sh and CMakeLists.txt.
+# us to easily pick them up from both bileto_pre_release_hook and CMakeLists.txt.
 
-distro=$(lsb_release -c -s)
+[ -n "$SERIES" ] || SERIES="$(lsb_release -c -s)"
 
 full_version=$(cat "${dir}"/VERSION)
 
@@ -51,13 +51,13 @@
 vivid_major=$(echo $vivid_full_version | cut -d'.' -f1)
 vivid_soversion=$vivid_major
 
-if [ "$distro" = "vivid" ]
+if [ "$SERIES" = "vivid" ]
 then
     soversion=${vivid_soversion}
 else
     soversion="${major}"
 fi
-[ -n $soversion ]
+[ -n "$soversion" ]
 
 echo ${full_version} >${output_dir}/libubuntu-location-service.full-version
 echo ${major} >${output_dir}/libubuntu-location-service.major-version

=== modified file 'debian/libubuntu-location-service-dev.install'
--- debian/libubuntu-location-service-dev.install	2016-03-11 10:00:24 +0000
+++ debian/libubuntu-location-service-dev.install	2016-04-12 06:37:06 +0000
@@ -3,7 +3,7 @@
 # Modifications should be made to libubuntu-location-service-dev.install.in instead.
 # This file is regenerated automatically in the clean target.
 #
-usr/include/ubuntu-location-service-2
+usr/include/ubuntu-location-service-3
 usr/lib/*/libubuntu-location-service.so
 usr/lib/*/libubuntu-location-service-connectivity.so
 usr/lib/*/pkgconfig/ubuntu-location-service.pc

=== modified file 'debian/rules'
--- debian/rules	2016-03-11 10:00:24 +0000
+++ debian/rules	2016-04-12 06:37:06 +0000
@@ -46,8 +46,5 @@
 	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER) -DUBUNTU_LOCATION_SERVICE_VERSION_MAJOR=$(major) -DUBUNTU_LOCATION_SERVICE_VERSION_MINOR=$(minor) -DUBUNTU_LOCATION_SERVICE_VERSION_PATCH=$(patch)
 
 override_dh_auto_clean:
-	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.amd64
-	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.armhf
-	rm -f $(CURDIR)/debian/libubuntu-location-service$(major).install.i386
-	/bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian
+	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
 	dh_auto_clean