From 9e26a88dfa7780be0ae8c66a364604a84221b186 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 3 Mar 2014 19:55:05 +0100
Subject: [PATCH] Drop libglamor{0,-dev} packages

libglamor is not an actual shared lib, it depends on Xorg.  So merge it
back in to the xserver-xorg-video-glamoregl package and ship it in the
Xorg module directory.
---
 debian/control                                  | 18 ++----------------
 debian/libglamor-dev.install                    |  4 ----
 debian/libglamor0.install                       |  1 -
 debian/rules                                    |  7 +++++--
 debian/xserver-xorg-video-glamoregl-dev.install |  2 ++
 debian/xserver-xorg-video-glamoregl.install     |  2 +-
 6 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 debian/libglamor-dev.install
 delete mode 100644 debian/libglamor0.install
 create mode 100644 debian/xserver-xorg-video-glamoregl-dev.install

diff --git a/debian/control b/debian/control
index dd9f718..dc0f1c3 100644
--- a/debian/control
+++ b/debian/control
@@ -20,26 +20,12 @@ Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/glamor-egl
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/glamor-egl.git
 Homepage: http://www.freedesktop.org/wiki/Software/Glamor
 
-Package: libglamor0
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Description: shared graphics acceleration library based on OpenGL
- Glamor is a library for accelerating 2D graphics using GL functions.
- .
- This package contains the shared library.
-
-Package: libglamor-dev
+Package: xserver-xorg-video-glamoregl-dev
 Section: libdevel
 Architecture: linux-any
 Depends:
- libglamor0 (= ${binary:Version}),
+ xserver-xorg-video-glamoregl (= ${binary:Version}),
  ${misc:Depends},
-Multi-Arch: same
 Description: shared graphics acceleration library based on OpenGL -- development files
  Glamor is a library for accelerating 2D graphics using GL functions.
  .
diff --git a/debian/libglamor-dev.install b/debian/libglamor-dev.install
deleted file mode 100644
index 21407d0..0000000
--- a/debian/libglamor-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/xorg/glamor.h
-usr/lib/*/libglamor.so
-usr/lib/*/pkgconfig/glamor.pc
-usr/lib/*/pkgconfig/glamor-egl.pc
diff --git a/debian/libglamor0.install b/debian/libglamor0.install
deleted file mode 100644
index 129dfbe..0000000
--- a/debian/libglamor0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libglamor.so.*
diff --git a/debian/rules b/debian/rules
index c308bff..98cb795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static --disable-silent-rules
+	dh_auto_configure -- --disable-static --disable-silent-rules \
+		--libdir /usr/lib/xorg/modules \
+		--with-xorg-module-dir=/usr/lib/xorg/modules
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
@@ -11,6 +13,7 @@ override_dh_install:
 	find debian/tmp -name '*.la' -delete
 	dh_install --fail-missing
 
-%:
+build %:
 	dh $@ --with autoreconf,xsf,quilt --builddirectory=build/
 
+.PHONY: build
diff --git a/debian/xserver-xorg-video-glamoregl-dev.install b/debian/xserver-xorg-video-glamoregl-dev.install
new file mode 100644
index 0000000..8dfd895
--- /dev/null
+++ b/debian/xserver-xorg-video-glamoregl-dev.install
@@ -0,0 +1,2 @@
+usr/include/xorg/glamor.h
+usr/lib/xorg/modules/pkgconfig usr/lib
diff --git a/debian/xserver-xorg-video-glamoregl.install b/debian/xserver-xorg-video-glamoregl.install
index 24f274f..6bae418 100644
--- a/debian/xserver-xorg-video-glamoregl.install
+++ b/debian/xserver-xorg-video-glamoregl.install
@@ -1,2 +1,2 @@
-usr/lib/*/xorg/modules/libglamoregl.so	usr/lib/xorg/modules
+usr/lib/xorg/modules/*.so*
 usr/share/X11/xorg.conf.d/glamor.conf
-- 
1.9.0