Fix unit tests for FreeBSD

putenv() string must contain '='
environment failure test is invalid if argument is NULL

debian/changelog

@@ -0,0 +1,125 @@
+libxcb (1.0-2) unstable; urgency=low
+
+  * Incorporate NMU by Julien Cristau; thanks, Julien!
+  * Add XS-Vcs-Browser field to debian/control.
+  * Cherry-pick post-1.0 changes from master:
+    * " Fix unit tests for FreeBSD"
+  * Upload to unstable.
+
+ -- Josh Triplett <josh@freedesktop.org>  Mon, 21 May 2007 12:48:40 -0700
+
+libxcb (1.0-1.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * libxcb1-dev needs a dependency on libpthread-stubs0-dev and versioned
+    dependencies on libxau-dev and libxdmcp-dev, because they are needed by
+    anything using xcb.pc (closes: #408409).
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed, 31 Jan 2007 03:42:13 +0100
+
+libxcb (1.0-1) experimental; urgency=low
+
+  * New upstream version.
+  * The "Thanksgiving" release: We feel thankful to have it released.
+  * Bump versioned Build-Depends on xcb-proto to 1.0, to match configure.ac.
+  * Add version to Build-Depends on check, requiring 0.9.4-2 or newer, when
+    check first started shipping the pkg-config file.
+  * Add Build-Depends on libpthread-stubs0-dev.  Use a versioned
+    Build-Depends, to help buildds find it in experimental.
+  * Add version to Build-Depends on xsltproc, requiring 1.1.19-1 or newer, to
+    get the fix for bug 398327.
+  * 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"
+  * Add new library, -dev, and -dbg packages for libxcb-xinerama.
+  * Install pkg-config files to /usr/lib/pkgconfig, not
+    /usr/share/pkgconfig.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Dec 2006 16:27:28 -0800
+
+libxcb (0.9.92-1) experimental; urgency=low
+
+  * New upstream version.
+
+  [ Josh Triplett ]
+  * No longer installs files to /usr/include/X11, so remove Pre-Depends on
+    x11-common.
+  * Update to Standards-Version 3.7.2 (no changes required).
+  * Point specifically to http://xcb.freedesktop.org/dist in copyright file,
+    rather than http://xcb.freedesktop.org .
+  * Add debian/watch file.
+  * Install pkgconfig files to /usr/share/pkgconfig.
+  * Version Build-Depends on xcb-proto as (>= 0.9.92)
+  * Change libxcb0{,-dev,-dbg} to libxcb1{,-dev,-dbg} to match soname bump, and
+    update Depends of other library -dev packages.
+  * Add debian/control stanzas and debhelper install files for new library
+    libxcb-xlib0.
+  * Change libxcb${ext}0{,-dev,-dbg} to libxcb-${ext}0{,-dev,-dbg}, to match
+    the sonames of the libraries.
+  * cdbs >= 0.4.40 now builds -dbg packages for each library package, without
+    requiring DEB_DBG_PACKAGE_libxcb* for each one.  Remove assignments to
+    these variables in debian/rules, and version cdbs Build-Depends accordingly.
+  * Change -dbg package priorities from optional to extra.
+
+ -- Jamey Sharp <sharpone@debian.org>  Sun, 08 Oct 2006 01:19:28 -0700
+
+libxcb (0.9-3) experimental; urgency=low
+
+  * Stop running autoreconf in debian/rules, and remove Build-Depends for
+    autoconf, automake, and libtool.
+  * 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.
+  * Add Build-Depends on libxdmcp-dev.
+  * Debian X11R7 transition:
+    * Change Depends and 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).
+  * Create library, -dev, and -dbg packages for each new extension library.
+  * Drop library version from source package name.
+  * Add a Section field for the source package in debian/control.
+  * Set DEB_MAKE_CHECK_TARGET=check in debian/rules.
+  * Stop setting DEB_CONFIGURE_EXTRA_FLAGS = --with-opt in debian/rules;
+    cdbs does the right thing on its own, and correctly handles
+    DEB_BUILD_OPTS.
+  * Work around the unsetting of CFLAGS in src/Makefile.am, by passing CFLAGS
+    to make via DEB_MAKE_INVOKE in debian/rules.
+  * Remove Bugs field in control, so bugs go to the Debian BTS.
+  * Set distribution to experimental.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sat, 29 Apr 2006 15:57:15 -0700
+
+libxcb0 (0.9-2) unstable; urgency=low
+
+  * Split into libxcb0 and libxcb0-dev.
+    * Change control file for new packages.
+    * Add install and dirs files for new packages.
+  * Update Build-Depends for renaming of fd.o-xau, fd.o-xproto, and
+    fd.o-xcb-proto.
+  * Remove fd.o prefix from package name.
+  * Change Maintainer to xcb@lists.freedesktop.org, move myself to
+    Uploaders, and add Jamey Sharp to Uploaders.  Update copyright.debian
+    accordingly.
+  * Add Bugs field pointing to xcb@lists.freedesktop.org.
+  * Update homepage URL in description and copyright.debian to
+    http://xcb.freedesktop.org, and put it in a Homepage: field in the
+    description.
+  * Add libxcb0-dbg package.
+
+ -- Josh Triplett <josh@freedesktop.org>  Tue, 17 May 2005 12:53:53 -0700
+
+fd.o-xcb (0.9-1) unstable; urgency=low
+
+  * New version using XSLT; works with XML descriptions in xcb-proto 0.9.
+  * Updated Debian packaging.
+
+ -- Josh Triplett <josh@freedesktop.org>  Fri, 29 Oct 2004 15:11:09 -0700
+
+fd.o-xcb (0.8-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Jamey Sharp <sharpone@debian.org>  Thu, 18 Mar 2004 00:09:03 -0800
+

debian/copyright.debian

@@ -0,0 +1,12 @@
+This package was debianized by Jamey Sharp <sharpone@debian.org> on
+Thu, 18 Mar 2004 00:48:42 -0800, and later updated by Josh Triplett
+<josh@freedesktop.org>.  The package is co-maintained by the XCB developers
+via the XCB mailing list <xcb@lists.freedesktop.org>.
+
+It was downloaded from http://xcb.freedesktop.org/dist
+
+Upstream Authors: Jamey Sharp <sharpone@debian.org>
+                  Josh Triplett <josh@freedesktop.org>
+
+Copyright:
+

debian/libxcb-composite0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/composite.h
+usr/lib/libxcb-composite.a
+usr/lib/libxcb-composite.so
+usr/lib/pkgconfig/xcb-composite.pc

debian/libxcb-composite0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-composite.so.*

debian/libxcb-damage0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/damage.h
+usr/lib/libxcb-damage.a
+usr/lib/libxcb-damage.so
+usr/lib/pkgconfig/xcb-damage.pc

debian/libxcb-damage0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-damage.so.*

debian/libxcb-dpms0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/dpms.h
+usr/lib/libxcb-dpms.a
+usr/lib/libxcb-dpms.so
+usr/lib/pkgconfig/xcb-dpms.pc

debian/libxcb-dpms0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-dpms.so.*

debian/libxcb-glx0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/glx.h
+usr/lib/libxcb-glx.a
+usr/lib/libxcb-glx.so
+usr/lib/pkgconfig/xcb-glx.pc

debian/libxcb-glx0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-glx.so.*

debian/libxcb-randr0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/randr.h
+usr/lib/libxcb-randr.a
+usr/lib/libxcb-randr.so
+usr/lib/pkgconfig/xcb-randr.pc

debian/libxcb-randr0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-randr.so.*

debian/libxcb-record0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/record.h
+usr/lib/libxcb-record.a
+usr/lib/libxcb-record.so
+usr/lib/pkgconfig/xcb-record.pc

debian/libxcb-record0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-record.so.*

debian/libxcb-render0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/render.h
+usr/lib/libxcb-render.a
+usr/lib/libxcb-render.so
+usr/lib/pkgconfig/xcb-render.pc

debian/libxcb-render0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-render.so.*

debian/libxcb-res0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/res.h
+usr/lib/libxcb-res.a
+usr/lib/libxcb-res.so
+usr/lib/pkgconfig/xcb-res.pc

debian/libxcb-res0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-res.so.*

debian/libxcb-screensaver0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/screensaver.h
+usr/lib/libxcb-screensaver.a
+usr/lib/libxcb-screensaver.so
+usr/lib/pkgconfig/xcb-screensaver.pc

debian/libxcb-screensaver0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-screensaver.so.*

debian/libxcb-shape0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/shape.h
+usr/lib/libxcb-shape.a
+usr/lib/libxcb-shape.so
+usr/lib/pkgconfig/xcb-shape.pc

debian/libxcb-shape0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-shape.so.*

debian/libxcb-shm0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/shm.h
+usr/lib/libxcb-shm.a
+usr/lib/libxcb-shm.so
+usr/lib/pkgconfig/xcb-shm.pc

debian/libxcb-shm0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-shm.so.*

debian/libxcb-sync0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/sync.h
+usr/lib/libxcb-sync.a
+usr/lib/libxcb-sync.so
+usr/lib/pkgconfig/xcb-sync.pc

debian/libxcb-sync0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-sync.so.*

debian/libxcb-xevie0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xevie.h
+usr/lib/libxcb-xevie.a
+usr/lib/libxcb-xevie.so
+usr/lib/pkgconfig/xcb-xevie.pc

debian/libxcb-xevie0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xevie.so.*

debian/libxcb-xf86dri0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xf86dri.h
+usr/lib/libxcb-xf86dri.a
+usr/lib/libxcb-xf86dri.so
+usr/lib/pkgconfig/xcb-xf86dri.pc

debian/libxcb-xf86dri0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xf86dri.so.*

debian/libxcb-xfixes0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xfixes.h
+usr/lib/libxcb-xfixes.a
+usr/lib/libxcb-xfixes.so
+usr/lib/pkgconfig/xcb-xfixes.pc

debian/libxcb-xfixes0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xfixes.so.*

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

debian/libxcb-xinerama0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xinerama.so.*

debian/libxcb-xlib0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xcbxlib.h
+usr/lib/libxcb-xlib.a
+usr/lib/libxcb-xlib.so
+usr/lib/pkgconfig/xcb-xlib.pc

debian/libxcb-xlib0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xlib.so.*

debian/libxcb-xprint0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xprint.h
+usr/lib/libxcb-xprint.a
+usr/lib/libxcb-xprint.so
+usr/lib/pkgconfig/xcb-xprint.pc

debian/libxcb-xprint0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xprint.so.*

debian/libxcb-xtest0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xtest.h
+usr/lib/libxcb-xtest.a
+usr/lib/libxcb-xtest.so
+usr/lib/pkgconfig/xcb-xtest.pc

debian/libxcb-xtest0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xtest.so.*

debian/libxcb-xv0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xv.h
+usr/lib/libxcb-xv.a
+usr/lib/libxcb-xv.so
+usr/lib/pkgconfig/xcb-xv.pc

debian/libxcb-xv0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xv.so.*

debian/libxcb-xvmc0-dev.install

@@ -0,0 +1,4 @@
+usr/include/xcb/xvmc.h
+usr/lib/libxcb-xvmc.a
+usr/lib/libxcb-xvmc.so
+usr/lib/pkgconfig/xcb-xvmc.pc

debian/libxcb-xvmc0.install

@@ -0,0 +1 @@
+usr/lib/libxcb-xvmc.so.*

debian/libxcb1-dev.install

@@ -0,0 +1,8 @@
+usr/include/xcb/bigreq.h
+usr/include/xcb/xc_misc.h
+usr/include/xcb/xcb.h
+usr/include/xcb/xcbext.h
+usr/include/xcb/xproto.h
+usr/lib/libxcb.a
+usr/lib/libxcb.so
+usr/lib/pkgconfig/xcb.pc

debian/libxcb1.install

@@ -0,0 +1 @@
+usr/lib/libxcb.so.*

debian/rules

@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_MAKE_CHECK_TARGET=check
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -C $(DEB_BUILDDIR) CFLAGS="$(CFLAGS)"
+
+debian/copyright: debian/copyright.debian COPYING
+	cat $+ > $@
+
+clean::
+	-rm -f debian/copyright
+
+common-install-prehook-arch common-install-prehook-indep:: debian/copyright

debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://xcb.freedesktop.org/dist/libxcb-([0-9].*)\.tar\.gz

src/xcb_util.c

@@ -176,7 +176,10 @@ static int _xcb_open_decnet(const char *host, const unsigned short port)
 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

tests/check_public.c

@@ -24,7 +24,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis
 		if(test_type == TEST_ARGUMENT)
 		{
 			argument = name;
-			putenv("DISPLAY");
+			putenv("DISPLAY=");
 		}
 		else if(test_type == TEST_ENVIRONMENT)
 		{
@@ -49,7 +49,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis
 		fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host);
 		fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display);
 	}
-	putenv("DISPLAY");
+	putenv("DISPLAY=");
 }
 
 static void parse_display_fail(const char *name)
@@ -65,10 +65,11 @@ static void parse_display_fail(const char *name)
 		if(test_type == TEST_ARGUMENT)
 		{
 			argument = name;
-			putenv("DISPLAY");
+			putenv("DISPLAY=");
 		}
 		else if(test_type == TEST_ENVIRONMENT)
 		{
+			if (!name) break;
 			argument = 0;
 			setenv("DISPLAY", name, 1);
 		}
@@ -90,7 +91,7 @@ static void parse_display_fail(const char *name)
 		fail_unless(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host);
 		fail_unless(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display);
 	}
-	putenv("DISPLAY");
+	putenv("DISPLAY=");
 }
 
 START_TEST(parse_display_unix)
@@ -182,7 +183,7 @@ END_TEST
 Suite *public_suite(void)
 {
 	Suite *s = suite_create("Public API");
-	putenv("DISPLAY");
+	putenv("DISPLAY=");
 	suite_add_test(s, parse_display_unix, "xcb_parse_display unix");
 	suite_add_test(s, parse_display_ip, "xcb_parse_display ip");
 	suite_add_test(s, parse_display_ipv4, "xcb_parse_display ipv4");

xcb-xinerama.pc.in

@@ -1,11 +1,11 @@
-prefix=/opt/fdo/
+prefix=@prefix@
-exec_prefix=${prefix}
+exec_prefix=@exec_prefix@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
-includedir=${prefix}/include
+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}