libfs: Changes to 'upstream-unstable'
.gitignore | 72 +++++++++++++++++++++++++++++++++++++++++++++++++----------
INSTALL | 8 ------
Makefile.am | 12 +++++----
configure.ac | 24 ++++++++-----------
4 files changed, 77 insertions(+), 39 deletions(-)
New commits:
commit 4218339a30a899ceb82a9a057c6b96bce624f917
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 26 18:47:31 2010 -0700
libFS 1.0.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index ddc7bbd..a9afd7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,8 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
+AC_INIT([libFS], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libFS])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f6aacdb5143032a9e21b8bb09212fcf69c839a85
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 26 18:45:48 2010 -0700
Remove unnecessary calls from configure.ac
AM_PROG_CC is already covered by XORG_DEFAULT_OPTIONS
AC_SUBST of CFLAGS & LIBS is taken care of by PKG_CHECK_MODULES
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index ad0b33c..ddc7bbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,19 +35,15 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(FS, xproto fontsproto)
-AC_SUBST(FS_CFLAGS)
-AC_SUBST(FS_LIBS)
+
#
# Split out so we don't include xtrans C flags in fs.pc
#
PKG_CHECK_MODULES(XTRANS, xtrans)
-AC_SUBST(XTRANS_CFLAGS)
-AC_SUBST(XTRANS_LIBS)
XTRANS_CONNECTION_FLAGS
commit c7c7dda28b61d9b008a2fab3baf8ed02662a6dbf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:33 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 b33774b..ad0b33c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit dbe6f1912d77cd42ca0ac7ac5296113f84fc690e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 15:09:34 2010 -0400
config: install in $docdir and distribute doc/FSlib.txt
The dist_doc_DATA statement was designed for that purpose.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 44ae65d..6d5fc63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,9 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libfs.pc
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = doc/FSlib.txt
+dist_doc_DATA = doc/FSlib.txt
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
commit 315643e773d666d1cc2248fe7ba1bc979ec34c70
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 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 758ade2..44ae65d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libfs.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = libfs.pc.in doc/FSlib.txt
+EXTRA_DIST = doc/FSlib.txt
.PHONY: ChangeLog INSTALL
commit a391fd191e207b4408ce230505df25570cf041d4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:03 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 c984d85..758ade2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libfs.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = libfs.pc.in doc/FSlib.txt
commit 15104bf1988d27e7dc4272d32dbd381455c0e9f7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 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/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 8bc1e0b..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-FSlib is built with the traditional configure script:
-
- $ ./configure --prefix=/usr/X11R6
-
-This should generate valid Makefiles, then:
-
- $ make
- $ make install
diff --git a/Makefile.am b/Makefile.am
index e56d925..c984d85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,12 +27,15 @@ pkgconfig_DATA = libfs.pc
EXTRA_DIST = libfs.pc.in doc/FSlib.txt
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
if LINT
lint:
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
commit 491adff64c38f940ca21f6be9e370ebe90f72c3e
Author: Gaetan Nadon <memsize@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 93ddc39..b33774b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,16 @@ AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(FS, xproto fontsproto)
@@ -56,8 +57,6 @@ dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([FS])
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
commit 1b6896d93de00ad79c28c537edead58309df0d31
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:41 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 63f75c6..e56d925 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,6 @@ pkgconfig_DATA = libfs.pc
EXTRA_DIST = libfs.pc.in doc/FSlib.txt
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
commit 40addd2ce521edadc6e6373b80c3c8c4f73c11c1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:18 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 5389755..c6fd754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,78 @@
-.deps
-.libs
+#
+# 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
-libfs.pc
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
Makefile
Makefile.in
-MakeOut
+mdate-sh
missing
mkinstalldirs
-stamp-h1
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-*.lo
-*.la
-libFS-*.tar.*
-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 libFS
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit be177a3bad2b3158c09ebfc0356e0944ca704732
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 21 12:47:23 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 9273352..93ddc39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(libFS, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libFS)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
Reply to: