libdrm: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 5 +++--
debian/rules | 2 --
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 6c5543b4a06cacabc1f32d24b232f53af57bd586
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 21 23:22:25 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 495814f..6408491 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libdrm (2.4.33-3) UNRELEASED; urgency=low
+libdrm (2.4.33-3) unstable; urgency=low
* Add missing dependency on libdrm-omap1 to libdrm-dev (thanks, Robert
Hooker!). Make some arm matching a bit simpler.
- -- Julien Cristau <jcristau@debian.org> Thu, 21 Jun 2012 23:18:11 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 21 Jun 2012 23:22:22 +0200
libdrm (2.4.33-2) unstable; urgency=low
commit e9174e7feed583098844d846f5955095d8c06bec
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 21 23:21:58 2012 +0200
Add missing dependency on libdrm-omap1 to libdrm-dev
Thanks, Robert Hooker, for noticing.
Also make some arm matching a bit simpler, arm means linux so no need to
check both.
diff --git a/debian/changelog b/debian/changelog
index b33d740..495814f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.33-3) UNRELEASED; urgency=low
+
+ * Add missing dependency on libdrm-omap1 to libdrm-dev (thanks, Robert
+ Hooker!). Make some arm matching a bit simpler.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 21 Jun 2012 23:18:11 +0200
+
libdrm (2.4.33-2) unstable; urgency=low
[ Sebastian Reichel ]
diff --git a/debian/control b/debian/control
index a841ee0..5b5d9f6 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-radeon1 (= ${binary:Version}) [linux-any],
libdrm-nouveau1a (= ${binary:Version}) [linux-any],
+ libdrm-omap1 (= ${binary:Version}) [any-arm],
libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
Replaces:
@@ -185,7 +186,7 @@ Description: Userspace interface to kernel DRM buffer management -- debugging sy
Package: libdrm-omap1
Section: libs
-Architecture: armel armhf
+Architecture: any-arm
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -200,7 +201,7 @@ Description: Userspace interface to omap-specific kernel DRM services -- runtime
Package: libdrm-omap1-dbg
Section: debug
Priority: extra
-Architecture: armel armhf
+Architecture: any-arm
Depends:
libdrm-omap1 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index a4d4880..44926b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,10 +43,8 @@ endif
# Omap is only on arm
ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
-ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
OMAP = yes
endif
-endif
ifeq ($(OMAP), yes)
confflags += --enable-omap-experimental-api
else
Reply to: