x11-xfs-utils: Changes to 'debian-unstable'
debian/changelog | 16
debian/control | 29
debian/rules | 4
fslsfonts/ChangeLog | 147 +
fslsfonts/INSTALL | 291 ++
fslsfonts/Makefile.am | 36
fslsfonts/Makefile.in | 322 +-
fslsfonts/README | 25
fslsfonts/aclocal.m4 | 1378 +++++++++---
fslsfonts/config.guess | 257 +-
fslsfonts/config.h.in | 33
fslsfonts/config.sub | 161 +
fslsfonts/configure | 5393 +++++++++++++++++++++++++++--------------------
fslsfonts/configure.ac | 23
fslsfonts/depcomp | 116 -
fslsfonts/fslsfonts.c | 24
fslsfonts/fslsfonts.man | 3
fslsfonts/install-sh | 231 +-
fslsfonts/missing | 49
fstobdf/ChangeLog | 136 +
fstobdf/INSTALL | 291 ++
fstobdf/Makefile.am | 36
fstobdf/Makefile.in | 322 +-
fstobdf/README | 28
fstobdf/aclocal.m4 | 1378 +++++++++---
fstobdf/chars.c | 3
fstobdf/config.guess | 257 +-
fstobdf/config.h.in | 33
fstobdf/config.sub | 161 +
fstobdf/configure | 5393 +++++++++++++++++++++++++++--------------------
fstobdf/configure.ac | 21
fstobdf/depcomp | 116 -
fstobdf/fstobdf.c | 2
fstobdf/fstobdf.h | 1
fstobdf/fstobdf.man | 2
fstobdf/header.c | 2
fstobdf/install-sh | 231 +-
fstobdf/missing | 49
fstobdf/props.c | 2
showfont/ChangeLog | 136 +
showfont/INSTALL | 291 ++
showfont/Makefile.am | 36
showfont/Makefile.in | 322 +-
showfont/README | 27
showfont/aclocal.m4 | 1412 +++++++++---
showfont/compile | 142 -
showfont/config.guess | 257 +-
showfont/config.h.in | 34
showfont/config.sub | 161 +
showfont/configure | 5471 +++++++++++++++++++++++++++---------------------
showfont/configure.ac | 22
showfont/depcomp | 116 -
showfont/install-sh | 231 +-
showfont/missing | 49
showfont/showfont.c | 28
showfont/showfont.man | 2
xfsinfo/ChangeLog | 147 +
xfsinfo/INSTALL | 291 ++
xfsinfo/Makefile.am | 36
xfsinfo/Makefile.in | 322 +-
xfsinfo/README | 29
xfsinfo/aclocal.m4 | 1412 +++++++++---
xfsinfo/compile | 142 -
xfsinfo/config.guess | 257 +-
xfsinfo/config.h.in | 34
xfsinfo/config.sub | 161 +
xfsinfo/configure | 5471 +++++++++++++++++++++++++++---------------------
xfsinfo/configure.ac | 24
xfsinfo/depcomp | 116 -
xfsinfo/install-sh | 231 +-
xfsinfo/missing | 49
xfsinfo/xfsinfo.c | 14
72 files changed, 21900 insertions(+), 12575 deletions(-)
New commits:
commit 912881207883c51c36f36c32c89fc3e31127d2ca
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:42:07 2011 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index cca0ddf..7f38094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
+x11-xfs-utils (7.6+1) unstable; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
@@ -15,7 +15,7 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.1.
* Run dh_makeshlibs before dh_installdeb/dh_shlibdeps (lintian).
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
+ -- Julien Cristau <jcristau@debian.org> Thu, 10 Feb 2011 17:42:00 +0100
x11-xfs-utils (7.4+1) unstable; urgency=low
commit 3ba568c84d2ea64caac5f7f9b2ba07f527c3061e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:41:50 2011 +0100
Run dh_makeshlibs before dh_installdeb/dh_shlibdeps (lintian).
diff --git a/debian/changelog b/debian/changelog
index 551e7f2..cca0ddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
work!
* Drop Pre-Depends on x11-common.
* Bump Standards-Version to 3.9.1.
+ * Run dh_makeshlibs before dh_installdeb/dh_shlibdeps (lintian).
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/rules b/debian/rules
index 70adc24..cf0af5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,9 +91,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
+ dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_makeshlibs
dh_gencontrol
dh_md5sums
dh_builddeb
commit 73a29aa5d6cf9f55bf819857b95ecc1c81b5fbc0
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:37:59 2011 +0100
Wrap control fields
diff --git a/debian/control b/debian/control
index eb8f884..54f73e7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,32 @@ Source: x11-xfs-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), libfs-dev (>= 2:1.0.0)
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ libx11-dev (>= 2:1.0.0),
+ libfs-dev (>= 2:1.0.0),
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xfs-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xfs-utils.git
Package: x11-xfs-utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: fslsfonts, fstobdf, showfont, xfsinfo
-Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
- fslsfonts, fstobdf, showfont, xfsinfo
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Conflicts:
+ fslsfonts,
+ fstobdf,
+ showfont,
+ xfsinfo,
+Replaces:
+ xbase-clients (<= 1:7.2.ds2-3),
+ xutils (<= 1:7.1.ds.3-1),
+ fslsfonts,
+ fstobdf,
+ showfont,
+ xfsinfo,
Description: X font server utilities
x11-xfs-utils provides a set of utility programs useful on a system that uses
an X font server.
commit 67d011ea90bcfb44aec8ad50013db8272f6ffb4a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:36:54 2011 +0100
Bump Standards-Version to 3.9.1.
diff --git a/debian/changelog b/debian/changelog
index dc1d956..551e7f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
* Drop Pre-Depends on x11-common.
+ * Bump Standards-Version to 3.9.1.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index 0577ab6..eb8f884 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), libfs-dev (>= 2:1.0.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xfs-utils
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xfs-utils.git
commit 260e25dde5dc2be15e7608f94e80d889610aa16f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:35:56 2011 +0100
Drop Pre-Depends on x11-common.
diff --git a/debian/changelog b/debian/changelog
index 3bccd9f..dc1d956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
- xfsinfo 1.0.3
* Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
work!
+ * Drop Pre-Depends on x11-common.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index ccbab00..0577ab6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xfs-utils.git
Package: x11-xfs-utils
Architecture: any
-Pre-Depends: x11-common (>= 1:7.0.0)
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: fslsfonts, fstobdf, showfont, xfsinfo
Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1),
commit dbfce04aff5a1d53770f1746be0d21683fdad738
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:35:34 2011 +0100
Remove Brice Goglin and David Nusinow from Uploaders.
Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index f4c8a5a..3bccd9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
- fstobdf 1.0.4
- showfont 1.0.3
- xfsinfo 1.0.3
+ * Remove Brice Goglin and David Nusinow from Uploaders. Thanks for your
+ work!
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/debian/control b/debian/control
index 39b8122..ccbab00 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: x11-xfs-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0), libfs-dev (>= 2:1.0.0)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xfs-utils
commit 568d9b97e57eef13a4b2f1a4e9eeaec9945e380b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Feb 10 17:29:20 2011 +0100
xfsinfo 1.0.3
diff --git a/debian/changelog b/debian/changelog
index f8c501c..f4c8a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-xfs-utils (7.6+1) UNRELEASED; urgency=low
- fslsfonts 1.0.3
- fstobdf 1.0.4
- showfont 1.0.3
+ - xfsinfo 1.0.3
-- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:14 +0000
diff --git a/xfsinfo/AUTHORS b/xfsinfo/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/xfsinfo/ChangeLog b/xfsinfo/ChangeLog
index d32ee5f..988b083 100644
--- a/xfsinfo/ChangeLog
+++ b/xfsinfo/ChangeLog
@@ -1,3 +1,150 @@
+commit 42adfc3d4fda8dfd3aac1329e86af9201dca7c03
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 15:52:02 2010 -0700
+
+ xfsinfo 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d8b0170c376b4b67d5fb10f409fcf868a2722934
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Oct 30 15:50:15 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 <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e31137e82915b31cb283794a08b82cce94187d05
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 15:49:47 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9bd59da2351ef82916317a8a7d3f54a9ffd13853
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 15:49:18 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8dbe9dd6ebfb85b2e41e592edce9ed78726a126d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jun 30 19:29:53 2010 -0700
+
+ xfsinfo only depends on x11proto (for Xos.h) not x11
+
+ No need to link against libX11 when no functions in it are ever called,
+ nor any headers from it ever used, since xfsinfo is a pure font-server
+ protocol client.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6804576a195b14b3b9753b6884fe0b9d57a9a374
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Feb 11 10:08:07 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 889886811da171c16562fb26ed7cffb51e18c798
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Nov 26 09:19:54 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 0af1b914f3a4976afb332be0d2c58110b8246575
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:08 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.
+
+commit dde7ecba3cddc98565b21032f216581d8ce3e4fc
+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.
+
+commit 0f7d1a066861a57c9fa34da37059af08a0cb0d7c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:39 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.
+
+commit ea5d94aa839dc2b7633b8e1802d13edf5227ba1c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:15 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.
+
+commit 831836a029dbd747e9d91a94cabd784af6f9b7c9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Oct 1 14:54:24 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit be1c0624824ab7bd52d9f417a73a80dd8bb0820d
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Wed Jan 21 18:21:03 2009 -0200
+
+ Query the "default" local server if none specified.
+
+ If no server specified, and the documented environment variable is
+ not set, attempt to connect to the local font server, as configured
+ by most Linux distributions for several years.
+
+commit 4115bdcae1a73543900118230a421da2710af836
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Wed Jan 21 18:17:20 2009 -0200
+
+ Correct make distcheck and sparse warnings.
+
commit 2212c7ad4386dcddfa2910b0cbf7497d2ac60654
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 23 16:13:43 2008 -0700
diff --git a/xfsinfo/INSTALL b/xfsinfo/INSTALL
index e69de29..8b82ade 100644
--- a/xfsinfo/INSTALL
+++ b/xfsinfo/INSTALL
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/xfsinfo/Makefile.am b/xfsinfo/Makefile.am
index c498ddb..a092f84 100644
--- a/xfsinfo/Makefile.am
+++ b/xfsinfo/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xfsinfo
-AM_CFLAGS = $(XFSINFO_CFLAGS)
+AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS)
xfsinfo_LDADD = $(XFSINFO_LIBS)
xfsinfo_SOURCES = \
@@ -36,38 +36,22 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
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
+dist-hook: ChangeLog INSTALL
diff --git a/xfsinfo/Makefile.in b/xfsinfo/Makefile.in
index e0334f6..071eb93 100644
--- a/xfsinfo/Makefile.in
+++ b/xfsinfo/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -38,8 +39,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -58,8 +60,8 @@ bin_PROGRAMS = xfsinfo$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh missing
+ $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
+ config.sub depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -69,8 +71,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xfsinfo_OBJECTS = xfsinfo.$(OBJEXT)
xfsinfo_OBJECTS = $(am_xfsinfo_OBJECTS)
@@ -79,10 +81,23 @@ xfsinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
+am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo " CC " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo " CCLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(xfsinfo_SOURCES)
DIST_SOURCES = $(xfsinfo_SOURCES)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -90,8 +105,22 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-appmanDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
DATA = $(appman_DATA)
ETAGS = etags
CTAGS = ctags
@@ -99,9 +128,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -110,6 +139,7 @@ ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AUTOCONF = @AUTOCONF@
@@ -119,7 +149,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -128,10 +161,13 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -144,6 +180,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
@@ -153,15 +190,18 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XFSINFO_CFLAGS = @XFSINFO_CFLAGS@
XFSINFO_LIBS = @XFSINFO_LIBS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -209,9 +249,10 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(XFSINFO_CFLAGS)
+AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS)
xfsinfo_LDADD = $(XFSINFO_LIBS)
xfsinfo_SOURCES = \
xfsinfo.c
@@ -221,28 +262,10 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
Reply to: