Merge remote-tracking branch 'cros/master' into debian

Change-Id: I9e325f6ab735b9c8d3fa13b661eb50874a6d7f69
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..38603d5
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,7 @@
+glbench for Debian
+-----------------
+
+Built from git.
+
+ -- David Riley <davidriley@chromium.org>  Wed, 23 Oct 2019 21:45:09 +0000
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..80793a4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+glbench (0+git20191022.414ba819-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- David Riley <davidriley@chromium.org>  Wed, 23 Oct 2019 21:45:09 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b4de394
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..a5de94d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: glbench
+Section: x11
+Priority: optional
+Maintainer: David Riley <davidriley@chromium.org>
+Build-Depends:
+ debhelper (>= 11),
+ libegl1-mesa-dev,
+ libgflags-dev,
+ libgl1-mesa-dev,
+ libgles2-mesa-dev,
+ libpng-dev,
+ libwaffle-1-0 (>= 1.6.0),
+ libwaffle-dev (>= 1.6.0),
+ pkg-config,
+Standards-Version: 4.1.3
+Homepage: https://chromium.googlesource.com/chromiumos/platform/glbench
+Vcs-Browser: https://chromium.googlesource.com/chromiumos/platform/glbench
+Vcs-Git: https://chromium.googlesource.com/chromiumos/platform/glbench.git
+
+Package: glbench
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenGL benchmarking tool
+ Tool to measure OpenGL performance through a series of microbenchmarks.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..4a121d9
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,34 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: glbench
+Source: https://chromium.googlesource.com/chromiumos/platform/glbench/
+
+Files: *
+Copyright: 2007-2019 The Chromium OS Authors <chromium-os-dev@chromium.org>
+License: BSD-Google
+
+License: BSD-Google
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+     * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+     * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/glbench-docs.docs b/debian/glbench-docs.docs
new file mode 100644
index 0000000..7fa9570
--- /dev/null
+++ b/debian/glbench-docs.docs
@@ -0,0 +1 @@
+README.source
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..bb81afc
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+# Copyright 2019 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+%:
+	dh $@
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)