* Debian X11R7 transition:

    * Install protocol descriptions 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 be76be6..fe7838b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ xcb-proto (0.9-3) UNRELEASED; urgency=low
 
   * Stop running autoreconf in debian/rules, and remove Build-Depends for
     autoconf and automake.
+  * Debian X11R7 transition:
+    * Install protocol descriptions 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 19:20:07 -0700
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 16 Apr 2006 09:16:45 -0700
 
 xcb-proto (0.9-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 240dfdb..fa8c506 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Bugs: mailto:xcb@lists.freedesktop.org
 Package: xcb-proto
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding - protocol descriptions
  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

diff --git a/debian/rules b/debian/rules
index 93b2b26..ea85e18 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/X11R6/include"
-
 debian/copyright: debian/copyright.debian COPYING
        cat $+ > $@