.gitignore | 13 +++++++++++++
ChangeLog | 29 -----------------------------
Makefile.am | 10 ++++++++++
configure.ac | 10 +++++++---
defs.ent | 46 +++++++++++++---------------------------------
5 files changed, 43 insertions(+), 65 deletions(-)
New commits:
commit 6e6499a8a5dbed6c735be281b26ac085f93f91ec
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Oct 22 17:41:05 2009 -0700
xorg-sgml-doctools 1.3
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index 40267cb..9f290a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xorg-sgml-doctools,[1.2.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools)
+AC_INIT(xorg-sgml-doctools,[1.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 5aab704e9eabee9472d761e06141ff37b13536c1
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Oct 22 17:39:59 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index ef20518..40267cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,13 @@ AC_INIT(xorg-sgml-doctools,[1.2.99.901],
[https://bugs.freedesktop.org/enter_bug
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_RELEASE_VERSION, 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)
-AC_PROG_INSTALL
+# Require xorg-macros 1.3 or later: 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
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+AC_PROG_INSTALL
AC_OUTPUT([
Makefile
commit 16f635fe5c3f1928df19dd2a5f06eb3ce5a62cd6
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu Oct 22 17:39:00 2009 -0700
Set defs.ent values for 7.5 final release
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/defs.ent b/defs.ent
index 19e481c..aa1c096 100644
--- a/defs.ent
+++ b/defs.ent
@@ -4,7 +4,7 @@
<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
are now the same as *fullrelvers -->
<!ENTITY majorvers CDATA "7">
-<!ENTITY reldate CDATA "September 2009">
+<!ENTITY reldate CDATA "October 2009">
<!ENTITY relvers CDATA "7.5">
<!ENTITY fullrelvers CDATA "7.5">
<!ENTITY prevrelvers CDATA "7.4">
@@ -14,15 +14,15 @@
<!ENTITY nextfullreldate CDATA "2010">
<!ENTITY whichfullrel CDATA "sixth">
-<!ENTITY rcnum CDATA "1">
+<!ENTITY rcnum CDATA "0">
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
<!ENTITY % latersnap 'IGNORE'>
-<!ENTITY % snapshot 'INCLUDE'>
-<!ENTITY % notsnapshot 'IGNORE'>
-<!ENTITY % relcandidate 'INCLUDE'>
-<!ENTITY % release 'IGNORE'>
+<!ENTITY % snapshot 'IGNORE'>
+<!ENTITY % notsnapshot 'INCLUDE'>
+<!ENTITY % relcandidate 'IGNORE'>
+<!ENTITY % release 'INCLUDE'>
<!ENTITY % firstrel 'IGNORE'>
<!ENTITY % earlyrel 'IGNORE'>
<!ENTITY % laterrel 'INCLUDE'>
commit d9394f92e35b74a5ff7a806d82fd3c4ebd3476c3
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Sep 18 17:25:29 2009 -0700
1.2.99.901 (1.3 RC 1) snapshot for X11R7.5 RC1 docs
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index a9c4406..ef20518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,11 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xorg-sgml-doctools,[1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools)
+AC_INIT(xorg-sgml-doctools,[1.2.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+# Require xorg-macros: XORG_RELEASE_VERSION, 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)
AC_PROG_INSTALL
diff --git a/defs.ent b/defs.ent
index 2663031..19e481c 100644
--- a/defs.ent
+++ b/defs.ent
@@ -14,15 +14,15 @@
<!ENTITY nextfullreldate CDATA "2010">
<!ENTITY whichfullrel CDATA "sixth">
-<!ENTITY rcnum CDATA "0">
+<!ENTITY rcnum CDATA "1">
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
<!ENTITY % latersnap 'IGNORE'>
-<!ENTITY % snapshot 'IGNORE'>
-<!ENTITY % notsnapshot 'INCLUDE'>
-<!ENTITY % relcandidate 'IGNORE'>
-<!ENTITY % release 'INCLUDE'>
+<!ENTITY % snapshot 'INCLUDE'>
+<!ENTITY % notsnapshot 'IGNORE'>
+<!ENTITY % relcandidate 'INCLUDE'>
+<!ENTITY % release 'IGNORE'>
<!ENTITY % firstrel 'IGNORE'>
<!ENTITY % earlyrel 'IGNORE'>
<!ENTITY % laterrel 'INCLUDE'>
commit bced00cd0359cdbff718e074902572cfb5a4d182
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Wed Sep 16 15:42:10 2009 -0700
Update version info for X11R7.5 release
Also drop ancient unused bits left over from XFree86 docs
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/defs.ent b/defs.ent
index d59a31f..2663031 100644
--- a/defs.ent
+++ b/defs.ent
@@ -1,41 +1,21 @@
-<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.38
2004/02/17 22:32:31 dawes Exp $ -->
-
<!-- shared entity definitions for the Xorg documentation -->
-<!-- Xorg version string -->
+<!-- X Window System katamari version string -->
+<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
+ are now the same as *fullrelvers -->
<!ENTITY majorvers CDATA "7">
-<!ENTITY reldate CDATA "15 February 2007">
-<!ENTITY relvers CDATA "7.2">
-<!ENTITY prevrelvers CDATA "7.1">
-<!ENTITY fullrelvers CDATA "7.2.0">
-<!ENTITY prevfullrelvers CDATA "7.1.0">
-<!ENTITY nextrelvers CDATA "7.3">
-<!ENTITY nextfullrelvers CDATA "7.3.0">
-<!ENTITY nextfullreldate CDATA "mid 2007">
-<!ENTITY nextupdrelvers CDATA "7.2.1">
-
-<!ENTITY srcvers CDATA "440">
-<!ENTITY prevsrcvers CDATA "660">
-<!ENTITY fullsrcvers CDATA "440">
-<!ENTITY prevfullsrcvers CDATA "660">
-<!ENTITY whichfullrel CDATA "tenth">
-<!ENTITY whichupdaterel CDATA "none">
-<!ENTITY reltag CDATA "XORG-7_2">
-<!ENTITY relbranchtag CDATA "XORG-7_2-branch">
+<!ENTITY reldate CDATA "September 2009">
+<!ENTITY relvers CDATA "7.5">
+<!ENTITY fullrelvers CDATA "7.5">
+<!ENTITY prevrelvers CDATA "7.4">
+<!ENTITY prevfullrelvers CDATA "7.4">
+<!ENTITY nextrelvers CDATA "7.6">
+<!ENTITY nextfullrelvers CDATA "7.6">
+<!ENTITY nextfullreldate CDATA "2010">
+
+<!ENTITY whichfullrel CDATA "sixth">
<!ENTITY rcnum CDATA "0">
-<!-- Version of the most recent 3.3.x release -->
-<!ENTITY legacyvers CDATA "3.3.6">
-
-<!-- doctools version strings -->
-<!ENTITY doctoolsvers CDATA "1.3.2">
-
-<!-- utils version strings -->
-<!ENTITY utilsvers CDATA "1.1.2">
-
-<!-- xtest version strings -->
-<!ENTITY xtestvers CDATA "4.0.6">
-
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
<!ENTITY % latersnap 'IGNORE'>
commit 346743f346bf0eec479d2379c3782f548f3145a3
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Tue Jan 27 15:49:41 2009 -0200
Correct make distcheck and add new .gitignore file.
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9031468
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+*~
+ChangeLog
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+tags
+xorg-sgml-doctools-*.tar.*
diff --git a/Makefile.am b/Makefile.am
index 05be76b..5650b2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,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 426d4a4..a9c4406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,13 @@ AC_INIT(xorg-sgml-doctools,[1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?pr
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, 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)
AC_PROG_INSTALL
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
commit a89eba12b88853d7b52b65207da3211d0ace10a9
Author: James Cloos <cl...@jhcloos.com>
Date: Fri Dec 7 20:37:43 2007 -0500
Fix commit 0e17d30d7b8b4a33771cbffd97cbbb8b037d8a5e
Reported by benjamin.cl...@clearchain.com in bug #13556
diff --git a/Makefile.am b/Makefile.am
index a494d0a..05be76b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ sgmlentdir = $(prefix)/share/sgml/X11
dist_sgmlent_DATA = defs.ent
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
commit 0e17d30d7b8b4a33771cbffd97cbbb8b037d8a5e
Author: James Cloos <cl...@jhcloos.com>
Date: Thu Dec 6 16:37:37 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index bba706c..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,29 +0,0 @@
-2006-05-22 Adam Jackson <a...@freedesktop.org>
-
- * configure.ac:
- Bump to 1.1
-
-2006-05-22 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * defs.ent:
- Update package version for X11R7.1 release.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * defs.ent:
- Update defs.ent from monolith.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Add missing XORG_RELEASE_VERSION to configure.ac.
diff --git a/Makefile.am b/Makefile.am
index 1bdef7c..a494d0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,13 @@
sgmlentdir = $(prefix)/share/sgml/X11
dist_sgmlent_DATA = defs.ent
+
+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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
