.gitignore | 4 ++++
ChangeLog | 4 ----
FS.h | 3 ---
FSproto.h | 2 --
Makefile.am | 12 +++++++++++-
configure.ac | 6 +++++-
font.h | 3 ---
fontproto.h | 2 --
fontstruct.h | 2 --
fsmasks.h | 1 -
10 files changed, 20 insertions(+), 19 deletions(-)
New commits:
commit 8ce8e2e50381e8cc7f21af58e6481175d1689ea6
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Aug 27 16:21:09 2009 +1000
fontsproto 2.1.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 7331e57..0582309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([FontsProto], [2.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FontsProto], [2.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_CHANGELOG
commit c2c7f7c5b7bc45a2ff99fe252892b803c3d222fd
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Thu Aug 27 16:16:36 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/FS.h b/FS.h
index e907522..605b5a8 100644
--- a/FS.h
+++ b/FS.h
@@ -1,5 +1,3 @@
-/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
@@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or
other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */
#ifndef _FS_H_
#define _FS_H_
diff --git a/FSproto.h b/FSproto.h
index 03b2808..028156f 100644
--- a/FSproto.h
+++ b/FSproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
/*
Copyright 1990, 1991, 1998 The Open Group
@@ -43,7 +42,6 @@ in this Software without prior written authorization from The
Open Group.
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
* THIS SOFTWARE.
*/
-/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */
#ifndef _FS_PROTO_H_
#define _FS_PROTO_H_
diff --git a/font.h b/font.h
index e6a00cd..b71046b 100644
--- a/font.h
+++ b/font.h
@@ -1,4 +1,3 @@
-/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,8 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
-/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
#ifndef FONT_H
#define FONT_H
diff --git a/fontproto.h b/fontproto.h
index 83c9a00..1ab8f37 100644
--- a/fontproto.h
+++ b/fontproto.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp
$ */
-
/***********************************************************
Copyright (c) 1999 The XFree86 Project Inc.
diff --git a/fontstruct.h b/fontstruct.h
index 451ed6a..97e771a 100644
--- a/fontstruct.h
+++ b/fontstruct.h
@@ -1,4 +1,3 @@
-/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -21,7 +20,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp
$ */
#ifndef FONTSTR_H
#define FONTSTR_H
diff --git a/fsmasks.h b/fsmasks.h
index 434ee97..c86be83 100644
--- a/fsmasks.h
+++ b/fsmasks.h
@@ -1,4 +1,3 @@
-/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */
/*
* Copyright 1990, 1991 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
commit 72c22dd717afe4c7e796eae634e8c4ec175af677
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
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 ad3dbed..3dcb835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
fontsproto.pc
*~
+fontsproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index c548897..99cf37c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ fonts_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontsproto.pc
-EXTRA_DIST = autogen.sh fontsproto.pc.in
+EXTRA_DIST = fontsproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -18,6 +18,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 a17a47b..7331e57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([FontsProto], [2.0.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
fontsproto.pc])
commit 451d42b3e5a32b91e874a32d0874485899e3b350
Author: James Cloos <cl...@jhcloos.com>
Date: Thu Dec 6 16:39:01 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 c207a03..c548897 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,3 +11,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fontsproto.pc
EXTRA_DIST = autogen.sh fontsproto.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 863651c2af7b32bba7eedf5d43fdbd97998bd580
Author: James Cloos <cl...@jhcloos.com>
Date: Mon Sep 3 05:54:04 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index ac88f68..ad3dbed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
fontsproto.pc
+*~
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
