.gitignore | 79 ++++++++++++++++++++++++++++++++++++++++++++------
Makefile.am | 12 ++++---
configure.ac | 20 ++++++------
handhelds/.gitignore | 4 ++
redglass/.gitignore | 6 +++
whiteglass/.gitignore | 6 +++
6 files changed, 104 insertions(+), 23 deletions(-)
New commits:
commit 287d4bac2826de32365afcb2cbe0ec24abd2eecd
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Oct 30 08:57:22 2010 -0700
xcursor-themes 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index a9db450..e7b937d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_PREREQ([2.60])
-AC_INIT(xcursor-themes, [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes)
+AC_INIT([xcursor-themes], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xcursor-themes])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit fd7401bab073b95c2e8d4d45569f03afffda8ee2
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sat Oct 30 08:54:40 2010 -0700
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 <mems...@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index afefa16..a9db450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(xcursor-themes, [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 2c8a072222d0cbb7ccf63470af76738b33f1b11f
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Fri Jan 1 13:33:12 2010 -0500
configure: use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 797cc5e..afefa16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ fi
AC_SUBST([XCURSORGEN])
PKG_CHECK_MODULES(ICONDEFS, xcursor)
-pkg_cursordir=`pkg-config --variable=icondir xcursor`
+pkg_cursordir=`$PKG_CONFIG --variable=icondir xcursor`
AC_ARG_WITH(cursordir,
AC_HELP_STRING([--with-cursordir=<pathname>],
[specify directory for cursor files (default is autodetected)]),
commit 1eabbd976f21f5922e4a2c125c6ed51ebf936763
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sat Dec 19 17:35:07 2009 -0500
configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 5967392..797cc5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ fi
AC_SUBST([XCURSORGEN])
PKG_CHECK_MODULES(ICONDEFS, xcursor)
-pkg_cursordir=$(pkg-config --variable=icondir xcursor)
+pkg_cursordir=`pkg-config --variable=icondir xcursor`
AC_ARG_WITH(cursordir,
AC_HELP_STRING([--with-cursordir=<pathname>],
[specify directory for cursor files (default is autodetected)]),
commit c43cf46600ae8c93b85d4e3c956864691e55395e
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Nov 29 19:31:54 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 2643130..61a7bc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,8 @@ DISTCHECK_CONFIGURE_FLAGS = --with-cursordir=\$${datadir}/icons
SUBDIRS = handhelds redglass whiteglass
-EXTRA_DIST = genmakefile.sh
-
-dist-hook: ChangeLog INSTALL
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = genmakefile.sh
.PHONY: ChangeLog INSTALL
@@ -13,3 +12,5 @@ INSTALL:
ChangeLog:
$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
commit 3cc6cb2fe3142b22931e411e3df5d495f3f57ff5
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Nov 29 19:29:06 2009 -0500
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 26ab815..2643130 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,6 @@ SUBDIRS = handhelds redglass whiteglass
EXTRA_DIST = genmakefile.sh
-AUTOMAKE_OPTIONS = foreign
-
dist-hook: ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
commit b6cb39282a530930672da3c58132a8cabe54a05b
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index 0143f5d..26ab815 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,9 +6,12 @@ EXTRA_DIST = genmakefile.sh
AUTOMAKE_OPTIONS = foreign
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
diff --git a/configure.ac b/configure.ac
index 9af574e..5967392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
AC_INIT(xcursor-themes, [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit 9c250e804fbf7042acc1ab972d93f7f9cf2a128c
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Oct 27 15:07:25 2009 -0400
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 1c5e382..9af574e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,11 @@ AC_INIT(xcursor-themes, [1.0.2],
[https://bugs.freedesktop.org/enter_bug.cgi?pro
AM_INIT_AUTOMAKE([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)
+# Require xorg-macros: 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
AC_PROG_INSTALL
@@ -27,8 +29,6 @@ AM_CONDITIONAL(WHITEGLASS, true)
AM_CONDITIONAL(REDGLASS, true)
AM_CONDITIONAL(HANDHELDS, true)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([
Makefile
commit 3ece73c962880db4913100211cb9bbe4c02a6b6f
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Oct 26 22:08:40 2009 -0400
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 7ef35b1..0143f5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ DISTCHECK_CONFIGURE_FLAGS = --with-cursordir=\$${datadir}/icons
SUBDIRS = handhelds redglass whiteglass
-EXTRA_DIST = genmakefile.sh ChangeLog
+EXTRA_DIST = genmakefile.sh
AUTOMAKE_OPTIONS = foreign
commit 52f78d845879524d66e733e75ef27fec7898bc6e
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Thu Oct 22 12:44:09 2009 -0400
.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 15586ec..1fc0949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,78 @@
-*~
-ChangeLog
-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.cursor
+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
-stamp-h1
-tags
-xcursor-themes-*.tar.*
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
+*~
+*.[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 cursors
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
diff --git a/handhelds/.gitignore b/handhelds/.gitignore
new file mode 100644
index 0000000..13f5409
--- /dev/null
+++ b/handhelds/.gitignore
@@ -0,0 +1,4 @@
+# Add & Override for this directory and it's subdirectories
+*
+!.gitignore
+!*.cfg
diff --git a/redglass/.gitignore b/redglass/.gitignore
new file mode 100644
index 0000000..c775095
--- /dev/null
+++ b/redglass/.gitignore
@@ -0,0 +1,6 @@
+# Add & Override for this directory and it's subdirectories
+*
+!.gitignore
+!*.cfg
+!*.xcf
+!*.png
diff --git a/whiteglass/.gitignore b/whiteglass/.gitignore
new file mode 100644
index 0000000..c775095
--- /dev/null
+++ b/whiteglass/.gitignore
@@ -0,0 +1,6 @@
+# Add & Override for this directory and it's subdirectories
+*
+!.gitignore
+!*.cfg
+!*.xcf
+!*.png
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjsjb-00023t...@alioth.debian.org
