xcb-util-renderutil: Changes to 'debian-unstable'
.gitignore | 1
COPYING | 67 +
Doxyfile | 1305 ---------------------------------
Makefile.am | 2
NEWS | 9
autogen.sh | 15
configure.ac | 13
debian/changelog | 23
debian/compat | 2
debian/control | 10
debian/copyright | 88 +-
debian/libxcb-render-util0-dev.install | 6
debian/libxcb-render-util0.install | 2
debian/libxcb-render-util0.symbols | 15
debian/rules | 7
m4 | 2
renderutil/Makefile.am | 7
renderutil/cache.c | 2
renderutil/glyph.c | 4
renderutil/util.c | 30
renderutil/xcb_renderutil.h | 10
xcb_util_intro.in | 24
22 files changed, 239 insertions(+), 1405 deletions(-)
New commits:
commit 5047467178a8696de3822cf59f6a44808834dff7
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 13 11:55:11 2014 +0900
Upload 0.3.9-1 to unstable.
diff --git a/debian/changelog b/debian/changelog
index e3d98d6..7fc2b50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
+xcb-util-renderutil (0.3.9-1) unstable; urgency=low
* New upstream release.
* debian/control, debian/rules:
@@ -11,7 +11,7 @@ xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
+ debian/libxcb-render-util0.symbols: Added to catch ABI changes.
+ debian/copyright: Switch to machine-readable format.
- -- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
+ -- Arnaud Fontaine <arnau@debian.org> Fri, 13 Jun 2014 11:54:12 +0900
xcb-util-renderutil (0.3.8-1.1) unstable; urgency=low
@@ -143,4 +143,3 @@ xcb-util (0.2-1) experimental; urgency=low
* Initial release (Closes: #437681)
-- Julien Danjou <acid@debian.org> Tue, 25 Mar 2008 19:14:42 +0100
-
commit d610c41c256ad6c368374174db1507beaf82d9bf
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 13 11:26:50 2014 +0900
Switch debian/copyright to machine-readable format.
diff --git a/debian/changelog b/debian/changelog
index 146f992..e3d98d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
in the previous NMU upload.
* debian/control: Bump Standards-Version to 3.9.5.
+ debian/libxcb-render-util0.symbols: Added to catch ABI changes.
+ + debian/copyright: Switch to machine-readable format.
-- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
diff --git a/debian/copyright b/debian/copyright
index e0e373a..0cb2ccf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,40 +1,52 @@
-This package was debianized by Julien Danjou <acid@debian.org> on Tue, 25 Mar
-2008 19:14:42 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xcb-util-renderutil
+Upstream-Contact: XCB Mailing List <xcb@lists.freedesktop.org>
+Source: http://xcb.freedesktop.org
-It was downloaded from <http://xcb.freedesktop.org>
+Files: *
+Copyright: 2000 Keith Packard <keithp@keithp.com>
+ 2006 Ian Osgood <iano@quirkster.com>
+ 2006 Jamey Sharp <jamey@minilop.net>
+License: MIT/X Consortium License
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the names of the authors or their
+ institutions shall not be used in advertising or otherwise to promote the
+ sale, use or other dealings in this Software without prior written
+ authorization from the authors.
-Upstream Authors: Ian Osgood, Keith Packard and Jamey Sharp.
-
-Copyright:
-
- Copyright © 2006 Jamey Sharp
- Copyright © 2000 Keith Packard
- Copyright © 2006 Ian Osgood
-
-License:
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the names of the authors or their
- institutions shall not be used in advertising or otherwise to promote the
- sale, use or other dealings in this Software without prior written
- authorization from the authors.
-
-The Debian packaging is © 2008-2011, Julien Danjou <acid@debian.org> and ©
-2011, Arnaud Fontaine <arnau@debian.org>, and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: 2008-2012, Julien Danjou <acid@debian.org>
+ 2011-2014, Arnaud Fontaine <arnau@debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
commit 76ab08b9097a8d8c5e93edbf528b0f5db151c5ed
Author: Arnaud Fontaine <arnau@debian.org>
Date: Fri Jun 13 11:25:22 2014 +0900
Add debian/libxcb-render-util0.symbols to catch ABI changes.
diff --git a/debian/changelog b/debian/changelog
index 9424eb0..146f992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
* debian/compat:
+ Use compatibility level 9 following bump of debhelper Build-Depends
in the previous NMU upload.
+ * debian/control: Bump Standards-Version to 3.9.5.
+ + debian/libxcb-render-util0.symbols: Added to catch ABI changes.
-- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
diff --git a/debian/control b/debian/control
index ebdd13b..06642dd 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.93~),
autoconf,
automake,
xutils-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
Homepage: http://xcb.freedesktop.org
Vcs-Git: git://git.debian.org/pkg-xorg/lib/xcb-util-renderutil.git
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util-renderutil.git
diff --git a/debian/libxcb-render-util0.symbols b/debian/libxcb-render-util0.symbols
new file mode 100644
index 0000000..839f419
--- /dev/null
+++ b/debian/libxcb-render-util0.symbols
@@ -0,0 +1,15 @@
+libxcb-render-util.so.0 libxcb-render-util0 #MINVER#
+ xcb_render_util_change_glyphset@Base 0
+ xcb_render_util_composite_text@Base 0
+ xcb_render_util_composite_text_checked@Base 0
+ xcb_render_util_composite_text_free@Base 0
+ xcb_render_util_composite_text_stream@Base 0
+ xcb_render_util_disconnect@Base 0
+ xcb_render_util_find_format@Base 0
+ xcb_render_util_find_standard_format@Base 0
+ xcb_render_util_find_visual_format@Base 0
+ xcb_render_util_glyphs_16@Base 0
+ xcb_render_util_glyphs_32@Base 0
+ xcb_render_util_glyphs_8@Base 0
+ xcb_render_util_query_formats@Base 0
+ xcb_render_util_query_version@Base 0
commit e50d9aec4fdd1a0c531a88722001efa33f6af070
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed Jun 11 18:28:36 2014 +0900
Use compatibility level 9 following bump of debhelper Build-Depends in the previous NMU upload.
diff --git a/debian/changelog b/debian/changelog
index 59f216c..9424eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
* debian/control, debian/rules:
+ Use dh-autoreconf to make porters' task easier. Thanks to Erwan
Prioul. Closes: #750664.
+ * debian/compat:
+ + Use compatibility level 9 following bump of debhelper Build-Depends
+ in the previous NMU upload.
-- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
commit f60b515bb670844b9ead43b719f4d120c1eb6fa0
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed Jun 11 18:24:51 2014 +0900
Use dh-autoreconf to make porters' task easier. Thanks to Erwan Prioul. Closes: #750664.
diff --git a/debian/changelog b/debian/changelog
index de26863..59f216c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/control, debian/rules:
+ + Use dh-autoreconf to make porters' task easier. Thanks to Erwan
+ Prioul. Closes: #750664.
-- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
diff --git a/debian/control b/debian/control
index d535326..ebdd13b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Julien Danjou <acid@debian.org>,
Arnaud Fontaine <arnau@debian.org>
Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
+ dh-autoreconf,
libxcb1-dev (>= 1.6),
libxcb-render0-dev,
pkg-config,
diff --git a/debian/rules b/debian/rules
index e3dcbd3..210746b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
DEB_DH_INSTALL_SOURCEDIR=debian/tmp
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
commit 238a037c8e0a2232c9b4ef0bbee0c38acd246884
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed Jun 11 18:22:17 2014 +0900
New upstream release (0.3.9).
diff --git a/debian/changelog b/debian/changelog
index 43c9fc3..de26863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xcb-util-renderutil (0.3.9-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Arnaud Fontaine <arnau@debian.org> Wed, 11 Jun 2014 18:18:55 +0900
+
xcb-util-renderutil (0.3.8-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index 4c1b08c..e3dcbd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,7 @@ cleanbuilddir::
rm -f configure-stamp
# Specific to Git Debian package
- rm -f Doxyfile .gitmodules autogen.sh \
- m4/xcb_util_m4_with_include_path.m4
+ rm -f .gitmodules m4/xcb_util_m4_with_include_path.m4
get-orig-source:
git archive upstream | gzip -9 > ../xcb-util-renderutil_$(ORIG_MAJOR)+git$(ORIG_GIT).orig.tar.gz
commit 27e0aa50537a6628b6774a99402cbab89594bf46
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed Jun 11 18:13:32 2014 +0900
Import NMU changes (0.3.8-1.1).
diff --git a/debian/changelog b/debian/changelog
index 7ff61f1..43c9fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xcb-util-renderutil (0.3.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Enable multiarch (closes: #677733).
+
+ -- Michael Gilbert <mgilbert@debian.org> Thu, 28 Jun 2012 17:49:58 -0400
+
xcb-util-renderutil (0.3.8-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 322fd73..d535326 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Danjou <acid@debian.org>,
Arnaud Fontaine <arnau@debian.org>
-Build-Depends: cdbs,
- debhelper (>= 5),
+Build-Depends: cdbs (>= 0.4.93~),
+ debhelper (>= 9),
libxcb1-dev (>= 1.6),
libxcb-render0-dev,
pkg-config,
@@ -22,6 +22,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xcb-util-renderutil.git
Package: libxcb-render-util0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: utility libraries for X C Binding -- render-util
This package contains the library files needed to run software using
@@ -36,6 +38,7 @@ Description: utility libraries for X C Binding -- render-util
Package: libxcb-render-util0-dev
Architecture: any
+Multi-Arch: same
Depends: libxcb-render-util0 (= ${binary:Version}),
libxcb1-dev,
libxcb-render0-dev,
diff --git a/debian/libxcb-render-util0-dev.install b/debian/libxcb-render-util0-dev.install
index 730e5ac..de3953a 100644
--- a/debian/libxcb-render-util0-dev.install
+++ b/debian/libxcb-render-util0-dev.install
@@ -1,4 +1,4 @@
usr/include/xcb/xcb_renderutil.h
-usr/lib/libxcb-render-util.a
-usr/lib/libxcb-render-util.so
-usr/lib/pkgconfig/xcb-renderutil.pc
+usr/lib/*/libxcb-render-util.a
+usr/lib/*/libxcb-render-util.so
+usr/lib/*/pkgconfig/xcb-renderutil.pc
diff --git a/debian/libxcb-render-util0.install b/debian/libxcb-render-util0.install
index 0ee0d82..72c70e5 100644
--- a/debian/libxcb-render-util0.install
+++ b/debian/libxcb-render-util0.install
@@ -1 +1 @@
-usr/lib/libxcb-render-util.so.*
+usr/lib/*/libxcb-render-util.so.*
diff --git a/debian/rules b/debian/rules
index 9295a18..4c1b08c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@ include /usr/share/cdbs/1/class/autotools.mk
DEB_DH_MAKESHLIBS_ARGS=-V
+DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS+=--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
ORIG_MAJOR=$(shell git describe upstream | cut -d- -f1)
ORIG_GIT=$(shell git describe upstream | cut -d- -f2)
commit 0317caf63de532fd7a0493ed6afa871a67253747
Author: Arnaud Fontaine <arnau@debian.org>
Date: Wed Jun 11 18:01:07 2014 +0900
Release 0.3.9
Signed-off-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/NEWS b/NEWS
index da5ed2e..933eac0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Release 0.3.9 (2014-06-11)
+==========================
+
+- Mark DEPTH_MASK as Unsigned int.
+- config: add bug URL to AC_INIT.
+- config: add missing COPYING file.
+- compile the library with standard xorg warning flags.
+- Fix compilation and linking issues with C++.
+
Release 0.3.8 (2010-04-25)
==========================
diff --git a/configure.ac b/configure.ac
index 31c3ac6..803abe7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59c)
-AC_INIT([xcb-util-renderutil],[0.3.8],
+AC_INIT([xcb-util-renderutil],[0.3.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xcb&component=Utils],
[xcb-util-renderutil])
AC_CONFIG_SRCDIR([Makefile.am])
commit 83f93d387608ef43912fc5f3f262aec4bbd12d18
Author: Arnaud Fontaine <arnau@debian.org>
Date: Mon Feb 17 18:17:38 2014 +0900
Follow changes in m4 submodule.
diff --git a/m4 b/m4
index 9dd4002..f662e3a 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 9dd400297f673851dfaea22de2b51583c7b89cb6
+Subproject commit f662e3a93ebdec3d1c9374382dcc070093a42fed
commit f411a723594636220b0876389b7831409b81e97a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 22:21:35 2014 -0500
make: compile the library with standard xorg warning flags
The new BASE_CFLAGS variable contains only warning flags that do not
alter the generated byte code, unlike the deprecated CWARNFLAGS which
turns off the GNUCC strict aliasing optimization.
Package util-macros version 1.16 or later is required.
Pick-up upstream changes for m4 submodule
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/m4 b/m4
index 177e4af..9dd4002 160000
--- a/m4
+++ b/m4
@@ -1 +1 @@
-Subproject commit 177e4afb9b57a7b7589c15d8a9bd85b4a5524128
+Subproject commit 9dd400297f673851dfaea22de2b51583c7b89cb6
diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am
index c9af2a7..3a51798 100644
--- a/renderutil/Makefile.am
+++ b/renderutil/Makefile.am
@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libxcb-render-util.la
xcbinclude_HEADERS = xcb_renderutil.h
+AM_CFLAGS = $(BASE_CFLAGS)
AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS)
libxcb_render_util_la_SOURCES = cache.c util.c glyph.c
libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS)
commit 0d23526dc93b0d5d77a5f46c3b0568f5700d2fd7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 22:07:13 2014 -0500
make: there should be no attempt to remove any Makefile.in file
Files generated by autoconf (and the various tools it calls) must not be
removed by running a makefile. This is outside the scope of the makefile.
http://lists.gnu.org/archive/html/autoconf/2007-03/msg00043.html
One can use git-clean to return to the original state of the module prior
to running autogen.sh, autoreconf or configure.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am
index 246c47f..c9af2a7 100644
--- a/renderutil/Makefile.am
+++ b/renderutil/Makefile.am
@@ -1,6 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in
-
lib_LTLIBRARIES = libxcb-render-util.la
xcbinclude_HEADERS = xcb_renderutil.h
commit 1a11b46021eb16a68cac662bb16093f2fee99851
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 19:29:49 2014 -0500
make: using EXTRA_DIST for xcb-renderutil.pc.in is redundant
All files mentionned in AC_CONFIG_FILES have their source files
distributed automatically.
http://www.gnu.org/software/automake/manual/automake.html
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am
index 5e5c59b..246c47f 100644
--- a/renderutil/Makefile.am
+++ b/renderutil/Makefile.am
@@ -11,5 +11,3 @@ libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS)
libxcb_render_util_la_LDFLAGS = -no-undefined
pkgconfig_DATA = xcb-renderutil.pc
-
-EXTRA_DIST=xcb-renderutil.pc.in
commit e8cc2005ef9ef55fd5119c654cc38deebf3428fe
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 19:16:27 2014 -0500
make: use AM_CPPFLAGS rather than per-target libxcb_render_util_la_CPPFLAGS
There is only one target in this directory, so we do not need to trigger
the per-target infrastructure which would require AC_PROG_CC_C_O macro.
So libxcb_render_util_la-util.o simply becomes util.o.
http://www.gnu.org/software/automake/manual/automake.html#Renamed-Objects
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am
index 3bff67a..5e5c59b 100644
--- a/renderutil/Makefile.am
+++ b/renderutil/Makefile.am
@@ -5,8 +5,8 @@ lib_LTLIBRARIES = libxcb-render-util.la
xcbinclude_HEADERS = xcb_renderutil.h
+AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS)
libxcb_render_util_la_SOURCES = cache.c util.c glyph.c
-libxcb_render_util_la_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS)
libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS)
libxcb_render_util_la_LDFLAGS = -no-undefined
commit a1652bcda071279b5782e7413fb0a5eb326b1fc5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 18:37:39 2014 -0500
config: add missing COPYING file
This file is mandatory. It reflects the copyright statements found
in the source code as written by their respective owners.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..dfa83f4
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,67 @@
+Copyright © 2000 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Keith Packard makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright © 2006 Jamey Sharp.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+
+Copyright © 2006 Ian Osgood
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
commit c9f533e8aa34bc7bba39c9cbcdc55491a1508805
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Feb 4 17:31:33 2014 -0500
config: remove old dead code for documentation
xcb_util_intro only found in Doxyfile which is not used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Arnaud Fontaine <arnau@debian.org>
diff --git a/.gitignore b/.gitignore
index fa4026e..c9f356c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,3 @@ core
# Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore'
#
-xcb_util_intro
diff --git a/Doxyfile b/Doxyfile
deleted file mode 100644
index ffb0602..0000000
--- a/Doxyfile
+++ /dev/null
@@ -1,1305 +0,0 @@
-# Doxyfile 1.5.3-20071008
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = XCBUtility
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = doc/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 2
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = NO
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be extracted
-# and appear in the documentation as a namespace called 'anonymous_namespace{file}',
-# where file will be replaced with the base name of the file that contains the anonymous
-# namespace. By default anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
Reply to: