twm: Changes to 'upstream-unstable'
.cvsignore | 17 -------------
.gitignore | 18 +++++++++++++
ChangeLog | 73 --------------------------------------------------------
Makefile.am | 10 +++++++
configure.ac | 5 +--
man/.cvsignore | 3 --
man/.gitignore | 3 ++
src/.cvsignore | 8 ------
src/.gitignore | 8 ++++++
src/Makefile.am | 4 +--
src/twm.h | 2 -
11 files changed, 44 insertions(+), 107 deletions(-)
New commits:
commit 1fa03c39bddace4d787c55703f3081bcaf36511b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 6 16:52:54 2008 -0500
twm 1.0.4
diff --git a/configure.ac b/configure.ac
index 455182d..7a514d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(twm,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],twm)
+AC_INIT(twm,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],twm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit d28dffd63bd5070445b15d1b9b70f3303ec5e333
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 21 08:16:39 2008 -0800
Change twm_CFLAGS to AM_CFLAGS to make automake-1.10 happier
src/Makefile.am:35: compiling `add_window.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
diff --git a/src/Makefile.am b/src/Makefile.am
index a5fe637..dc0fe72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,8 @@ bin_PROGRAMS = twm
rcdir = ${datadir}/X11/twm
dist_rc_DATA = system.twmrc
-twm_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
-twm_CFLAGS += -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
+AM_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.Org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
+AM_CFLAGS += -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
twm_LDADD = $(TWM_LIBS)
commit ca9494bf50c9314597f4e88efa5bf5d66c1cd38f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 21 08:14:01 2008 -0800
Explicitly require libSM & libICE since twm calls them directly
diff --git a/configure.ac b/configure.ac
index c7be74d..455182d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
# Checks for pkg-config packages
-PKG_CHECK_MODULES(TWM, x11 xext xt xmu)
+PKG_CHECK_MODULES(TWM, x11 xext xt xmu ice sm)
AC_SUBST(TWM_CFLAGS)
AC_SUBST(TWM_LIBS)
commit f0543e7ff17f6e8aefbd6cc003d0679a706a8535
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:37:07 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 5475530..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-2006-06-03 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * src/session.c (ReadWinConfigEntry):
- Coverity #369: If malloc of entry->wm_command fails, error cleanup
- was still trying to read pointers from it to free.
-
-2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * src/menus.c (ExecuteFunction):
- Coverity #1508: Variable "action" not freed or pointed-to
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update dependencies to work with separate build roots.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-16 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * src/Makefile.am:
- Capitalize O in "X.Org Foundation"
-
- * configure.ac:
- * man/Makefile.am:
- Use cpp to substitute variables in man pages
-
-2005-10-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * src/Makefile.am: Have generated files be cleaned by maintainer
- to pass check-tarball test.
-
-2005-10-09 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * src/Makefile.am (deftwmrc.c):
- * src/deftwmrc.c:
- * src/parse.c:
- * src/parse.h:
- Bug #3755 <https://bugs.freedesktop.org/show_bug.cgi?id=3755>
- twm can't handle 8-bit characters in .twmrc (Tomohiro KUBOITA)
-
-2005-08-02 Keith Packard <keithp@keithp.com>
-
- * src/Makefile.am:
-2005-08-02 Keith Packard <keithp@keithp.com>
-
- * Makefile.am:
- Mark generated files as BUILT_SOURCES and CLEANFILES
- to ensure they are regenerated after 'make clean' and
- to make parallel builds work right.
diff --git a/Makefile.am b/Makefile.am
index d1b0a22..9d53635 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,13 @@
SUBDIRS = src man
EXTRA_DIST = sample-twmrc/jim.twmrc sample-twmrc/keith.twmrc sample-twmrc/lemke.twmrc
+
+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 44d51a2bc7d1e2fc5fcd3f729b6f0ca6e62e1f00
Author: Wolfgang Rupprecht <wsr+xorg@wsrcc.com>
Date: Mon Jan 23 15:11:00 2006 -0800
X.Org Bug #5691: twm mouse button limit too low
<https://bugs.freedesktop.org/show_bug.cgi?id=5691>
diff --git a/src/twm.h b/src/twm.h
index a697d82..1998af1 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -99,7 +99,7 @@ typedef SIGNAL_T (*SigProc)(int); /* type of function returned by signal() */
#define NULLSTR ((char *) NULL)
-#define MAX_BUTTONS 5 /* max mouse buttons supported */
+#define MAX_BUTTONS 16 /* max mouse buttons supported */
/* info stings defines */
#define INFO_LINES 30
commit 03a4e6c35161402d1477acb95723ab93eabde97e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:51:13 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 0527265..b961a68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ depcomp
install-sh
missing
stamp-h1
+*~
commit 9ae787c9f0d02aeb4c67fd20cee08d3cccd99fb4
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:24:38 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 0527265..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.deps
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0527265
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+.deps
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 716d45a..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-twm.1
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..716d45a
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+twm.1
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 60ba2e8..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-Makefile
-Makefile.in
-deftwmrc.c
-gram.c
-gram.h
-lex.c
-twm
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..60ba2e8
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,8 @@
+.deps
+Makefile
+Makefile.in
+deftwmrc.c
+gram.c
+gram.h
+lex.c
+twm
Reply to: