[Xcb-commit] Branch 'debian' - 3 commits - debian src xcb-xinerama.pc.in

Josh Triplett josh at kemper.freedesktop.org
Sun Nov 26 01:06:14 PST 2006


 debian/changelog                    |    5 ++
 debian/control                      |   65 ++++++++++++++++++++++++++++++++++++
 debian/libxcb-xinerama0-dev.install |    4 ++
 debian/libxcb-xinerama0.install     |    1 
 src/xcb_util.c                      |    5 ++
 xcb-xinerama.pc.in                  |   10 ++---
 6 files changed, 84 insertions(+), 6 deletions(-)

New commits:
diff-tree 3c0727554e102edd78c3944f7e32b837377e91c0 (from a27bafa29ab3ac137a908a66ed97a2bb3b7100e7)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sun Nov 26 00:12:15 2006 -0800

    Add new library, -dev, and -dbg packages for libxcb-xinerama.

diff --git a/debian/changelog b/debian/changelog
index 9a12664..5e9720b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxcb (1.0-1) experimental; urgency=low
     * "NetBSD doesn't have AI_ADDRCONFIG: use it only if it's available."
     * "Use substitition variables in xcb-xinerama.pc.in, not instances of their
        values"
+  * Add new library, -dev, and -dbg packages for libxcb-xinerama.
 
  -- Josh Triplett <josh at freedesktop.org>  Fri, 24 Nov 2006 00:51:41 -0800
 
diff --git a/debian/control b/debian/control
index ab024a8..22104cc 100644
--- a/debian/control
+++ b/debian/control
@@ -1117,6 +1117,71 @@ Description: X C Binding, xfixes extensi
  .
  Homepage: http://xcb.freedesktop.org
 
+Package: libxcb-xinerama0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X C Binding, xinerama extension
+ This package contains the library files needed to run software using
+ libxcb-xinerama, the xinerama extension for the X C Binding.
+ .
+ The XCB library provides an interface to the X Window System protocol,
+ designed to replace the Xlib interface.  XCB provides several advantages over
+ Xlib:
+ .
+  * Size: small library and lower memory footprint
+  * Latency hiding: batch several requests and wait for the replies later
+  * Direct protocol access: one-to-one mapping between interface and protocol
+  * Thread support: access XCB from multiple threads, with no explicit locking
+  * Easy creation of new extensions: automatically generates interface from
+    machine-parsable protocol descriptions
+ .
+ Homepage: http://xcb.freedesktop.org
+
+Package: libxcb-xinerama0-dev
+Section: libdevel
+Architecture: any
+Depends: libxcb-xinerama0 (= ${Source-Version}), libxcb1-dev
+Description: X C Binding, xinerama extension, development files
+ This package contains the header and library files needed to build software
+ using libxcb-xinerama, the xinerama extension for the X C Binding.
+ .
+ The XCB library provides an interface to the X Window System protocol,
+ designed to replace the Xlib interface.  XCB provides several advantages over
+ Xlib:
+ .
+  * Size: small library and lower memory footprint
+  * Latency hiding: batch several requests and wait for the replies later
+  * Direct protocol access: one-to-one mapping between interface and protocol
+  * Thread support: access XCB from multiple threads, with no explicit locking
+  * Easy creation of new extensions: automatically generates interface from
+    machine-parsable protocol descriptions
+ .
+ Homepage: http://xcb.freedesktop.org
+
+Package: libxcb-xinerama0-dbg
+Priority: extra
+Section: libdevel
+Architecture: any
+Depends: libxcb-xinerama0 (= ${Source-Version})
+Description: X C Binding, xinerama extension, debugging symbols
+ This package contains the debugging symbols associated with
+ libxcb-xinerama, the xinerama extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xinerama.
+ .
+ The XCB library provides an interface to the X Window System protocol,
+ designed to replace the Xlib interface.  XCB provides several advantages over
+ Xlib:
+ .
+  * Size: small library and lower memory footprint
+  * Latency hiding: batch several requests and wait for the replies later
+  * Direct protocol access: one-to-one mapping between interface and protocol
+  * Thread support: access XCB from multiple threads, with no explicit locking
+  * Easy creation of new extensions: automatically generates interface from
+    machine-parsable protocol descriptions
+ .
+ Homepage: http://xcb.freedesktop.org
+
 Package: libxcb-xprint0
 Section: libs
 Architecture: any
diff --git a/debian/libxcb-xinerama0-dev.install b/debian/libxcb-xinerama0-dev.install
new file mode 100644
index 0000000..f0fa437
--- /dev/null
+++ b/debian/libxcb-xinerama0-dev.install
@@ -0,0 +1,4 @@
+usr/include/xcb/xinerama.h
+usr/lib/libxcb-xinerama.a
+usr/lib/libxcb-xinerama.so
+usr/lib/pkgconfig/xcb-xinerama.pc usr/share/pkgconfig
diff --git a/debian/libxcb-xinerama0.install b/debian/libxcb-xinerama0.install
new file mode 100644
index 0000000..6745a0b
--- /dev/null
+++ b/debian/libxcb-xinerama0.install
@@ -0,0 +1 @@
+usr/lib/libxcb-xinerama.so.*
diff-tree a27bafa29ab3ac137a908a66ed97a2bb3b7100e7 (from 978e8839cbd822f80c3236fa30d080574ff43b8d)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Sat Nov 25 22:27:33 2006 -0800

    Use substitition variables in xcb-xinerama.pc.in, not instances of their values
    
    xcb-xinerama.pc.in looked more like a generated .pc file; replace specific
    instances of values provided by an invocation of configure with the general
    substitution variables configure replaces.
    (cherry picked from commit 98e2a5617ef1c9955b3b5553224c34f55c7c5d29)

diff --git a/debian/changelog b/debian/changelog
index 43a2e59..9a12664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libxcb (1.0-1) experimental; urgency=low
   * Add XS-Vcs-Git field.
   * Cherry-pick post-1.0 changes from master:
     * "NetBSD doesn't have AI_ADDRCONFIG: use it only if it's available."
+    * "Use substitition variables in xcb-xinerama.pc.in, not instances of their
+       values"
 
  -- Josh Triplett <josh at freedesktop.org>  Fri, 24 Nov 2006 00:51:41 -0800
 
diff --git a/xcb-xinerama.pc.in b/xcb-xinerama.pc.in
index 93c35a3..c4775f9 100644
--- a/xcb-xinerama.pc.in
+++ b/xcb-xinerama.pc.in
@@ -1,11 +1,11 @@
-prefix=/opt/fdo/
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: XCB Xinerama
 Description: XCB Xinerama Extension
-Version: 0.9.92
+Version: @PACKAGE_VERSION@
 Requires: xcb
 Libs: -L${libdir} -lxcb-xinerama
 Cflags: -I${includedir}
diff-tree 978e8839cbd822f80c3236fa30d080574ff43b8d (from fe12aa7dbf9f81a17edfe89f72d30810a99af7fb)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Fri Nov 24 13:24:05 2006 -0800

    NetBSD doesn't have AI_ADDRCONFIG: use it only if it's available.
    (cherry picked from commit 3360d0c79e98cf6b7f30b2d84f117aea0a28595d)

diff --git a/debian/changelog b/debian/changelog
index 6609c93..43a2e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ libxcb (1.0-1) experimental; urgency=low
     check first started shipping the pkg-config file.
   * Add Build-Depends on libpthread-stubs0-dev.
   * Add XS-Vcs-Git field.
+  * Cherry-pick post-1.0 changes from master:
+    * "NetBSD doesn't have AI_ADDRCONFIG: use it only if it's available."
 
  -- Josh Triplett <josh at freedesktop.org>  Fri, 24 Nov 2006 00:51:41 -0800
 
diff --git a/src/xcb_util.c b/src/xcb_util.c
index bd9f2b5..eeee1dd 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -176,7 +176,10 @@ static int _xcb_open_decnet(const char *
 static int _xcb_open_tcp(char *host, const unsigned short port)
 {
     int fd = -1;
-    struct addrinfo hints = { AI_ADDRCONFIG
+    struct addrinfo hints = { 0
+#ifdef AI_ADDRCONFIG
+                              | AI_ADDRCONFIG
+#endif
 #ifdef AI_NUMERICSERV
                               | AI_NUMERICSERV
 #endif


More information about the xcb-commit mailing list