xserver-xorg-video-vmware: Changes to 'ubuntu'
debian/changelog | 41 ++++++++++++++++++++++++++++++++++++++--
debian/compat | 2 -
debian/control | 5 +---
debian/patches/series | 2 -
debian/rules | 1
debian/upstream/signing-key.asc | 30 +++++++++++++++++++++++++++++
debian/watch | 1
7 files changed, 75 insertions(+), 7 deletions(-)
New commits:
commit 6102cfc439c6a1479a3504c01207bd0aed88ff16
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Jan 20 11:30:02 2016 +0200
changelog from 1:13.1.0-2ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 819c73f..ff85199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xserver-xorg-video-vmware (1:13.1.0-2ubuntu1) wily; urgency=medium
+
+ * Merge with Debian, remaining Ubuntu changes:
+ * debian/vmwgfx-fbdev.conf:
+ * debian/xserver-xorg-video-vmware.install:
+ - Install vmwgfx-fbdev.conf into /etc/modprobe.d/ to pass
+ enable_fbdev=1 to the vmwgfx module at load time fixing a crash on
+ suspend from inside of the guest in VMware hosts.
+
+ -- Robert Ancell <robert.ancell@canonical.com> Wed, 15 Jul 2015 10:27:56 +1200
+
xserver-xorg-video-vmware (1:13.1.0-2) unstable; urgency=medium
* Restrict architecture list to x86.
commit 107ffc365d49d8a050396e740a22662a396fe4bd
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Jan 20 11:27:05 2016 +0200
import 1:13.1.0-0ubuntu1build2
diff --git a/debian/changelog b/debian/changelog
index f8d3210..d9e1ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1build2) wily; urgency=medium
+
+ * Rebuild against the new X (LP: #1462021).
+
+ -- Alberto Milone <alberto.milone@canonical.com> Fri, 05 Jun 2015 16:19:01 +0200
+
+xserver-xorg-video-vmware (1:13.1.0-0ubuntu1build1) vivid; urgency=medium
+
+ * Rebuild to pick up new Xserver dependencies
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 12 Mar 2015 07:59:37 +0000
+
xserver-xorg-video-vmware (1:13.1.0-0ubuntu1) vivid; urgency=medium
* Merge from unreleased debian.
diff --git a/debian/control b/debian/control
index 75e310d..0c9e11e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.16.99.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
commit 3bc76326f77c8749066d523e79cd321d6c06e43e
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:13:50 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 1637b7c..c7660f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-vmware (1:13.1.0-2) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.1.0-2) unstable; urgency=medium
* Restrict architecture list to x86.
- -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:13:13 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:13:48 +0200
xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
commit 34f4599462cd078fc95320b2ada679b8eae017fd
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 9 17:13:47 2015 +0200
Restrict architecture list to x86.
diff --git a/debian/changelog b/debian/changelog
index d8ff4be..1637b7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-vmware (1:13.1.0-2) UNRELEASED; urgency=medium
+
+ * Restrict architecture list to x86.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 09 May 2015 17:13:13 +0200
+
xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
[ Maarten Lankhorst ]
diff --git a/debian/control b/debian/control
index 79a5d6f..09c8a10 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git
Package: xserver-xorg-video-vmware
-Architecture: any
+Architecture: any-amd64 any-i386
Depends:
${shlibs:Depends},
${misc:Depends},
commit 3dffc3c23e7b6f832b48b0e7ff1cf0770d168a0e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 3 11:33:32 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 20c42a4..d8ff4be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
+xserver-xorg-video-vmware (1:13.1.0-1) unstable; urgency=medium
[ Maarten Lankhorst ]
* New upstream release.
@@ -11,7 +11,7 @@ xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
* Remove Drew and Cyril from Uploaders.
* Let uscan verify tarball signatures.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 20 Jan 2015 11:21:26 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 03 May 2015 11:33:26 +0200
xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
commit 2798707db5533db5182e18b02c83ef145245248b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 3 11:33:10 2015 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 64b739e..20c42a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Bump debhelper compat level to 9.
* Remove Drew and Cyril from Uploaders.
+ * Let uscan verify tarball signatures.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 20 Jan 2015 11:21:26 +0100
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..2b942be
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEzZSUMRBADewSWiR5KUpEFYfQcYbILV4xqVSqGMZnTKZgC/X51rOuK0XIqs
+X5zfwiB3JAT0rhC7c1Pf5RIupN+6AN9punOEJjBj4LYRl39zHXItTkEPvy9BGeVk
+j8IrxOquhh2NFusbCuFxcEd43Q+uJR/TKQSSm8ju03PQXkbQF9kw8y6SEwCg26hM
+XEkOSkg2EAZN1bHV41DMKgED+gMNesJYxIYmBq+5VGqt7A/mfkJF7ns5U5hOB2T1
+VzMnzhk6/hJJAPx5IQEzPDJcsl/WgM1k2CNM32VWt2fso1yYex32mvraNCTWnu5a
+/6XeBZBNteA8ZRAoNeIKcV6FRyuWcuDulzLUOdr1ClskzFlwsDeKWQ9j1+EleUsX
+mDgGBACQKaYn84PMU3psMHu4aj5BNGTvcMuvcc2+WNuITRWMpHdv/tQpsClEB2vc
+SVTLLf4QOAlG78NwF4IyfO+F8+cuDCCRJoaR5hTDgxlSXcgdtuBPgXx3eeGOqvuf
+i4TGtrADvmGaLerB8O3XtNBBTUMrn4mIvBjtmhRbrodMQp//3rQxVGhvbWFzIEhl
+bGxzdHJvbSAoVk13YXJlKSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPohgBBMRAgAg
+BQJM2UlDAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQwfXTzfUXZYDLGgCf
+cQ0RouVD+hHJhh9ycWXg+mhQQBoAnjeGflvtu1ylxyT6oUn5u59m5XbbuQINBEzZ
+SUMQCAC6DzcS0jztz+pfXSUICM7Bpf/BYwEEhYCTO26r2hTFxkzTM/aBtqR8TIUe
+fgTSWBCai36985b4VZQoXdDGVaIliO0KPjkUrIUL6telmUbc6SfG2sQrQEwV8j/3
+p7AU0VIW6T/3LYVT4u2a2HZPxYSj4nR5JTK+pyT5KSQKcluGGz1qVepOdSmfmPb8
+pfosq73leMtr4VhGoZ1um8WTnfM66dFZrkmmukaodKymChwSQ92t3Xa5ok4LP6lH
+GRyvkCwoyrTuBNXIGDIC6MzA7ms9um6sy9xIYUEijdiBE3ydJXSfCWVd4USmozz2
+Y8T30NOWr4zPPwV6QPcqmAJs4kfDAAMFCACS2XxtfHWvwq2PSNHbVG9IApCyZH/q
+mcx8Ih0X7yNyzSehjIYYumwo9Cb4yrKZXQzAexNfyzhr0/VL1OEGLAGwOdped/f3
+TZ2dmH/MqilI1jmy3awgGrlnjYGrKkoEiICE7uCP9EzFTdbSrEKYjrvh4aHrXjTD
+HrXPC8V0Y4/1sp4XS+8IzDE5FTpw9W9Rfuqqdt46rIgDnY1cjRaV6+xoqmTKwvGw
+UREfpQthIQz7ReyujUgpzUDZhpJzDzQYEOCfzbBymowErlbDTlcL7hWUmOYdqVKk
+GVvww9NhQ/4PfePI8cHQx5inVIgKLKb93l63HlPevaRz8jd1zDEcDf/hiEkEGBEC
+AAkFAkzZSUMCGwwACgkQwfXTzfUXZYD+lgCfeR99P2folQTWlrfCbNXC8reYz24A
+oKzD7TeOiLfs38x+4q35Z112OFZ7
+=PM8p
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 1f26a4f..4ec84e5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-vmware
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-vmware-(.*)\.tar\.gz
commit 56cda80cf7bca242e44f17f09015b925ea208cac
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 3 11:26:54 2015 +0200
Remove Drew and Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index f0ab2c1..64b739e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* Bump debhelper compat level to 9.
+ * Remove Drew and Cyril from Uploaders.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 20 Jan 2015 11:21:26 +0100
diff --git a/debian/control b/debian/control
index e324cb4..79a5d6f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-vmware
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
commit d6bb80f9c69357039f268d600605b8594b5343d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 3 11:26:39 2015 +0200
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index c7c0134..f0ab2c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
+ [ Maarten Lankhorst ]
* New upstream release.
+ Don't add pixmaps to the pixmap list if they're already on it
(closes: #765490)
* Bump Standards-Version to 3.9.6 (no changes needed).
+ [ Julien Cristau ]
+ * Bump debhelper compat level to 9.
+
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 20 Jan 2015 11:21:26 +0100
xserver-xorg-video-vmware (1:13.0.2-3) unstable; urgency=medium
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index e973fdd..e324cb4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index c601423..bf612b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
# Enable unit test client tool:
override_dh_auto_configure:
dh_auto_configure -- \
+ --libdir=\$${exec_prefix}/lib \
--enable-vmwarectrl-client \
--disable-silent-rules
commit b42608e13320bfc816341bbf52909fb4c3a363eb
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 3 11:24:27 2015 +0200
Mention fixed bug in changelog
This was already closed in a NMU in unstable, but we didn't merge that
so let the BTS know the fix is also on this branch.
diff --git a/debian/changelog b/debian/changelog
index 357d281..c7c0134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-video-vmware (1:13.1.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ + Don't add pixmaps to the pixmap list if they're already on it
+ (closes: #765490)
* Bump Standards-Version to 3.9.6 (no changes needed).
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 20 Jan 2015 11:21:26 +0100
Reply to: