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

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



 debian/changelog                                       |    9 +++++++--
 debian/rules                                           |    5 ++++-
 debian/xserver-xorg-video-intel.install                |    4 ++--
 debian/xserver-xorg-video-intel.install.kfreebsd-amd64 |    4 ++--
 debian/xserver-xorg-video-intel.install.kfreebsd-i386  |    4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit e415f62c90247e917ab91cde9f6138993031abcd
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Wed Mar 9 21:26:39 2016 +0200

    upload to unstable

diff --git a/debian/changelog b/debian/changelog
index de35387..0f715a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20160307-1) unstable; urgency=medium
 
   [ Timo Aaltonen ]
   * New upstream snapshot.
@@ -11,7 +11,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
   * Move the shared libraries into multiarch libdir.
   * rules: Enable parallel builds.
 
- -- Timo Aaltonen <tjaalton@debian.org>  Mon, 07 Mar 2016 15:20:56 +0200
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 09 Mar 2016 21:26:17 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
 

commit 41b55d35b89467827fa00498726a69cf62de2d09
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Tue Mar 8 15:26:32 2016 +0200

    rules: Enable parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 238588b..de35387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
 
   [ Matthias Klose ]
   * Move the shared libraries into multiarch libdir.
+  * rules: Enable parallel builds.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 07 Mar 2016 15:20:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 8e907f5..3020c64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ override_dh_installchangelogs:
 	dh_installchangelogs debian/upstream.changelog
 
 %:
-	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+	dh $@ --parallel --with quilt,autoreconf,xsf --builddirectory=build/
 
 # Snapshots should only target experimental:
 generate-snapshot: UPSTREAM_VERSION = $(shell echo $(SOURCE_VERSION) | sed 's/^[0-9]*://;s/-.*$$//')

commit 951719b29a5a849358b39c505d2f8b8af8cc73f3
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Tue Mar 8 15:18:47 2016 +0200

    Move the shared libraries into multiarch libdir.

diff --git a/debian/changelog b/debian/changelog
index 91d3321..238588b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xserver-xorg-video-intel (2:2.99.917+git20160307-1) UNRELEASED; urgency=medium
 
+  [ Timo Aaltonen ]
   * New upstream snapshot.
   * control: Update the description, older hw likely still wants this
     driver.
   * sna-let-modesetting-handle-gen9+.diff: Use modesetting+glamor on
     Skylake and up.
 
+  [ Matthias Klose ]
+  * Move the shared libraries into multiarch libdir.
+
  -- Timo Aaltonen <tjaalton@debian.org>  Mon, 07 Mar 2016 15:20:56 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20160218-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 9b5efd9..8e907f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,9 @@ override_dh_install:
 	find debian/tmp -name '*.la' -delete
 	rm -f debian/tmp/usr/lib/libI810XvMC.so
 	rm -f debian/tmp/usr/lib/libIntelXvMC.so
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/libI810XvMC.so.* debian/tmp/usr/lib/libIntelXvMC.so.* \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/.
 	dh_install --fail-missing
 
 # Debug package:
diff --git a/debian/xserver-xorg-video-intel.install b/debian/xserver-xorg-video-intel.install
index b603516..9508a54 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,7 +1,7 @@
 usr/bin/intel-virtual-output
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/lib/xserver-xorg-video-intel/xf86-video-intel-backlight-helper
 usr/share/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64 b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
index 48c5ed0..800b416 100644
--- a/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
+++ b/debian/xserver-xorg-video-intel.install.kfreebsd-amd64
@@ -1,4 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/share/man
diff --git a/debian/xserver-xorg-video-intel.install.kfreebsd-i386 b/debian/xserver-xorg-video-intel.install.kfreebsd-i386
index 48c5ed0..800b416 100644
--- a/debian/xserver-xorg-video-intel.install.kfreebsd-i386
+++ b/debian/xserver-xorg-video-intel.install.kfreebsd-i386
@@ -1,4 +1,4 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/lib/libI810XvMC.so*
-usr/lib/libIntelXvMC.so*
+usr/lib/*/libI810XvMC.so*
+usr/lib/*/libIntelXvMC.so*
 usr/share/man


Reply to: