* Debian X11R7 transition:

    * Change Build-Depends on x-dev to x11proto-core-dev.
    * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
    * Pre-Depends: x11-common (>= 1:1.09).

diff --git a/debian/changelog b/debian/changelog
index 76fb69d..b9bdb46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,12 @@ libxcb0 (0.9-3) UNRELEASED; urgency=low
   * Update -dbg package handling to work with debhelper compat level 5.
     Increase minimum version on debhelper Build-Depends to 5.0.0.
   * Stop installing the libtool .la files.
+  * Debian X11R7 transition:
+    * Change Build-Depends on x-dev to x11proto-core-dev.
+    * Install headers to /usr/include/X11, not /usr/X11R6/include/X11.
+    * Pre-Depends: x11-common (>= 1:1.09).
 
- -- Josh Triplett <josh@freedesktop.org>  Sat, 15 Apr 2006 22:16:33 -0700
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 16 Apr 2006 09:16:45 -0700
 
 libxcb0 (0.9-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 3a8e50d..8dc3917 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxcb0
 Priority: optional
 Maintainer: XCB Developers <xcb@lists.freedesktop.org>
 Uploaders: Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
-Build-Depends: x-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
+Build-Depends: x11proto-core-dev, libxau-dev, xcb-proto, cdbs, debhelper (>= 5.0.0), pkg-config, xsltproc, check, binutils (>= 2.12.90.0.9)
 Standards-Version: 3.6.1
 Bugs: mailto:xcb@lists.freedesktop.org
 
@@ -26,6 +26,7 @@ Package: libxcb0-dev
 Section: libdevel
 Architecture: any
 Depends: libxcb0 (= ${Source-Version}), x-dev
+Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, development files
  Xlib has been the standard C binding for the X Window System protocol for
  many years now. It is an excellent piece of work, but there are applications

diff --git a/debian/libxcb0-dev.install b/debian/libxcb0-dev.install
index f680b2b..9cc96e7 100644 (file)
--- a/debian/libxcb0-dev.install
+++ b/debian/libxcb0-dev.install
@@ -1,4 +1,4 @@
-usr/X11R6/include/X11/*
+usr/include/X11/*
 usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*

diff --git a/debian/rules b/debian/rules
index e31478a..f07c082 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-opt
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
 
 debian/copyright: debian/copyright.debian COPYING
        cat $+ > $@