.gitignore | 4 ++++ ChangeLog | 4 ---- Makefile.am | 12 +++++++++++- Xv.h | 1 - XvMC.h | 2 -- XvMCproto.h | 2 -- Xvproto.h | 1 - configure.ac | 6 +++++- 8 files changed, 20 insertions(+), 12 deletions(-)
New commits: commit 20dc47bfb9e6627e8335c870a808fdab72e82061 Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 11:59:40 2009 +1000 videoproto 2.3.0 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index a1d146f..e0ab234 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([VideoProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([VideoProto], [2.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG commit ed07cce6a0d54bf7ace0e672fe769a34fdac837a Author: Peter Hutterer <[email protected]> Date: Thu Aug 27 11:55:47 2009 +1000 Remove RCS tags Signed-off-by: Peter Hutterer <[email protected]> diff --git a/Xv.h b/Xv.h index 4e85fa7..985653c 100644 --- a/Xv.h +++ b/Xv.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xv.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */ #ifndef XV_H #define XV_H diff --git a/XvMC.h b/XvMC.h index 3e621f0..2690be8 100644 --- a/XvMC.h +++ b/XvMC.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/include/extensions/XvMC.h,v 1.7 2001/11/14 21:54:37 mvojkovi Exp $ */ - #ifndef _XVMC_H_ #define _XVMC_H_ diff --git a/XvMCproto.h b/XvMCproto.h index cce3bb0..8e80f17 100644 --- a/XvMCproto.h +++ b/XvMCproto.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/include/extensions/XvMCproto.h,v 1.4 2001/04/10 00:28:24 mvojkovi Exp $ */ - #ifndef _XVMCPROTO_H_ #define _XVMCPROTO_H_ diff --git a/Xvproto.h b/Xvproto.h index 9112f51..b6b56cf 100644 --- a/Xvproto.h +++ b/Xvproto.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */ #ifndef XVPROTO_H #define XVPROTO_H commit cca2a3f1230bf21a1b4e4c255406b852c5c030c3 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh diff --git a/.gitignore b/.gitignore index 8be1201..7c0b689 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ install-sh missing videoproto.pc *~ +videoproto-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index f463c81..65630ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ video_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = videoproto.pc -EXTRA_DIST = autogen.sh videoproto.pc.in +EXTRA_DIST = videoproto.pc.in EXTRA_DIST += ChangeLog MAINTAINERCLEANFILES = ChangeLog @@ -17,6 +17,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 044b5f0..a1d146f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,11 @@ AC_PREREQ([2.57]) AC_INIT([VideoProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +# 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 AC_OUTPUT([Makefile videoproto.pc]) commit 430e61ec31c975963a3495c81c360837584b0ef0 Author: James Cloos <[email protected]> Date: Thu Dec 6 16:39:08 2007 -0500 Replace static ChangeLog with dist-hook to generate from git log diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c722b51..0000000 --- a/ChangeLog +++ /dev/null @@ -1,4 +0,0 @@ -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. diff --git a/Makefile.am b/Makefile.am index 61c73c6..f463c81 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,3 +10,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = videoproto.pc EXTRA_DIST = autogen.sh videoproto.pc.in + +EXTRA_DIST += ChangeLog +MAINTAINERCLEANFILES = ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog commit 35cde03805a6e6c4665a42e5c1657a88624710e6 Author: James Cloos <[email protected]> Date: Mon Sep 3 05:54:21 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings diff --git a/.gitignore b/.gitignore index 618f556..8be1201 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ configure install-sh missing videoproto.pc +*~ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
