xbitmaps: Changes to 'upstream-unstable'
.gitignore | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
Makefile.am | 16 +++++-------
configure.ac | 16 ++++++++----
3 files changed, 87 insertions(+), 22 deletions(-)
New commits:
commit df1dfeaee913f6ce1f82189b90493c14cb011564
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 8 22:25:45 2010 -0800
xbitmaps 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 57f16a1..a5db801 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xbitmaps], [1.1.0],
+AC_INIT([xbitmaps], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbitmaps])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit ba8d08a029c82aeb60b8c24fad76de8be288022b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 10 20:12:11 2010 -0800
Install xbitmaps.pc to $(datadir)/pkgconfig instead of $(libdir)
The xbitmaps package consists entirely of X bitmap data files, which
are platform-independent text files containing a C language format
representation of the encoded bitmap image, which are installed to
$(includedir)/X11/bitmaps so that programs can #include them into
their sources at build time.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 9a89bbe..060112d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = xbitmaps.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 5c89f362c67dadd858f3001d5cc79a8cb86e4a3d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 10 20:09:29 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM sttaements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 6eb3019..57f16a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,16 @@
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT(xbitmaps, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
+AC_INIT([xbitmaps], [1.1.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xbitmaps])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
-
# 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])])
commit a908a28058b299390b250db7fccca078fa1f4065
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 13:24:09 2010 -0400
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d0256e4..6eb3019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(xbitmaps, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 48e794ca241e9fe29644a1790115b80733a59669
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 11:37:20 2010 -0400
config: do not clean xbitmaps.pc
This file is part of the configuration and is removed
by running "make distclean"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 9609764..9a89bbe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xbitmaps.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = xbitmaps.pc
bitmapdir = $(includedir)/X11/bitmaps
commit be7a40a5fd45c2ad6c3ed1ab87537431613691a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 11:35:30 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index bf91113..9609764 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xbitmaps.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xbitmaps.pc.in
CLEANFILES = xbitmaps.pc
bitmapdir = $(includedir)/X11/bitmaps
commit 2b5713c691be826ff79617c5e5dfa30614d3cb94
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 29 19:33:52 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 7848f9e..bf91113 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,8 @@
-AUTOMAKE_OPTIONS = foreign
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xbitmaps.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xbitmaps.pc.in
+EXTRA_DIST = xbitmaps.pc.in
CLEANFILES = xbitmaps.pc
bitmapdir = $(includedir)/X11/bitmaps
commit c9b67f5c37d78cfaf81a0c7a76de1bd913cbc8f2
Author: Gaetan Nadon <memsize@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 34895d8..7848f9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xbitmaps.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xbitmaps.pc.in
CLEANFILES = xbitmaps.pc
@@ -82,9 +83,12 @@ dist_bitmap_DATA = \
xsnow
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit 2b573f8ba774b474639c2ec1be563fb0bf0de6af
Author: Gaetan Nadon <memsize@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 bfd436d..34895d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,8 +81,6 @@ dist_bitmap_DATA = \
xlogo64 \
xsnow
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
commit 4276fdbb9d614f1d29e8c62f8c24c709537947a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:16 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 160e62d..e99968f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,78 @@
-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-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
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-xbitmaps-*.tar.*
-xbitmaps.pc
-ChangeLog
-tags
+*.[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 bitmaps
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit c0527c7664ee7ff6a1eeb14aa5d4715fab86f51a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:22 2009 -0700
This is not a GNU project, so declare it foreign.
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
> > was quite annoying to work around since 'autoreconf -fvi' replaces
> > it and git wants to commit it. Should these files even be in git?
> > Can I nuke them for the betterment of humanity and since they get
> > created by autoreconf anyways?
>
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
of the INSTALL file. It is also part of the 24206 solution.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index 2385477..d0256e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
AC_INIT(xbitmaps, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xbitmaps)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Reply to: