[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-qxl: Changes to 'debian-unstable'



 debian/changelog |   16 ++++++++++++++++
 debian/control   |    3 ++-
 debian/rules     |    5 +++++
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 18853400544e1fa21820c248de6533e5c6e07a46
Author: Laurent Bigonville <bigon@debian.org>
Date:   Sat May 30 16:03:37 2015 +0200

    debian/control: Add libudev-dev to the build-dependency for the linux architectures

diff --git a/debian/changelog b/debian/changelog
index 64b5861..8a75313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ xserver-xorg-video-qxl (0.1.4-3) unstable; urgency=medium
       that we have the proper ABI.
   * debian/rules: Generate the "xviddriver:Depends" substvars for the
     xserver-xspice package.
+  * debian/control: Add libudev-dev to the build-dependency for the linux
+    architectures
 
- -- Laurent Bigonville <bigon@debian.org>  Sat, 30 May 2015 15:06:37 +0200
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 30 May 2015 16:02:55 +0200
 
 xserver-xorg-video-qxl (0.1.4-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 858b785..31bf09a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
  libtool,
  xutils-dev (>= 1:7.5),
  quilt (>= 0.46-7~),
+ libudev-dev [linux-any],
  libspice-protocol-dev (>= 0.12.2~),
  libspice-server-dev [amd64],
  python,

commit 68b55ac9d7bcd5e6e5006a6620dbad42451bf57a
Author: Laurent Bigonville <bigon@debian.org>
Date:   Sat May 30 15:07:09 2015 +0200

    Fix the dependencies of xserver-xspice package
    
    * Team upload.
    * debian/control:
      - xserver-xspice: Drop dependency against xserver-xorg-video-qxl, this
        is not needed anymore now that spiceqxl_drv.so is not shipped in that
        package.
      - xserver-xspice: Add ${xviddriver:Depends} to the dependencies to ensure
        that we have the proper ABI.
    * debian/rules: Generate the "xviddriver:Depends" substvars for the
      xserver-xspice package.

diff --git a/debian/changelog b/debian/changelog
index acb946a..64b5861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xserver-xorg-video-qxl (0.1.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control:
+    - xserver-xspice: Drop dependency against xserver-xorg-video-qxl, this
+      is not needed anymore now that spiceqxl_drv.so is not shipped in that
+      package.
+    - xserver-xspice: Add ${xviddriver:Depends} to the dependencies to ensure
+      that we have the proper ABI.
+  * debian/rules: Generate the "xviddriver:Depends" substvars for the
+    xserver-xspice package.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 30 May 2015 15:06:37 +0200
+
 xserver-xorg-video-qxl (0.1.4-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e1c727f..858b785 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Description: X.Org X server -- QXL display driver (debugging symbols)
 
 Package: xserver-xspice
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xserver-xorg, xserver-xorg-video-qxl (>= 0.0.17-2), python-argparse
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xserver-xorg, ${xviddriver:Depends}, python-argparse
 Breaks: xserver-xorg-video-qxl (<< 0.1.4-2~)
 Replaces: xserver-xorg-video-qxl (<< 0.1.4-2~)
 Description: Xspice X server
diff --git a/debian/rules b/debian/rules
index 3c7a6ae..8472622 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
 
 override_dh_auto_build:
 	dh_auto_build -- V=1
@@ -24,6 +25,10 @@ override_dh_install:
 override_dh_shlibdeps:
 	dh_shlibdeps -- --warnings=6
 
+override_dh_xsf_substvars:
+	echo "xviddriver:Depends=$(VIDEODEP)" >> debian/xserver-xspice.substvars
+	dh_xsf_substvars
+
 # Enable Xspice support
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_GNU_TYPE), x86_64-linux-gnu)


Reply to: