Merge lp:~robru/media-hub/pre_release_hook into lp:media-hub

[Robert Bruce Park]

Use new bileto_pre_release_hook.

[lp:~robru/media-hub/pre_release_hook]

180. By Robert Bruce Park on 2016-03-29

Print $soversion and $SERIES.

181. By Robert Bruce Park on 2016-03-29

More logging

182. By Robert Bruce Park on 2016-03-29

Drop redundant log.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

=== renamed file 'debian/gen-debian-files.sh' => 'debian/bileto_pre_release_hook'
--- debian/gen-debian-files.sh	2015-11-22 21:01:02 +0000
+++ debian/bileto_pre_release_hook	2016-03-29 18:34:58 +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)
@@ -24,79 +25,47 @@
 # This script is called from debian/rules and generates:
 #
 # - control
-# - libtrust-store${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.
+# - libmedia-hub-client${MEDIA_HUB_SOVERSION}.install
+# - libmedia-hub-common${MEDIA_HUB_SOVERSION}.install
 #
 # 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.
+# this allows us to keep a single source tree for both distributions.
 #
 
 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
 }
+version_dir=$(mktemp -d)
 dir=$1
-version_dir=$(mktemp -d)
+
+[ -n "$dir" ] || dir="./debian"
 
 # Dump version numbers into files and initialize vars from those files.
-
 sh ${dir}/get-versions.sh ${dir} ${version_dir}
 
-full_version=$(cat "${version_dir}"/libmedia-hub.full-version)
-major_minor=$(cat "${version_dir}"/libmedia-hub.major-minor-version)
-soversion=$(cat "${version_dir}"/libmedia-hub.soversion)
-vivid_soversion=$(cat "${version_dir}"/libmedia-hub.vivid-soversion)
-
-warning=$(mktemp -t gen-debian-files-msg.XXX)
-
-trap "rm -fr $warning $version_dir" 0 INT TERM QUIT
-
-warning_msg()
+export MEDIA_HUB_SOVERSION=$(cat "$version_dir/libmedia-hub.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/@MEDIA_HUB_SOVERSION@/${soversion}/" > "$outfile"
-
-[ "$distro" != "vivid" ] && {
-    sed -i -e "/Replaces: libdbus-cpp4,/a\
-\          libdbus-cpp${vivid_soversion}," \
-        "$outfile"
-}
-
-# Generate the install files, naming them according to the soversion.
-
-# Install file for binary package
-infile="${dir}"/libmedia-hub-client.install.in
-outfile="${dir}"/libmedia-hub-client${soversion}.install
-warning_msg "$infile"
-cat $warning "$infile" >"$outfile"
-
-infile="${dir}"/libmedia-hub-common.install.in
-outfile="${dir}"/libmedia-hub-common${soversion}.install
-warning_msg "$infile"
-cat $warning "$infile" >"$outfile"
+    perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"
+}
+
+process "$dir/control.in" >"$dir/control"
+process "$dir/libmedia-hub-client.install.in" >"$dir/libmedia-hub-client${MEDIA_HUB_SOVERSION}.install"
+process "$dir/libmedia-hub-common.install.in" >"$dir/libmedia-hub-common${MEDIA_HUB_SOVERSION}.install"
 
 exit 0
 
=== modified file 'debian/control'
--- debian/control	2016-03-04 18:17:11 +0000
+++ debian/control	2016-03-29 18:34:58 +0000
@@ -20,9 +20,9 @@
                libboost-program-options-dev (>=1.53),
                libboost-system-dev (>=1.53),
                libdbus-1-dev,
-               libdbus-cpp-dev (>= 5.0.0),
+               libdbus-cpp-dev (>= 4.3.0),
                libgoogle-glog-dev,
-               libhybris-dev,
+               libhybris-dev (>=0.1.0+git20131207+e452e83-0ubuntu30),
                libprocess-cpp-dev,
                libproperties-cpp-dev,
                libgstreamer1.0-dev,
@@ -42,8 +42,8 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmedia-hub-common4 (= ${binary:Version}),
-         libmedia-hub-client4 (= ${binary:Version}),
+Depends: libmedia-hub-common5 (= ${binary:Version}),
+         libmedia-hub-client5 (= ${binary:Version}),
          ${misc:Depends},
          libproperties-cpp-dev,
 Suggests: libmedia-hub-doc
@@ -64,7 +64,7 @@
  .
  This package contains the runtime.
 
-Package: libmedia-hub-common4
+Package: libmedia-hub-common5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -75,7 +75,7 @@
  .
  This package contains the common libraries.
 
-Package: libmedia-hub-client4
+Package: libmedia-hub-client5
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
 
=== modified file 'debian/get-versions.sh'
--- debian/get-versions.sh	2015-11-22 21:01:02 +0000
+++ debian/get-versions.sh	2016-03-29 18:34:58 +0000
@@ -38,7 +38,7 @@
 # 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.
 
-distro=$(lsb_release -c -s)
+[ -n "$SERIES" ] || SERIES="$(lsb_release -c -s)"
 
 full_version=$(cat "${dir}"/VERSION)
 
@@ -51,13 +51,15 @@
 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 "Using SOVERSION $soversion in $SERIES." >&2
 
 echo ${full_version} >${output_dir}/libmedia-hub.full-version
 echo ${major} >${output_dir}/libmedia-hub.major-version
 
=== modified file 'debian/rules'
--- debian/rules	2015-11-22 21:01:02 +0000
+++ debian/rules	2016-03-29 18:34:58 +0000
@@ -34,5 +34,5 @@
 	dh_installdeb
 
 override_dh_auto_clean:
-	/bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian
+	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
 	dh_auto_clean