diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:44:34 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:44:34 +0000 |
| commit | 4b992eb3e2af0a41dfe7124e587fa8e57ddba08f (patch) | |
| tree | 128c59743be77c256dc26453f634cab6ebe1d920 /remoting | |
| parent | bcc801f915c3cb3f0440dd3fc2a341222e6ee269 (diff) | |
| download | chromium_src-4b992eb3e2af0a41dfe7124e587fa8e57ddba08f.zip chromium_src-4b992eb3e2af0a41dfe7124e587fa8e57ddba08f.tar.gz chromium_src-4b992eb3e2af0a41dfe7124e587fa8e57ddba08f.tar.bz2 | |
Chromoting Debian package improvements
* Update .gitignore.
* Remove "lucid" from changelog - lucid will soon be no more!
* Add revision number to changelog.
* Don't strip binaries by default - the small increase in package size is
worth the convenience of easier debugging.
* Downgrade xvfb-randr from Depends: to Recommends:. This allows users to opt
out of dynamic-resize, but new installs will still get xvfb-randr due to the
default APT config (APT::Install-Recommends "true").
Review URL: https://chromiumcodereview.appspot.com/11366258
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rwxr-xr-x | remoting/host/installer/linux/build-deb.sh | 20 | ||||
| -rw-r--r-- | remoting/host/installer/linux/debian/.gitignore | 1 | ||||
| -rw-r--r-- | remoting/host/installer/linux/debian/control | 3 |
3 files changed, 20 insertions, 4 deletions
diff --git a/remoting/host/installer/linux/build-deb.sh b/remoting/host/installer/linux/build-deb.sh index 5e75fb4..7177b4e 100755 --- a/remoting/host/installer/linux/build-deb.sh +++ b/remoting/host/installer/linux/build-deb.sh @@ -27,15 +27,29 @@ if [[ ! "$version_full" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then exit 1 fi -echo "Building version $version_full" +# Include revision information in changelog when building from a local +# git-based checkout. +merge_head="$(git merge-base HEAD origin/git-svn 2>/dev/null)" +if [[ -n "$merge_head" ]]; then + revision="$(git svn find-rev "$merge_head" 2>/dev/null)" + if [[ -n "$revision" ]]; then + revision_text="(r$revision)" + fi +fi + +# Don't strip binaries unless build options are already specified. This doesn't +# have much effect on package size (13MB versus 14MB), so it's worth keeping +# the symbols for now. +export DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS:-nostrip}" + +echo "Building version $version_full $revision_text" # Create a fresh debian/changelog. export DEBEMAIL="The Chromium Authors <chromium-dev@chromium.org>" rm -f debian/changelog debchange --create \ --package chrome-remote-desktop \ - --distribution lucid \ --newversion "$version_full" \ - "New Debian package" + "New Debian package $revision_text" dpkg-buildpackage -b -us -uc diff --git a/remoting/host/installer/linux/debian/.gitignore b/remoting/host/installer/linux/debian/.gitignore index 9a86d22..3303775 100644 --- a/remoting/host/installer/linux/debian/.gitignore +++ b/remoting/host/installer/linux/debian/.gitignore @@ -1,6 +1,7 @@ changelog chrome-remote-desktop.debhelper.log chrome-remote-desktop.postinst.debhelper +chrome-remote-desktop.postrm.debhelper chrome-remote-desktop.prerm.debhelper chrome-remote-desktop.substvars chrome-remote-desktop diff --git a/remoting/host/installer/linux/debian/control b/remoting/host/installer/linux/debian/control index 3023f18..2a5bf8a4 100644 --- a/remoting/host/installer/linux/debian/control +++ b/remoting/host/installer/linux/debian/control @@ -12,7 +12,8 @@ Homepage: https://chrome.google.com/remotedesktop Package: chrome-remote-desktop Architecture: any -Depends: xvfb-randr, python (>= 2.6), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: xvfb-randr | xvfb, python (>= 2.6), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Recommends: xvfb-randr Suggests: google-chrome-stable | google-chrome-beta | google-chrome-unstable Description: Access your computer securely over the Internet. Chrome Remote Desktop allows you to securely access your computer remotely |