debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 5 +++-- debian/mesa-utils-extra.install | 4 +++- debian/rules | 2 +- src/egl/opengles2/es2_info.c | 1 + 6 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit 3811b65e3f8a539be10f1b8b6ba73e3be5f8c1c9 Author: Robert Hooker <[email protected]> Date: Thu May 2 07:44:25 2013 -0400 debian/: Multiple packaging adjustments Switch to dh 9 Add dh-exec to build deps Install es2gears_screen along with es2gears in mesa-utils-extra, and rename es2gears_x11. Reorder arguements in debian/rules for dh9 and drop quilt Fix mismerge from debian-unstable, switch to libglew-dev as a build dep. diff --git a/debian/changelog b/debian/changelog index a3cc94c..f7caa91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low * Added package mesa-utils-extra containing the EGL/GLES2 demos * debian/patches/properly_defining_default_precision_es2gears.patch: - Dropped, upstream. + * Switch to dh 9 + * Add dh-exec to build deps and drop quilt. + * Install es2gears_screen along with es2gears in mesa-utils-extra. -- Robert Hooker <[email protected]> Wed, 01 May 2013 21:23:58 -0400 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 13fca36..0efff5c 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,16 @@ Section: utils Priority: optional Maintainer: Ubuntu X-SWAT <[email protected]> Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 7.2.7), +Build-Depends: debhelper (>= 9), pkg-config, autoconf, automake, dh-autoreconf, + dh-exec, libx11-dev, libxext-dev, libgl1-mesa-dev, - libglew1.5-dev, + libglew-dev, libglu1-mesa-dev, libegl1-mesa-dev, libgles1-mesa-dev, diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install old mode 100644 new mode 100755 index 4592e03..e5cc8d4 --- a/debian/mesa-utils-extra.install +++ b/debian/mesa-utils-extra.install @@ -1,3 +1,5 @@ +#!/usr/bin/dh-exec usr/bin/es2_info -usr/bin/es2gears +usr/bin/es2gears_screen +usr/bin/es2gears_x11 => /usr/bin/es2gears usr/bin/es2tri diff --git a/debian/rules b/debian/rules index 1bfde17..a4279c3 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ get-orig-source: rm -rf $(deb_source)-$(upstream_version) %: - dh --with=quilt --with=autoreconf $@ + dh $@ --with=autoreconf override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit e94cc2cf224253d7a823fd5ccb7c59526d636b9b Author: Robert Hooker <[email protected]> Date: Thu May 2 07:15:53 2013 -0400 Revert "Delete old src/egl/opengles2/es2_info.c from the git repo, its a link in the tarball." This reverts commit 53b57053dfee074b022911f3d745538c90f7b7fe. diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c new file mode 120000 index 0000000..bde3140 --- /dev/null +++ b/src/egl/opengles2/es2_info.c @@ -0,0 +1 @@ +../opengles1/es1_info.c \ No newline at end of file -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
