[Merge] lp:~gary-wzl77/net-cpp/dual_landing_support into lp:net-cpp
Robert Bruce Park
robert.park at canonical.com
Thu Aug 11 16:04:20 UTC 2016
(better explanation inline)
Diff comments:
>
> === added file 'debian/bileto_pre_release_hook'
> --- debian/bileto_pre_release_hook 1970-01-01 00:00:00 +0000
> +++ debian/bileto_pre_release_hook 2016-08-11 14:09:31 +0000
> @@ -0,0 +1,65 @@
> +#!/bin/sh
> +
> +# Copyright (C) 2015 Canonical Ltd
> +#
> +# This program is free software: you can redistribute it and/or modify
> +# it under the terms of the GNU Lesser 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 warranty of
> +# 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 Lesser General Public License
> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
> +#
> +# Authored by: Michi Henning <michi.henning at canonical.com>
> +# Thomas Voß <thomas.voss at canonical.com>
> +# Robert Bruce Park <robert.park at canonical.com>
> +
> +#
> +# Script to generate debian files for dual landing in Vivid (gcc 4.9 ABI)
> +# and Wily and later (gcc 5 ABI).
> +#
> +# This script is called from debian/rules and generates:
> +#
> +# - control
> +# - libnet-cpp${soversion}.install
> +#
> +# For all but control, this is a straight substition and/or renaming exercise for each file.
> +#
> +
> +set -e # Fail if any command fails.
> +
> +progname=$(basename $0)
> +
> +[ $# -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}
> +
> +export NET_CPP_SOVERSION=$(cat $version_dir/libnet-cpp.soversion)
> +
> +trap "rm -fr $version_dir" 0 INT TERM QUIT
> +
> +process()
> +{
> + perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"
> +}
> +
> +process "$dir/control.in" >"$dir/control"
> +process "$dir/changelog.in" >"$dir/changelog"
This is not valid, as it overwrites the changelog that bileto generates for you. If you want to ensure the version in the changelog matches the SOVERSION you'll have to sed it in place, like this:
sed --in-place "1s/([^+]*/($PROCESS_CPP_SOVERSION/" $dir/changelog
> +process "$dir/libnet-cpp.install.in" > "$dir/libnet-cpp${PROCESS_CPP_SOVERSION}.install"
> +process "$dir/libnet-cpp-dev.install.in" > "$dir/libnet-cpp${PROCESS_CPP_SOVERSION}.dev"
> +process "$dir/libnet-cpp-doc.install.in" > "$dir/libnet-cpp${PROCESS_CPP_SOVERSION}.doc"
> +
> +exit 0
>
> === added file 'debian/changelog.in'
> --- debian/changelog.in 1970-01-01 00:00:00 +0000
> +++ debian/changelog.in 2016-08-11 14:09:31 +0000
> @@ -0,0 +1,132 @@
> +net-cpp (@NET_CPP_SOVERSION at .0.0ubuntu1) UNRELEASED; urgency=medium
Delete this entire file, you can't have a changelog.in.
> +
> + [ Thomas Voß ]
> + [Gary Wang]
> + * Enable pause/resume of requests.
> + * Fix LP:#1570686 and LP:#1570687
> +
> + [ Gary Wang ]
> + * Add data reading callback function in streaming http interface.
> + * Fix LP:#1605179
> +
> + -- Thomas Voß <thomas.voss at canonical.com> Thu, 21 Jul 2016 04:05:05 -0700
> +
> +net-cpp (1.2.0+15.04.20150415.2-0ubuntu1) vivid; urgency=medium
> +
> + [ Thomas Voß ]
> + * Introduce a streaming http interface.
> +
> + -- CI Train Bot <ci-train-bot at canonical.com> Wed, 15 Apr 2015 12:34:49 +0000
> +
> +net-cpp (1.1.0+15.04.20150305-0ubuntu1) vivid; urgency=medium
> +
> + [ thomas-voss ]
> + * Make sure that Multi::Private instances are correctly cleaned up by
> + only handing out weak_ptr's to it. (LP: #1419620, #1423765)
> +
> + -- CI Train Bot <ci-train-bot at canonical.com> Thu, 05 Mar 2015 12:08:09 +0000
> +
> +net-cpp (1.1.0+15.04.20150123-0ubuntu1) vivid; urgency=low
> +
> + [ Ubuntu daily release ]
> + * New rebuild forced
> +
> + [ Marcus Tomlinson ]
> + * Explicitly cast milliseconds::count() to long.
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Fri, 23 Jan 2015 10:17:07 +0000
> +
> +net-cpp (1.1.0+15.04.20141204-0ubuntu1) vivid; urgency=low
> +
> + [ Ubuntu daily release ]
> + * debian/libnet-cpp1.symbols: auto-update to released version
> + * New rebuild forced
> +
> + [ thomas-voss ]
> + * Robustify header line parser against empty values in header lines.
> + Add test case to verify that empty header value handling is correct.
> + (LP: #1392315)
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Thu, 04 Dec 2014 20:54:29 +0000
> +
> +net-cpp (1.1.0+14.10.20140804-0ubuntu1) utopic; urgency=medium
> +
> + [ Pete Woods ]
> + * Add Uri class and corresponding string conversion.
> +
> + [ Ubuntu daily release ]
> + * debian/libnet-cpp1.symbols: auto-update to released version
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Mon, 04 Aug 2014 09:41:07 +0000
> +
> +net-cpp (1.0.0+14.10.20140729.1-0ubuntu1) utopic; urgency=low
> +
> + [ Pete Woods ]
> + * No change rebuild
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Tue, 29 Jul 2014 10:18:39 +0000
> +
> +net-cpp (1.0.0+14.10.20140718-0ubuntu1) utopic; urgency=medium
> +
> + [ Thomas Voß ]
> + * Bump major revision and so name to account for toolchain update.
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Fri, 18 Jul 2014 12:38:11 +0000
> +
> +net-cpp (0.0.1+14.10.20140611-0ubuntu1) utopic; urgency=low
> +
> + [ Thomas Voß ]
> + * Initial release.
> +
> + [ Ubuntu daily release ]
> + * debian/*symbols: auto-update new symbols to released version
> +
> + [ thomas-voss ]
> + * Initial checkin.
> + * Adjusted URI parsing.
> + * Add documentation for the Uri class.
> + * Added an exception for signalling parsing errors.
> + * GET, POST, PUT, HEAD now works.
> + * Add tests working against the mozilla location service. Add a
> + missing handle reset for handles recycled from the pool.
> + * Add curl multi support.
> + * Cleanup curl based implementatoin and split out easy, multi and
> + shared into their own header/implementation files. Provide an async
> + interface to executing requests. Provide basic and digest auth
> + support.
> + * Cleanup error handling. Add documentation for
> + core::net::http::Request.
> + * Add documentation and clean up.
> + * Add load tests and statistics.
> + * Add debian packaging. Add timeout for requests. Add cancel
> + functionality for requests.
> + * Add pkg-config setup.
> + * Add doc package. Add symbols file and symbols map.
> + * Enable ssl default engine. Disable host and peer ssl checks.
> + * Make sure that a request survives an async execution.
> + * Add libcurl4-openssl-dev as a build-dependency. Ensure that no
> + signals are being caught by curl. Switch to production url for
> + Mozilla's location service.
> + * Get rid of custom Uri class, not needed right now. Add custom header
> + support for http requests.
> + * Make test-cases standalone by running a local instance of httpbin.
> + * Add bzr builddeb configuration.
> + * Remove references to core::net::Uri.
> + * Remove further references to core::net::Uri.
> + * Adjust path to server executable in tests. Add missing build
> + dependencies.
> + * Make sure that we do not block indefinitely waiting for the httpbin
> + instance to be torn down.
> + * Make sure to strip leading and trailing whitespace from header
> + fields.
> + * Make sure that we kill the entire python process group running the
> + httpbin instance.
> + * Run httpbin without the flask-weirdness to allow for killing it with
> + a vanilla unix signal. Make sure we execute all the right tests :-)
> + * Disable test case running against the Ubuntu app store.
> + * Merged lp:~pete-woods/net-cpp/base64
> +
> + [ CI bot ]
> + * Empty MP for landing.
> +
> + -- Ubuntu daily release <ps-jenkins at lists.canonical.com> Wed, 11 Jun 2014 10:28:20 +0000
--
https://code.launchpad.net/~gary-wzl77/net-cpp/dual_landing_support/+merge/302671
Your team Ubuntu Phablet Team is subscribed to branch lp:net-cpp.
More information about the Ubuntu-reviews
mailing list