.gitignore | 73 ++++++++++++++++++++++++---- COPYING | 18 +++++++ ChangeLog | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++ INSTALL | 8 --- Makefile.am | 13 ++--- configure.ac | 14 +++-- debian/README.source | 2 debian/changelog | 8 +++ debian/control | 2 debian/copyright | 18 +++++++ debian/xsfbs/xsfbs.mk | 35 ++++++++----- src/Filter.c | 1 12 files changed, 272 insertions(+), 46 deletions(-)
New commits: commit 4a1a8cf8f7f4530ed32a7db7b6db920565920f52 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:26:49 2010 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index e9b3fc7..de1207f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libxrender (1:0.9.6-1) UNRELEASED; urgency=low +libxrender (1:0.9.6-1) unstable; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. * Bump Standards-Version to 3.9.0. - -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:14:15 +0100 + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:26:35 +0100 libxrender (1:0.9.5-2) unstable; urgency=low commit e69473ddf922c8870c038eb0160e655689cc0d53 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:25:53 2010 +0100 Bump Standards-Version to 3.9.0. diff --git a/debian/changelog b/debian/changelog index ab39e8f..e9b3fc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxrender (1:0.9.6-1) UNRELEASED; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. + * Bump Standards-Version to 3.9.0. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:14:15 +0100 diff --git a/debian/control b/debian/control index 3705293..7505e4d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5~1) -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrender.git commit f020a7ac19950b8b08e886928fd55a183cbd0634 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:20:12 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index d029002..ab39e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxrender (1:0.9.6-1) UNRELEASED; urgency=low * New upstream release. + * Update debian/copyright from upstream COPYING. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:14:15 +0100 diff --git a/debian/copyright b/debian/copyright index c7d9ec1..9661a4c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,3 +21,21 @@ 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 © 2000 SuSE, Inc. + +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 SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +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. commit d250104f75cd3b4159cf86405859e94d0cfc50c4 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:14:24 2010 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index c5cd1b8..4e62228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,129 @@ +commit d3d20437ceee1c225cd189fdeb6378552e206337 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 8 19:23:04 2010 -0700 + + libXrender 0.9.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0dcf5c152a6463342897375c71e4f76476d285d2 +Author: Jamey Sharp <[email protected]> +Date: Fri Apr 9 17:26:52 2010 -0700 + + Always call SyncHandle after issuing an X request. + +commit b138debfd03e096a0af998495441ac262733dfc9 +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 14:53:49 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1380d975d1b85decd2b0a6e8a7e629b1bdd1d1ad +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 14 09:43:56 2010 -0500 + + COPYING: add missing copyright notices + + Refer to: Composite.c + Copyright © 2000 SuSE, Inc. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit fc8b02894452ad93101b35fec41cb1baf72e746a +Author: Rémi Cardona <[email protected]> +Date: Thu Dec 17 08:30:04 2009 +0100 + + require autoconf 2.60 because of $(docdir) use + + Signed-off-by: Rémi Cardona <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + +commit f662ae0e47a6f8fe47457a0b38f72f9598f37c96 +Author: Gaetan Nadon <[email protected]> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 83a3fd787f3058284d8b903ac190de54ba1f0e6d +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit cf8a7c4463eba5ef3c63186ad539c201df3770f9 +Author: Gaetan Nadon <[email protected]> +Date: Tue Oct 27 15:07:26 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit f58f2bf44c35ca82ecd9f022a494af0fbcd0a537 +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 47051786b209039488dfca6b644db3f67ca96426 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:19 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 1da8c1bfbb17750e5ba51321961aaf39b8cf98f7 +Author: Tomáš Chvátal <[email protected]> +Date: Sun Nov 29 13:38:42 2009 +0100 + + Make libXrender use docdir for documentation placement. + + Signed-off-by: Tomáš Chvátal <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + +commit a5ab173b0b19e6acefc897492b21fc6e6c296282 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 21 12:47:26 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <[email protected]> + commit 5865c457191da7f7357b7c7cdfb1a6e695e630df Author: Alan Coopersmith <[email protected]> Date: Thu Oct 1 22:34:19 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 35fbb8e..d029002 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxrender (1:0.9.6-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:14:15 +0100 + libxrender (1:0.9.5-2) unstable; urgency=low [ Julien Cristau ] commit d3d20437ceee1c225cd189fdeb6378552e206337 Author: Alan Coopersmith <[email protected]> Date: Tue Jun 8 19:23:04 2010 -0700 libXrender 0.9.6 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 1934614..57ae66e 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,10 @@ dnl try to keep these the same. Note that the library has an extra dnl digit in the version number to track changes which don't affect the dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n dnl -AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender) +AC_INIT(libXrender, + 0.9.6, + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + libXrender) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 0dcf5c152a6463342897375c71e4f76476d285d2 Author: Jamey Sharp <[email protected]> Date: Fri Apr 9 17:26:52 2010 -0700 Always call SyncHandle after issuing an X request. diff --git a/src/Filter.c b/src/Filter.c index 76c8cfa..3ac660a 100644 --- a/src/Filter.c +++ b/src/Filter.c @@ -123,6 +123,7 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) _XEatData (dpy, 4 - (i & 3)); UnlockDisplay (dpy); + SyncHandle (); return filters; } commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit b138debfd03e096a0af998495441ac262733dfc9 Author: Gaetan Nadon <[email protected]> Date: Mon Mar 29 14:53:49 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index 27c9e33..01ef172 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,6 @@ pkgconfig_DATA = xrender.pc dist_doc_DATA = doc/libXrender.txt MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = xrender.pc.in .PHONY: ChangeLog INSTALL commit 1380d975d1b85decd2b0a6e8a7e629b1bdd1d1ad Author: Gaetan Nadon <[email protected]> Date: Thu Jan 14 09:43:56 2010 -0500 COPYING: add missing copyright notices Refer to: Composite.c Copyright © 2000 SuSE, Inc. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index e506314..0d548e5 100644 --- a/COPYING +++ b/COPYING @@ -19,3 +19,21 @@ 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 © 2000 SuSE, Inc. + +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 SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +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. commit fc8b02894452ad93101b35fec41cb1baf72e746a Author: Rémi Cardona <[email protected]> Date: Thu Dec 17 08:30:04 2009 +0100 require autoconf 2.60 because of $(docdir) use Signed-off-by: Rémi Cardona <[email protected]> Reviewed-by: Gaetan Nadon <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Reviewed-by: Dan Nicholson <[email protected]> diff --git a/configure.ac b/configure.ac index ffacb45..1934614 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) dnl dnl Version should match the current Render version. XRenderQueryVersion commit f662ae0e47a6f8fe47457a0b38f72f9598f37c96 Author: Gaetan Nadon <[email protected]> Date: Fri Nov 27 20:56:04 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 2477e56..27c9e33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,6 +26,7 @@ pkgconfig_DATA = xrender.pc dist_doc_DATA = doc/libXrender.txt +MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = xrender.pc.in .PHONY: ChangeLog INSTALL commit 83a3fd787f3058284d8b903ac190de54ba1f0e6d Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:10 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 835f608..0000000 --- a/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xrender is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/Makefile.am b/Makefile.am index f06239b..2477e56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,12 @@ dist_doc_DATA = doc/libXrender.txt EXTRA_DIST = xrender.pc.in -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 commit cf8a7c4463eba5ef3c63186ad539c201df3770f9 Author: Gaetan Nadon <[email protected]> Date: Tue Oct 27 15:07:26 2009 -0400 Deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. diff --git a/configure.ac b/configure.ac index 439d9e5..ffacb45 100644 --- a/configure.ac +++ b/configure.ac @@ -35,14 +35,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_DEFAULT_OPTIONS # Check render configuration, strip extra digits from package version to # find the required protocol version commit f58f2bf44c35ca82ecd9f022a494af0fbcd0a537 Author: Gaetan Nadon <[email protected]> Date: Mon Oct 26 22:08:43 2009 -0400 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. diff --git a/Makefile.am b/Makefile.am index 4df32ed..f06239b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,7 @@ pkgconfig_DATA = xrender.pc dist_doc_DATA = doc/libXrender.txt -EXTRA_DIST = xrender.pc.in ChangeLog -MAINTAINERCLEANFILES = ChangeLog +EXTRA_DIST = xrender.pc.in .PHONY: ChangeLog commit 47051786b209039488dfca6b644db3f67ca96426 Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 12:34:19 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index 09a9259..9ba386e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,78 @@ -.deps -.libs +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 Makefile Makefile.in -MakeOut +mdate-sh missing mkinstalldirs -stamp-h1 -xrender.pc +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -*.o -*.la -*.lo -libXrender-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for libXrender +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit 1da8c1bfbb17750e5ba51321961aaf39b8cf98f7 Author: Tomáš Chvátal <[email protected]> Date: Sun Nov 29 13:38:42 2009 +0100 Make libXrender use docdir for documentation placement. Signed-off-by: Tomáš Chvátal <[email protected]> Signed-off-by: Julien Cristau <[email protected]> diff --git a/Makefile.am b/Makefile.am index a15b64d..4df32ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,7 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xrender.pc -renderdocdir = $(datadir)/doc/$(PACKAGE) -dist_renderdoc_DATA = doc/libXrender.txt +dist_doc_DATA = doc/libXrender.txt EXTRA_DIST = xrender.pc.in ChangeLog MAINTAINERCLEANFILES = ChangeLog commit a5ab173b0b19e6acefc897492b21fc6e6c296282 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 21 12:47:26 2009 -0700 This is not a GNU project, so declare it foreign. On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: > > I noticed an INSTALL file in xlsclients and libXvMC today, and it > > was quite annoying to work around since 'autoreconf -fvi' replaces > > it and git wants to commit it. Should these files even be in git? > > Can I nuke them for the betterment of humanity and since they get > > created by autoreconf anyways? > > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation of the INSTALL file. It is also part of the 24206 solution. Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/configure.ac b/configure.ac index 9219452..439d9e5 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ dnl digit in the version number to track changes which don't affect the dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n dnl AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
