debian/changelog | 6 +++---
debian/compat | 2 +-
debian/control | 3 +--
debian/mesa-utils-extra.install | 3 +--
debian/mesa-utils-extra.links | 1 +
debian/rules | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 92afbdf63f02663f066a545849e1b34b68cf1e66
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Wed May 29 15:11:25 2013 -0400
debian/rules: Drop quilt usage.
diff --git a/debian/changelog b/debian/changelog
index 9124fab..1fe860a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mesa-demos (8.1.0-0ubuntu1) UNRELEASED; urgency=low
- Dropped, upstream.
* Install es2gears_x11 and es2gears_screen, create es2gears symlink
pointing to es2gears_x11 to retain old functionality.
+ * Drop quilt usage from debian/rules.
-- Robert Hooker <sarv...@ubuntu.com> Wed, 01 May 2013 21:23:58 -0400
diff --git a/debian/rules b/debian/rules
index 1bfde17..01b542e 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 5df5556b694a7d5c7a8b27221a895ac79619003a
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Wed May 29 15:10:40 2013 -0400
Fix mismerge from debian-unstable, switch to libglew-dev as a build dep.
diff --git a/debian/control b/debian/control
index 13fca36..eaf67b5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.2.7),
libx11-dev,
libxext-dev,
libgl1-mesa-dev,
- libglew1.5-dev,
+ libglew-dev,
libglu1-mesa-dev,
libegl1-mesa-dev,
libgles1-mesa-dev,
commit 5e755dd67aa662dfe9d99b20e8fe253790cb79de
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Wed May 29 15:10:05 2013 -0400
Install es2gears_x11 and es2gears_screen, create es2gears symlink pointing
to es2gears_x11 to retain old functionality.
diff --git a/debian/changelog b/debian/changelog
index a3cc94c..9124fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ 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.
+ * Install es2gears_x11 and es2gears_screen, create es2gears symlink
+ pointing to es2gears_x11 to retain old functionality.
-- Robert Hooker <sarv...@ubuntu.com> Wed, 01 May 2013 21:23:58 -0400
diff --git a/debian/mesa-utils-extra.install b/debian/mesa-utils-extra.install
index 4592e03..491aba4 100644
--- a/debian/mesa-utils-extra.install
+++ b/debian/mesa-utils-extra.install
@@ -1,3 +1,4 @@
usr/bin/es2_info
-usr/bin/es2gears
+usr/bin/es2gears_x11
+usr/bin/es2gears_screen
usr/bin/es2tri
diff --git a/debian/mesa-utils-extra.links b/debian/mesa-utils-extra.links
new file mode 100644
index 0000000..288bf06
--- /dev/null
+++ b/debian/mesa-utils-extra.links
@@ -0,0 +1 @@
+/usr/bin/es2gears_x11 /usr/bin/es2gears
commit c0408511868d80b74d6d7a9ce2d6930e16417227
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Wed May 29 15:07:45 2013 -0400
Revert "debian/: Multiple packaging adjustments"
This reverts commit 3811b65e3f8a539be10f1b8b6ba73e3be5f8c1c9.
diff --git a/debian/changelog b/debian/changelog
index f7caa91..a3cc94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,6 @@ 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 <sarv...@ubuntu.com> Wed, 01 May 2013 21:23:58 -0400
diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index 0efff5c..13fca36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,15 @@ Section: utils
Priority: optional
Maintainer: Ubuntu X-SWAT <ubunt...@lists.ubuntu.com>
Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 7.2.7),
pkg-config,
autoconf,
automake,
dh-autoreconf,
- dh-exec,
libx11-dev,
libxext-dev,
libgl1-mesa-dev,
- libglew-dev,
+ libglew1.5-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 100755
new mode 100644
index e5cc8d4..4592e03
--- a/debian/mesa-utils-extra.install
+++ b/debian/mesa-utils-extra.install
@@ -1,5 +1,3 @@
-#!/usr/bin/dh-exec
usr/bin/es2_info
-usr/bin/es2gears_screen
-usr/bin/es2gears_x11 => /usr/bin/es2gears
+usr/bin/es2gears
usr/bin/es2tri
diff --git a/debian/rules b/debian/rules
index a4279c3..1bfde17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ get-orig-source:
rm -rf $(deb_source)-$(upstream_version)
%:
- dh $@ --with=autoreconf
+ dh --with=quilt --with=autoreconf $@
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uhlnr-0000vv...@vasks.debian.org
