xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/control | 3 +--
debian/patches/add-missing-include.diff | 19 +++++++++++++++++++
debian/patches/series | 2 +-
debian/watch | 2 +-
5 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 3fc3d841268b486a8d675687e3bd54ccb7b661c7
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 16:40:05 2016 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index e825ccb..cc143e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
+xserver-xorg-video-openchrome (1:0.3.3-2) unstable; urgency=medium
* control: Drop Julien Viard de Galbert and Cyril Brulebois from
Uploaders.
@@ -6,7 +6,7 @@ xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
* watch: Updated.
* add-missing-include.diff: Fix build against xserver 1.18.
- -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:21:41 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:39:42 +0200
xserver-xorg-video-openchrome (1:0.3.3-1) unstable; urgency=low
commit 430dbd8219975c7d2d1d197be38076d74167be0e
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 16:34:58 2016 +0200
add-missing-include.diff: Fix build against xserver 1.18.
diff --git a/debian/changelog b/debian/changelog
index 607ff2f..e825ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
Uploaders.
* control: Update homepage.
* watch: Updated.
+ * add-missing-include.diff: Fix build against xserver 1.18.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:21:41 +0200
diff --git a/debian/patches/add-missing-include.diff b/debian/patches/add-missing-include.diff
new file mode 100644
index 0000000..c143fda
--- /dev/null
+++ b/debian/patches/add-missing-include.diff
@@ -0,0 +1,19 @@
+commit 319fcdad57ebf4f1ef828c3344058ff8f6197432
+Author: Xavier Bachelot <xavier@bachelot.org>
+Date: Tue Jan 13 18:34:53 2015 +0100
+
+ Add missing header inclusion.
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=88334
+
+diff --git a/src/via_3d.h b/src/via_3d.h
+index c33228e..15be0be 100644
+--- a/src/via_3d.h
++++ b/src/via_3d.h
+@@ -24,6 +24,7 @@
+ #ifndef VIA_3D_H
+ #define VIA_3D_H
+
++#include "xorg-server.h"
+ #include "xf86.h"
+ #include "via_dmabuffer.h"
+
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..e7b0e40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+add-missing-include.diff
commit 8d7528034aa2d40c0f793fbad89cfdb2326f7baa
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 16:26:37 2016 +0200
watch: Updated.
diff --git a/debian/changelog b/debian/changelog
index e777487..607ff2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
* control: Drop Julien Viard de Galbert and Cyril Brulebois from
Uploaders.
* control: Update homepage.
+ * watch: Updated.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:21:41 +0200
diff --git a/debian/watch b/debian/watch
index bcf2419..5edf1c3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-http://www.openchrome.org/releases/xf86-video-openchrome-(\d.*)\.tar\.gz
+http://xorg.freedesktop.org/archive/individual/driver//xf86-video-openchrome-(\d.*)\.tar\.gz
commit 59bd6048d4fba4c2a5db8b160fda44673aba8c97
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 16:24:14 2016 +0200
control: Update homepage.
diff --git a/debian/changelog b/debian/changelog
index 4e60ab5..e777487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
* control: Drop Julien Viard de Galbert and Cyril Brulebois from
Uploaders.
+ * control: Update homepage.
-- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:21:41 +0200
diff --git a/debian/control b/debian/control
index b7f7907..4afae50 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
quilt
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.3
-Homepage: http://www.openchrome.org
+Homepage: https://www.freedesktop.org/wiki/Openchrome/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
commit c1d451cfefa7affdab2199080ed97ef5e070cf59
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Tue Feb 9 16:23:31 2016 +0200
control: Drop Julien Viard de Galbert and Cyril Brulebois from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 6f5dfdf..4e60ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-openchrome (1:0.3.3-2) UNRELEASED; urgency=medium
+
+ * control: Drop Julien Viard de Galbert and Cyril Brulebois from
+ Uploaders.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Tue, 09 Feb 2016 16:21:41 +0200
+
xserver-xorg-video-openchrome (1:0.3.3-1) unstable; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index af16659..b7f7907 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Julien Viard de Galbert <julien@vdg.blogsite.org>, Cyril Brulebois <kibi@debian.org>
DM-Upload-Allowed: yes
Build-Depends:
debhelper (>= 8),
Reply to: