x11proto-render: Changes to 'debian-unstable'
.gitignore | 4
ChangeLog | 348 ++++
Makefile.am | 12
Makefile.in | 528 ------
aclocal.m4 | 610 -------
configure | 3209 ---------------------------------------
configure.ac | 6
debian/README.source | 73
debian/changelog | 14
debian/compat | 2
debian/control | 16
debian/rules | 16
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150 -
debian/xsfbs/xsfbs.mk | 131 -
debian/xsfbs/xsfbs.sh | 522 +-----
install-sh | 507 ------
missing | 367 ----
mkinstalldirs | 161 -
render.h | 23
renderproto.txt | 170 --
21 files changed, 725 insertions(+), 6176 deletions(-)
New commits:
commit 88d8bbd256f4d945fd6f59706dc94db13c223bc3
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 17:54:09 2009 +0200
Bump xutils-dev build-dep for new util-macros
diff --git a/debian/control b/debian/control
index 9c72225..0b8e948 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev
+ xutils-dev (>= 1:7.4+4)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-render
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
commit 9ca77c50af2e32ba3b5368665ed17f247b8f4285
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:41:41 2009 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..1cbb521
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,346 @@
+commit d889aa6c766e2691e1a6a8189c730661023e4de4
+Author: Fredrik Höglund <fredrik@kde.org>
+Date: Wed Jul 15 00:16:32 2009 +0200
+
+ Bump version to 0.11.
+
+commit 533e22db3088bb75e58b6d977ec82a13c4680b54
+Author: Fredrik Höglund <fredrik@kde.org>
+Date: Wed Jul 15 00:16:08 2009 +0200
+
+ Add support for the PDF blend mode operators.
+
+commit 2c5e931d5e5b5af88bcf8aaed8b10d799fd47b1e
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri Jul 10 21:34:12 2009 -0400
+
+ Clarify behavior of IncludeInferior and GraphicsExposures.
+
+commit c4315b2a4704c88924e7a6bc444b5331caa64022
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri May 1 19:39:47 2009 -0400
+
+ Clarify semantics of clipping
+
+ Source clips are applied on top of the transformed and repeated
+ window, because that way you can clip out an interesting shape of for
+ example a repeated gradient, and because this makes the implementation
+ simple and efficient.
+
+ GraphicsExposures are never generated.
+
+ The hierarchy clip is ignored for source and mask pictures. This is
+ because GraphicsExposures are not generated anyway, and because
+ implementing it correctly in the presense of filters and
+ transformations would be either inefficient or very complex.
+
+ Also make it explicit that the dither argument is not used.
+
+commit 2428785895f352f15fb412a630289e44bb2e7cc3
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri May 1 17:39:47 2009 -0400
+
+ Delete reference to unimplemented ColorTriangles and ColorTrapezoids
+ requests.
+
+commit 64f589368eb0c3070656de283b29b7b0b8ccc10b
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date: Fri May 1 17:25:03 2009 -0400
+
+ Describe the four repeat options for pictures
+
+ Previously there was a description of three repeat options
+ ("Transparent", "Nearest", "Normal") which did not actually exist in
+ the implementation.
+
+commit 802e941e5fee14214687795f857b6dfd1e163af0
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 52fc0c528a2fcedc61070925213cb74f6ce45fb1
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:39:06 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 192cdc7530b8ff45d9bcea99dc07849ffbfa65b7
+Merge: 67b1244 9c561f5
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 06:17:59 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/renderproto
+
+commit 67b12440358eec012023d46e9150ca22c6fd47bf
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:54:14 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 9c561f58b713aaecbc0ba3a6a8579094e57fdd20
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 31 14:50:09 2007 -0700
+
+ Bump version to 0.9.3.
+
+commit 030dd885476b70c9054b6e4b50dfdbab12e73716
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Aug 31 14:28:03 2007 -0700
+
+ Bug #7364: Fix the typedefs of GlyphSet, Picture, and PictFormat to be XIDs.
+
+ Without this, they would be 64-bit types on 64-bit X Servers, which
+ occasionally resulted in incorrect unpacking.
+
+commit 76a3e69e8e5a761533fc4c752bf907c2440ea6b2
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Oct 11 13:13:16 2006 -0700
+
+ Typo fixes in Render protocol spec
+
+commit 42cd58192fa14dc792379896e9473f693b616d9f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Oct 11 13:08:51 2006 -0700
+
+ Update date/version on Render protocol spec to match last update (0.10)
+
+commit 04fc37cf7d28dee03e3e68b812ce843f5d1edb97
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Jan 9 11:26:25 2007 -0800
+
+ Hook renderproto.txt up to build/install.
+
+ The previous 12 commits represent a conversion of xlibs cvs to git, then usage
+ of git-format-patch <origin> protocol, munging of the path, and git-am. The
+ remaining patches to the render protocol description from xorg-docs will
+ follow.
+
+commit 2a8d528ed739f4bc59b4b7e5054f44e378b4a89f
+Author: Lars Knoll <lars@trolltech.com>
+Date: Fri Jul 1 08:17:51 2005 +0000
+
+ premultiplied colors for creation of solid fills.
+
+commit effea4687eec4922ab1975ea69d81fe9238a310a
+Author: Lars Knoll <lars@trolltech.com>
+Date: Thu Jun 30 07:16:25 2005 +0000
+
+ smaller fixes to the protocol.
+
+commit 09eb1125f8edb2dcbdff55f3f330044d1f35f8bb
+Author: Lars Knoll <lars@trolltech.com>
+Date: Wed Jun 29 11:52:07 2005 +0000
+
+ add support for Gradient and Solid Pictures
+
+ bump render version to 0.10
+
+commit d3bc284d6c875118566504798aa3818617d377cd
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 29 07:58:03 2004 +0000
+
+ 2004-07-29 Keith Packard <keithp@keithp.com>
+
+ * configure.ac:
+ * protocol:
+ * render.h:
+ * renderproto.h:
+ Specify new AddTraps request.
+ Change pixelization specification.
+
+commit 3a46f9178cbd722ed238587d4463a6d19d8f1044
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat May 3 19:20:00 2003 +0000
+
+ Add animated cursor request, bump to 0.8
+
+commit 1d46ed302a18da9d7fe4f08101b7e0fad5e0a909
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 27 05:36:25 2002 +0000
+
+ Fix FreePicture to note that non-XID references can keep pictures allocated
+
+commit 8c80ba46b689cdc66c3fdf6bfec3d025795f9c9e
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 6 22:47:49 2002 +0000
+
+ XRenderQueryPictIndexValues support (from Olivier Chapuis). Bump Render version to 0.7
+
+commit 02402ce6194c6205f172c35b276169cf2cf30a31
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 26 02:56:48 2002 +0000
+
+ Add image transformation and sub-pixel ordering to Render
+
+commit 62a55ea66717bd056fde8d1bbf84275d7fa087e5
+Author: Marc Aurele La France <tsi@ualberta.edu>
+Date: Fri Aug 23 15:12:36 2002 +0000
+
+ Grammar
+
+commit 465ae9a308001920f94d1f029e2bbb7f70c87d89
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 23 05:48:25 2002 +0000
+
+ Add CreateCursor request to Render
+
+commit 6633f3924d6f224d02f48808b28981f9775f6e72
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 13 07:55:48 2002 +0000
+
+ Update spec to match current implementation.
+
+commit 7ff23a96aaafb598a413e2bd4c52da98dfb8da4a
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Dec 15 18:33:53 2000 +0000
+
+ Add Render protocol document
+
+commit 3237db592bb09dc89f8be918e2c59c6f9f59d8ea
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jul 14 18:56:29 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 91f4e05915f5c0e6afe709a9904b955842e909fd
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:38 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 0810eecdd6303d4967760beac1a38df5cf0feab7
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:15 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 8c450de3b74dd1dd4a28747d9b60bc51382b0f17
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Tue Aug 2 19:19:39 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 2a63ef2ad78c8d4d89b275280b2d6f9f8d9a2c1f
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:56 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit c3526e7ea51b7b70d14fb6ad97cc234221ac875a
+Author: Lars Knoll <lars@trolltech.com>
+Date: Fri Jul 1 10:03:25 2005 +0000
+
+ Add support for gradients and solid fills to Render.
+
+commit c1a679f90a1b9e011060661dfdadd2960489ba95
+Author: Lars Knoll <lars@trolltech.com>
+Date: Mon Jun 13 14:40:24 2005 +0000
+
+ add the convolution filter from xserver to xorg
+
+commit ce97141900f9cc5dc067d2067b5877901399c597
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat May 21 04:16:58 2005 +0000
+
+ Set version to 0.9.
+
+commit 6622ff3f67edb4c537a9912e6eb56691a8cabea3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:22:40 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 50a3f335f4da1b705326b87ecc7699fb9d5f042c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:10:19 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 511abcb0f3f948e62d14fc00856b342d915f1add
+Author: Josh Triplett <josh@speakeasy.net>
+Date: Tue May 17 07:32:29 2005 +0000
+
+ Add COPYING file for Render.
+
+commit 9f1501a9c8ede82c0bf4e85d7c4dc5c404fec865
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon May 9 18:20:06 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 79256bd9ed1e7a1680e5fe660bee541648d80538
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri May 6 01:46:31 2005 +0000
+
+ Initial build system files for proto module.
+
+commit c5bf04b6c494b8af574f99b131fc1b8464a22c83
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:42:46 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 06f5e62edcb2af058bf4720a4b08665decd67158
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 6 23:42:10 2004 +0000
+
+ Add RenderAddTraps. Rewrite trapezoid rendering code.
+
+commit 713f778be0494a4f649922f2fa4cc24e36ddaf4b
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Jul 4 20:30:58 2004 +0000
+
+ Bugzilla #635: Correct the definition of CPLastBit to account for
+ ComponentAlpha, which may fix behavior of the server's
+ SetPictureToDefaults.
+
+commit db4eac7ce2a2e20269f24a98470c9a3c5fa7fbef
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 2b5b1ea58df1a9ab378c06f08ec26e44e2a03504
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ca720bca788372a451ea66a017cb49d029db1e30
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 400da1431cfa5a3a3ec2f160c9fabd6860c0ea6c
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit e6ad8e6d9eba014388fcaeedd426cd88ed6b4e89
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 1c17764c32d9187589f952cde9288eb3108cbceb
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit bb5a469bc6137857a3a057989c47a2c2dda68716
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index f94383e..d116532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
+x11proto-render (2:0.11-1) UNRELEASED; urgency=low
* Run autoreconf at build time.
* Bump debhelper compat to 5.
@@ -8,6 +8,7 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Remove the XS- prefix from Vcs-* control fields.
* Add dependency on x11proto-core-dev.
* Bump Standards-Version to 3.8.3.
+ * New upstream release.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
commit ccb683c9d37f04e0e98d918e3855bee4cff1d361
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:37:04 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index e998d9c..f94383e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
was only needed for upgrades from sarge.
* Remove the XS- prefix from Vcs-* control fields.
* Add dependency on x11proto-core-dev.
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/control b/debian/control
index ea6d569..9c72225 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
automake,
xutils-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-render
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
commit 0b3a1b8eb01e307b744a61eccb55b442ac8e3475
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:36:57 2009 +0200
Add dependency on x11proto-core-dev.
diff --git a/debian/changelog b/debian/changelog
index 8085c10..e998d9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Drop Pre-Depends on x11-common and Conflicts/Replaces on render-dev. This
was only needed for upgrades from sarge.
* Remove the XS- prefix from Vcs-* control fields.
+ * Add dependency on x11proto-core-dev.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/control b/debian/control
index 58e373a..ea6d569 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
Package: x11proto-render-dev
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev
Description: X11 Render extension wire protocol
This package provides development headers describing the wire protocol for
the Render extension, used to implement Porter-Duff operations within X.
commit 1464bf005743a25e8e30b37ab3f0c2d083b5465a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:36:45 2009 +0200
Remove the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index d9562c2..8085c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
* Drop Pre-Depends on x11-common and Conflicts/Replaces on render-dev. This
was only needed for upgrades from sarge.
+ * Remove the XS- prefix from Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/control b/debian/control
index d98308a..58e373a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends:
automake,
xutils-dev
Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-render
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-render
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
Package: x11proto-render-dev
Architecture: all
commit 74518da0a7f8ff83d19f183f6815c435b2572c2e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:36:38 2009 +0200
Drop Pre-Depends on x11-common and Conflicts/Replaces on render-dev.
This was only needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 2ff2036..d9562c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
* Bump debhelper compat to 5.
* Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
+ * Drop Pre-Depends on x11-common and Conflicts/Replaces on render-dev. This
+ was only needed for upgrades from sarge.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/control b/debian/control
index 4c84fb0..d98308a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,9 +14,6 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-render.git
Package: x11proto-render-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: render-dev (<= 1:0.9.2-1)
-Replaces: render-dev (<= 1:0.9.2-1)
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Render extension wire protocol
This package provides development headers describing the wire protocol for
the Render extension, used to implement Porter-Duff operations within X.
commit cfcd77d2968ecdcdcaa958fc1425e8e9baa0fedf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:36:30 2009 +0200
Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
diff --git a/debian/changelog b/debian/changelog
index b5d17f5..2ff2036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
* Bump debhelper compat to 5.
+ * Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/rules b/debian/rules
index a94307e..6d59943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,14 @@ PACKAGE = x11proto-render-dev
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -41,8 +42,7 @@ build-stamp:
--infodir=\$${prefix}/share/info --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
+ >$@
clean:
dh_testdir
commit 9cfb073aff4acab56e98731945f9579ead3eea79
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:35:56 2009 +0200
Bump debhelper compat to 5.
diff --git a/debian/changelog b/debian/changelog
index 9ea41dc..b5d17f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-render (2:0.9.3-3) UNRELEASED; urgency=low
* Run autoreconf at build time.
+ * Bump debhelper compat to 5.
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 11:17:10 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index deb1b8c..4c84fb0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Julien Cristau <jcristau@debian.org>
Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 5.0.0),
automake,
xutils-dev
Standards-Version: 3.7.2
commit ea18bcc3ead1dec3606706386e93b3d922406ceb
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 11:35:17 2009 +0200
Delete generated files
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index d6061c0..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,528 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(render_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/renderproto.pc.in $(top_srcdir)/configure COPYING \
- ChangeLog install-sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = renderproto.pc
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(renderdocdir)" "$(DESTDIR)$(renderdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-renderdocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA) $(renderdoc_DATA)
-renderHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(render_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-am__leading_dot = @am__leading_dot@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-renderdir = $(includedir)/X11/extensions
-render_HEADERS = \
- render.h \
- renderproto.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = renderproto.pc
-renderdocdir = $(datadir)/doc/$(PACKAGE)
-renderdoc_DATA = renderproto.txt
-EXTRA_DIST = autogen.sh renderproto.pc.in $(renderdoc_DATA)
-all: all-am
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
- cd $(srcdir) && $(AUTOMAKE) --foreign \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-renderproto.pc: $(top_builddir)/config.status $(srcdir)/renderproto.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-
-uninstall-pkgconfigDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- done
-install-renderdocDATA: $(renderdoc_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(renderdocdir)" || $(MKDIR_P) "$(DESTDIR)$(renderdocdir)"
- @list='$(renderdoc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(renderdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(renderdocdir)/$$f'"; \
- $(renderdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(renderdocdir)/$$f"; \
- done
-
-uninstall-renderdocDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(renderdoc_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(renderdocdir)/$$f'"; \
- rm -f "$(DESTDIR)$(renderdocdir)/$$f"; \
- done
-install-renderHEADERS: $(render_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(renderdir)" || $(MKDIR_P) "$(DESTDIR)$(renderdir)"
- @list='$(render_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(renderHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(renderdir)/$$f'"; \
- $(renderHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(renderdir)/$$f"; \
- done
-
-uninstall-renderHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(render_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(renderdir)/$$f'"; \
- rm -f "$(DESTDIR)$(renderdir)/$$f"; \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
Reply to: