.gitignore | 79 ++++++++++++++++++++++++++++++++++++---- ChangeLog | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 11 +++-- README | 29 ++++++++++++++ configure.ac | 17 ++++++-- debian/changelog | 10 ++++- debian/control | 5 +- 7 files changed, 238 insertions(+), 21 deletions(-)
New commits: commit 631a22071ab5b9dd5c89f983fef3ce57a8a8ef18 Author: Cyril Brulebois <[email protected]> Date: Fri Jan 14 17:12:53 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index cffcda0..3e35d4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-xf86vidmode (2.3.1-1) UNRELEASED; urgency=low +x11proto-xf86vidmode (2.3.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-xf86vidmode (2.3.1-1) UNRELEASED; urgency=low * Add myself to Uploaders. * Add pkg-config build-dep. - -- Cyril Brulebois <[email protected]> Fri, 14 Jan 2011 17:10:28 +0100 + -- Cyril Brulebois <[email protected]> Fri, 14 Jan 2011 17:12:50 +0100 x11proto-xf86vidmode (2.3-2) unstable; urgency=low commit d98277cd22ea2d2a2daa5d9f5f3fc95b473e27c5 Author: Cyril Brulebois <[email protected]> Date: Fri Jan 14 17:12:46 2011 +0100 Add pkg-config build-dep. diff --git a/debian/changelog b/debian/changelog index c4b61cc..cffcda0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x11proto-xf86vidmode (2.3.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. * Add myself to Uploaders. + * Add pkg-config build-dep. -- Cyril Brulebois <[email protected]> Fri, 14 Jan 2011 17:10:28 +0100 diff --git a/debian/control b/debian/control index 6f8e195..e855d99 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Uploaders: David Nusinow <[email protected]>, Andres Salomon <dilinger@debian. Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev (>= 1:7.5~1) + xutils-dev (>= 1:7.5~1), + pkg-config, Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xf86vidmode Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86vidmode.git commit d671d5127849489c046c9e0615dfe69ed4a28333 Author: Cyril Brulebois <[email protected]> Date: Fri Jan 14 17:11:02 2011 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 7bf0620..c4b61cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x11proto-xf86vidmode (2.3.1-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Fri, 14 Jan 2011 17:10:28 +0100 diff --git a/debian/control b/debian/control index d8b70a4..6f8e195 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-xf86vidmode Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]> +Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), automake, commit 4580009347644b07dd8874f8a4807052caec4141 Author: Cyril Brulebois <[email protected]> Date: Fri Jan 14 17:10:40 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index a9d0a6b..41e6971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,111 @@ +commit 4ffa46d9d10267f0156b803a941de05e1c0e47a6 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jan 5 20:05:42 2011 -0800 + + xf86vidmodeproto 2.3.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d95a95c5b862648c2c7da8011abe6f0abb6f2064 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jan 5 20:05:06 2011 -0800 + + config: Add missing AC_CONFIG_SRCDIR + + Regroup AC statements under the Autoconf initialization section. + Regroup AM statements under the Automake initialization section. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4b349a8c1512f660f5dc4fa94b65bab8c7c2f840 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit f3fe0f07a3071e11c23166a75fa8698f6cfeaa37 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 7745d7c722ec3b576abb541e7b2cf599e5c07f15 +Author: Gaetan Nadon <[email protected]> +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 d3171dac99636eff33e58c0152b6489925fc429f +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 16 11:13:30 2009 -0500 + + README: file created or updated #24206 + + Contains a set of URLs to freedesktop.org. + +commit 3f1d0e80b5fe5d7b252c4c16b2cb86070c9bb46e +Author: Gaetan Nadon <[email protected]> +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 4aacd1bf5ccdb37d062c4415672788686c56c91f +Author: Gaetan Nadon <[email protected]> +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 34a870ad95126eb8198e2fef59cbe729ed30cf5b +Author: Gaetan Nadon <[email protected]> +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 c499ad258eab12e6f9615dfc518bbbfa05bfbf67 +Author: Gaetan Nadon <[email protected]> +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 cbbf83b8d8a7fde9e5ea8879516ad02ab3e863c3 +Author: Gaetan Nadon <[email protected]> +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 fdbcfa8a73bf1e38c98d4d41e30ab2a06072be46 Author: Peter Hutterer <[email protected]> Date: Thu Oct 1 20:12:03 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 5669ea6..7bf0620 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -x11proto-xf86vidmode (2.3-3) UNRELEASED; urgency=low +x11proto-xf86vidmode (2.3.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 <[email protected]> Sat, 16 Jan 2010 16:47:46 +0000 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <[email protected]> Fri, 14 Jan 2011 17:10:28 +0100 x11proto-xf86vidmode (2.3-2) unstable; urgency=low commit 4ffa46d9d10267f0156b803a941de05e1c0e47a6 Author: Alan Coopersmith <[email protected]> Date: Wed Jan 5 20:05:42 2011 -0800 xf86vidmodeproto 2.3.1 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index a24c158..276a9cf 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86VidModeProto], [2.3.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AC_CONFIG_SRCDIR([Makefile.am]) # Initialize Automake commit d95a95c5b862648c2c7da8011abe6f0abb6f2064 Author: Alan Coopersmith <[email protected]> Date: Wed Jan 5 20:05:06 2011 -0800 config: Add missing AC_CONFIG_SRCDIR Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index f1c65e6..a24c158 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,12 @@ +dnl +dnl Process this file with autoconf to create configure. + +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([XF86VidModeProto], [2.3], [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 commit 4b349a8c1512f660f5dc4fa94b65bab8c7c2f840 Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 2ae853b..f1c65e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit f3fe0f07a3071e11c23166a75fa8698f6cfeaa37 Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/Makefile.am b/Makefile.am index 3467f60..3ef126a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,6 @@ xf86vidmode_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xf86vidmodeproto.pc -EXTRA_DIST = xf86vidmodeproto.pc.in MAINTAINERCLEANFILES = ChangeLog INSTALL commit 7745d7c722ec3b576abb541e7b2cf599e5c07f15 Author: Gaetan Nadon <[email protected]> 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 5cc0cec..3467f60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ pkgconfig_DATA = xf86vidmodeproto.pc EXTRA_DIST = xf86vidmodeproto.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL + .PHONY: ChangeLog INSTALL INSTALL: commit d3171dac99636eff33e58c0152b6489925fc429f Author: Gaetan Nadon <[email protected]> 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..fd53bef --- /dev/null +++ b/README @@ -0,0 +1,29 @@ + XFree86 Video Mode Extension + +This extension defines a protocol for dynamically configuring modelines and gamma. + +Extension name: XFree86-VidModeExtension + +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/xf86vidmodeproto + + http://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto + +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 3f1d0e80b5fe5d7b252c4c16b2cb86070c9bb46e Author: Gaetan Nadon <[email protected]> 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 714f20d..5cc0cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ pkgconfig_DATA = xf86vidmodeproto.pc EXTRA_DIST = xf86vidmodeproto.pc.in -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog INSTALL INSTALL: commit 4aacd1bf5ccdb37d062c4415672788686c56c91f Author: Gaetan Nadon <[email protected]> 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 292e753..714f20d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,9 +12,12 @@ EXTRA_DIST = xf86vidmodeproto.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 34a870ad95126eb8198e2fef59cbe729ed30cf5b Author: Gaetan Nadon <[email protected]> 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 ae5c127..2ae853b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,9 +4,9 @@ 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 AC_OUTPUT([Makefile commit c499ad258eab12e6f9615dfc518bbbfa05bfbf67 Author: Gaetan Nadon <[email protected]> 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 c401194..ae5c127 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.57]) AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) 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])]) commit cbbf83b8d8a7fde9e5ea8879516ad02ab3e863c3 Author: Gaetan Nadon <[email protected]> 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 9a983bf..1b8dced 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +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 -xf86vidmodeproto.pc +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -xf86vidmodeproto.pc*~ -xf86vidmodeproto-*.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 xf86vidmodeproto +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
