[Pkg-chromium-commit] [pkg-chromium] 01/01: simplify build information

[Shawn Landden]

I don't really think it is correct to have preferences in
/usr/lib/chromium. master_preferences should be treated as a config
file and be under /etc/chromium as it was.

On Sun, Apr 26, 2015 at 5:55 PM, Michael Gilbert
<mgilbert at moszumanska.debian.org> wrote:
> This is an automated email from the git hooks/post-receive script.
>
> mgilbert pushed a commit to branch master
> in repository pkg-chromium.
>
> commit 500542d5530af764c9de120c8af65079d1cb85f9
> Author: Michael Gilbert <mgilbert at debian.org>
> Date:   Sun Apr 26 20:56:12 2015 -0400
>
>     simplify build information
> ---
>  debian/changelog        |  6 ++++++
>  debian/scripts/chromium | 15 ++++++---------
>  2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 544901c..ce1db16 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +chromium-browser (42.0.2311.90-3) UNRELEASED; urgency=medium
> +
> +  * Simplify build information.
> +
> + -- Michael Gilbert <mgilbert at debian.org>  Mon, 27 Apr 2015 00:48:11 +0000
> +
>  chromium-browser (42.0.2311.90-2) unstable; urgency=medium
>
>    * Update debian/copyright.
> diff --git a/debian/scripts/chromium b/debian/scripts/chromium
> index 6d2903d..11b331c 100644
> --- a/debian/scripts/chromium
> +++ b/debian/scripts/chromium
> @@ -6,10 +6,11 @@
>  #  Fabien Tassin <fta at sofaraway.org>
>  # License: GPLv2 or later
>
> -APPNAME=chromium
> -LIBDIR=/usr/lib/chromium
>  GDB=/usr/bin/gdb
> -BUILD_DIST="Debian @BUILD_DIST@"
> +LIBDIR=/usr/lib/chromium
> +BUILD_DIST="@BUILD_DIST@"
> +
> +APPNAME=`basename $0`
>
>  usage () {
>    echo "$APPNAME [-h|--help] [-g|--debug] [--temp-profile] [options] [URL]"
> @@ -41,12 +42,8 @@ for file in /etc/chromium.d/*; do
>  done
>
>  # Set CHROME_VERSION_EXTRA visible in the About dialog and in about:version
> -DIST="Debian `cat /etc/debian_version`"
> -if [ "$DIST" = "$BUILD_DIST" ] ; then
> -  export CHROME_VERSION_EXTRA="$DIST"
> -else
> -  export CHROME_VERSION_EXTRA="Built on $BUILD_DIST, running on $DIST"
> -fi
> +DIST=`cat /etc/debian_version`
> +export CHROME_VERSION_EXTRA="Built on Debian $BUILD_DIST, running on Debian $DIST"
>
>  want_debug=0
>  want_temp_profile=0
>
> --
> Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
>
> _______________________________________________
> Pkg-chromium-commit mailing list
> Pkg-chromium-commit at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-chromium-commit



-- 
Liberty equality fraternity or death,

Shawn Landden
ChurchOfGit.com