.gitignore | 78 +++++++++++++++++++++++++++++++++++---- ChangeLog | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 11 +++-- README | 30 +++++++++++++++ configure.ac | 28 +++++++++----- debian/changelog | 10 ++++- debian/control | 4 +- 7 files changed, 245 insertions(+), 25 deletions(-)
New commits: commit 1f4799e1cc38025f9616310afdb2c17346bea43b Author: Cyril Brulebois <k...@debian.org> Date: Fri Jan 14 03:57:48 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 0ef4bbf..d062abd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-resource (1.1.1-1) UNRELEASED; urgency=low +x11proto-resource (1.1.1-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -10,7 +10,7 @@ x11proto-resource (1.1.1-1) UNRELEASED; urgency=low * Bump xutils-dev build-dep for newer macros. * Add myself to Uploaders. - -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 03:53:42 +0100 + -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 03:57:43 +0100 x11proto-resource (1.1.0-1) unstable; urgency=low commit 738914ae74b6dea35e71ffd19a1e12abea1a1884 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jan 14 03:57:41 2011 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index c908c6e..0ef4bbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x11proto-resource (1.1.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. * Bump xutils-dev build-dep for newer macros. + * Add myself to Uploaders. -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 03:53:42 +0100 diff --git a/debian/control b/debian/control index 2fdb93e..0f92bea 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-resource Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilin...@debian.org> +Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilin...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), automake, commit ca39651dc9d655a05fd09ecde934a9c5a3e2269b Author: Cyril Brulebois <k...@debian.org> Date: Fri Jan 14 03:56:08 2011 +0100 Bump xutils-dev build-dep for newer macros. diff --git a/debian/changelog b/debian/changelog index 04c230b..c908c6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x11proto-resource (1.1.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Bump xutils-dev build-dep for newer macros. -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 03:53:42 +0100 diff --git a/debian/control b/debian/control index 56577dd..2fdb93e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilinger@debian. Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev (>= 1:7.4+4) + xutils-dev (>= 1:7.5~1), Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-resource Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-resource.git commit 39fbbf46d59043b532de939a7f855486019b088c Author: Cyril Brulebois <k...@debian.org> Date: Fri Jan 14 03:54:00 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index e3df722..e8cba91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,112 @@ +commit 2cbf7d2ba3da72c2454d707e0109732c46a0c9d9 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Dec 8 22:19:47 2010 -0800 + + resourceproto 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 3389416e4c58b7e7ccad8d2bccb65f3e291ef43b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Dec 8 22:17:49 2010 -0800 + + config: replace deprecated AC_OUTPUT file list with AC_CONFIG_FILES + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 0545a1f26d56ab329b69be76a27e2d4d9b0f88df +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Mar 28 19:25:52 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit b5bb2e1707490805ea022f5110f229e5fbdc09e0 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Mar 28 19:00:31 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 06fc8dd07770bb8b10323581419c2e53e9a3f3ef +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Nov 22 19:24:48 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 8c0d56bd432819c6ee23af52d93c3cd0d3331f00 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Nov 16 11:13:30 2009 -0500 + + README: file created or updated #24206 + + Contains a set of URLs to freedesktop.org. + +commit f98b754b0f5fea6162f4f5a0679dd35829440ce4 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Nov 15 19:45:27 2009 -0500 + + 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 8184f9a6280de23d1cc140dd2ac9bc78625e434a +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Nov 15 18:31:29 2009 -0500 + + Makefile.am: INSTALL file is missing or incorrect #24206 + + The standard GNU file on building/installing tarball is copied + using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS + Add INSTALL target + +commit 406346c1a261127fae382a96010e7fb654115188 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Nov 15 18:11:36 2009 -0500 + + configure.ac: 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 2b0811c46f7aa76cdc14eb3516f3120e31cdaf73 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Nov 15 13:55:25 2009 -0500 + + configure.ac: AM_MAINTAINER_MODE missing #24238 + + This turns off maintainer mode build rules in tarballs. + Works in conjunction with autogen.sh --enable-maintainer-mode + +commit adb6c60a2f6705310d586fc4dfec97e41624915a +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sat Nov 14 18:26:47 2009 -0500 + + .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 11843ce15572214833063a26ac87a2fa6ab74bca Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Tue Aug 25 16:13:15 2009 +1000 diff --git a/debian/changelog b/debian/changelog index f347129..04c230b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -x11proto-resource (1.1.0-2) UNRELEASED; urgency=low +x11proto-resource (1.1.1-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders - -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:47:48 +0000 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <k...@debian.org> Fri, 14 Jan 2011 03:53:42 +0100 x11proto-resource (1.1.0-1) unstable; urgency=low commit 2cbf7d2ba3da72c2454d707e0109732c46a0c9d9 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Dec 8 22:19:47 2010 -0800 resourceproto 1.1.1 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index b4e378d..faecc62 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([ResourceProto],[1.1.0], +AC_INIT([ResourceProto],[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AC_CONFIG_SRCDIR([Makefile.am]) commit 3389416e4c58b7e7ccad8d2bccb65f3e291ef43b Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Dec 8 22:17:49 2010 -0800 config: replace deprecated AC_OUTPUT file list with AC_CONFIG_FILES Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Add missing AC_CONFIG_SRCDIR Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index 550a90d..b4e378d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,13 @@ +dnl +dnl Process this file with autoconf to create configure. + +# Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([ResourceProto],[1.1.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_CONFIG_SRCDIR([Makefile.am]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -9,5 +17,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS -AC_OUTPUT([Makefile - resourceproto.pc]) +AC_CONFIG_FILES([Makefile + resourceproto.pc]) +AC_OUTPUT commit 0545a1f26d56ab329b69be76a27e2d4d9b0f88df Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Mar 28 19:25:52 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 32fcf85..550a90d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit b5bb2e1707490805ea022f5110f229e5fbdc09e0 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Mar 28 19:00:31 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/Makefile.am b/Makefile.am index 40f6a03..3ed1758 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ resource_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = resourceproto.pc -EXTRA_DIST = resourceproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL commit 06fc8dd07770bb8b10323581419c2e53e9a3f3ef Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Nov 22 19:24:48 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 b365bff..40f6a03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ pkgconfig_DATA = resourceproto.pc EXTRA_DIST = resourceproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: commit 8c0d56bd432819c6ee23af52d93c3cd0d3331f00 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Nov 16 11:13:30 2009 -0500 README: file created or updated #24206 Contains a set of URLs to freedesktop.org. diff --git a/README b/README new file mode 100644 index 0000000..e4c5d5d --- /dev/null +++ b/README @@ -0,0 +1,30 @@ + X Resource Extension + +This extension defines a protocol that allows a client to query the X server +about its usage of various resources. + +Extension : X-Resource + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/resourceproto + + http://cgit.freedesktop.org/xorg/proto/resourceproto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + commit f98b754b0f5fea6162f4f5a0679dd35829440ce4 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Nov 15 19:45:27 2009 -0500 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 42a8c32..b365bff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,6 @@ pkgconfig_DATA = resourceproto.pc EXTRA_DIST = resourceproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: commit 8184f9a6280de23d1cc140dd2ac9bc78625e434a Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Nov 15 18:31:29 2009 -0500 Makefile.am: INSTALL file is missing or incorrect #24206 The standard GNU file on building/installing tarball is copied using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS Add INSTALL target diff --git a/Makefile.am b/Makefile.am index 1a96794..42a8c32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,9 +10,12 @@ EXTRA_DIST = resourceproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL commit 406346c1a261127fae382a96010e7fb654115188 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Nov 15 18:11:36 2009 -0500 configure.ac: 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 009c333..32fcf85 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?pr AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) -XORG_RELEASE_VERSION -XORG_CHANGELOG +# Require xorg-macros: XORG_DEFAULT_OPTIONS +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 AC_OUTPUT([Makefile resourceproto.pc]) commit 2b0811c46f7aa76cdc14eb3516f3120e31cdaf73 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Nov 15 13:55:25 2009 -0500 configure.ac: AM_MAINTAINER_MODE missing #24238 This turns off maintainer mode build rules in tarballs. Works in conjunction with autogen.sh --enable-maintainer-mode diff --git a/configure.ac b/configure.ac index ea4b061..009c333 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([ResourceProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE # Require xorg-macros: XORG_CHANGELOG m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) commit adb6c60a2f6705310d586fc4dfec97e41624915a Author: Gaetan Nadon <mems...@videotron.ca> Date: Sat Nov 14 18:26:47 2009 -0500 .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 92eae22..adb2610 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,78 @@ -Makefile -Makefile.in +# +# 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 +mdate-sh missing -resourceproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -resourceproto-*.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 resourceproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pdzra-0001rt...@alioth.debian.org