Hello community,
here is the log from the commit of package xfsinfo for openSUSE:Factory checked in at 2013-02-28 07:13:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfsinfo (Old)
and /work/SRC/openSUSE:Factory/.xfsinfo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfsinfo", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfsinfo/xfsinfo.changes 2012-05-08 12:05:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfsinfo.new/xfsinfo.changes 2013-02-28 10:23:39.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Feb 26 19:14:54 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.4:
+ + Print normalized version for X.Org servers, the way xdpyinfo
+ does.
+ + Remove CVS/RCS id tags.
+ + Mark usage() as _X_NORETURN.
+ + config:
+ - Add missing AC_CONFIG_SRCDIR.
+ - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS.
+ - Move man pages into their own directory.
+ + man: remove trailing spaces and tabs.
+
+-------------------------------------------------------------------
Old:
----
xfsinfo-1.0.3.tar.bz2
New:
----
xfsinfo-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfsinfo.spec ++++++
--- /var/tmp/diff_new_pack.yyXqXb/_old 2013-02-28 10:23:40.000000000 +0100
+++ /var/tmp/diff_new_pack.yyXqXb/_new 2013-02-28 10:23:40.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xfsinfo
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xfsinfo
-Version: 1.0.3
+Version: 1.0.4
Release: 0
-License: MIT
Summary: X font server information utility
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
BuildRequires: pkg-config
BuildRequires: pkgconfig(libfs)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
-BuildRequires: pkgconfig(xproto)
+BuildRequires: pkgconfig(xproto) >= 7.0.17
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ xfsinfo-1.0.3.tar.bz2 -> xfsinfo-1.0.4.tar.bz2 ++++++
++++ 10358 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/ChangeLog new/xfsinfo-1.0.4/ChangeLog
--- old/xfsinfo-1.0.3/ChangeLog 2010-10-31 00:56:12.000000000 +0200
+++ new/xfsinfo-1.0.4/ChangeLog 2013-02-11 00:40:08.000000000 +0100
@@ -1,3 +1,81 @@
+commit 4c717e41a5d894ef833815396b0de057b53213aa
+Author: Alan Coopersmith
+Date: Sun Feb 10 15:39:31 2013 -0800
+
+ xfsinfo 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 57d7eb7506cef9ffeda231c8896fc2c90be34b60
+Author: Alan Coopersmith
+Date: Sat Jan 12 18:02:58 2013 -0800
+
+ Print normalized version for X.Org servers, the way xdpyinfo does
+
+ Results in output like:
+ vendor string: X.Org Foundation
+ vendor release number: 10102000
+ X.Org xfs version: 1.1.2
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Julien Cristau
+
+commit e249bb674751f9a9a50a47d89eefdb8b783a8de4
+Author: Alan Coopersmith
+Date: Sat Jan 12 17:53:32 2013 -0800
+
+ Remove CVS/RCS id tags
+
+ Signed-off-by: Alan Coopersmith
+
+commit 899c9a296a8a086e7a61a2690b5446fb7cffe5b5
+Author: Alan Coopersmith
+Date: Sat Jan 12 17:47:47 2013 -0800
+
+ Mark usage() as _X_NORETURN
+
+ Signed-off-by: Alan Coopersmith
+
+commit 82222e014e7c75e88811cdb7b8e39389b8f49b6a
+Author: Alan Coopersmith
+Date: Sat Jan 12 17:43:28 2013 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 05b05bfaa88ded7422d058d42aedae3e32e670bd
+Author: Gaetan Nadon
+Date: Wed Jan 19 10:06:56 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 56ad6e59105b29469ed324f80c5a442556df03dc
+Author: Gaetan Nadon
+Date: Thu Jan 13 11:15:47 2011 -0500
+
+ man: remove trailing spaces and tabs
+
+ Using s/[ \t]*$//
+
+ Signed-off-by: Gaetan Nadon
+
+commit b9d54b21ce24c16b9fb01357ea3168c19cbca46a
+Author: Gaetan Nadon
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ This silences an Autoconf warning
+
commit 42adfc3d4fda8dfd3aac1329e86af9201dca7c03
Author: Alan Coopersmith
Date: Sat Oct 30 15:52:02 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/Makefile.am new/xfsinfo-1.0.4/Makefile.am
--- old/xfsinfo-1.0.3/Makefile.am 2010-10-31 00:49:09.000000000 +0200
+++ new/xfsinfo-1.0.4/Makefile.am 2013-02-11 00:39:39.000000000 +0100
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xfsinfo
AM_CFLAGS = $(XFSINFO_CFLAGS) $(CWARNFLAGS)
@@ -27,24 +28,7 @@
xfsinfo_SOURCES = \
xfsinfo.c
-appman_PRE = \
- xfsinfo.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
.PHONY: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/configure.ac new/xfsinfo-1.0.4/configure.ac
--- old/xfsinfo-1.0.3/configure.ac 2010-10-31 00:51:46.000000000 +0200
+++ new/xfsinfo-1.0.4/configure.ac 2013-02-11 00:39:39.000000000 +0100
@@ -21,9 +21,14 @@
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xfsinfo], [1.0.3],
+AC_INIT([xfsinfo], [1.0.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xfsinfo])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,9 +38,10 @@
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XFSINFO, xproto libfs)
+PKG_CHECK_MODULES(XFSINFO, [xproto >= 7.0.17 libfs])
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/man/Makefile.am new/xfsinfo-1.0.4/man/Makefile.am
--- old/xfsinfo-1.0.3/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xfsinfo-1.0.4/man/Makefile.am 2013-02-11 00:39:39.000000000 +0100
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xfsinfo.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/man/xfsinfo.man new/xfsinfo-1.0.4/man/xfsinfo.man
--- old/xfsinfo-1.0.3/man/xfsinfo.man 1970-01-01 01:00:00.000000000 +0100
+++ new/xfsinfo-1.0.4/man/xfsinfo.man 2013-02-11 00:39:39.000000000 +0100
@@ -0,0 +1,90 @@
+.\" Copyright 1991, Network Computing Devices, Inc
+.\" Copyright 1993, 1998 The Open Group
+.\"
+.\" Permission to use, copy, modify, distribute, and sell this software and its
+.\" documentation for any purpose is hereby granted without fee, provided that
+.\" the above copyright notice appear in all copies and that both that
+.\" copyright notice and this permission notice appear in supporting
+.\" documentation.
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.TH XFSINFO __appmansuffix__ __xorgversion__
+.SH NAME
+xfsinfo \- X font server information utility
+.SH SYNOPSIS
+.B "xfsinfo"
+[\-server \fIservername\fP]
+.SH DESCRIPTION
+.PP
+.I Xfsinfo
+is a utility for displaying information about an X font server. It is used to
+examine the
+capabilities of a server, the predefined values for various parameters used
+in communicating between clients and the server, and the font catalogues
+and alternate servers that are available.
+.SH "OPTIONS"
+.PP
+.TP
+.B \-server \fIservername\fP
+This option specifies the X font server to contact.
+.I servername
+must be specified in one of the formats defined in the
+.I Font Server Names
+section of X(__miscmansuffix__). If not specified, the server name in the
+.B FONTSERVER
+environment variable is used.
+.SH HISTORY
+.I Xfsinfo
+was originally called
+.I fsinfo.
+It was renamed to avoid a clash with the
+.I fsinfo
+utility from the Berkeley automounter
+.I amd.
+.SH EXAMPLE
+.PP
+The following shows a sample produced by
+.IR xfsinfo .
+.PP
+.nf
+example% xfsinfo -server hansen:7100
+name of server: hansen:7100
+version number: 1
+vendor string: Font Server Prototype
+vendor release number: 17
+maximum request size: 16384 longwords (65536 bytes)
+number of catalogues: 1
+ all
+Number of alternate servers: 2
+\& #0 hansen:7101
+\& #1 hansen:7102
+number of extensions: 0
+.fi
+
+.SH ENVIRONMENT
+.PP
+.TP 8
+.B FONTSERVER
+To get the default fontserver. The server name must
+be specified in one of the formats defined in the
+.I Font Server Names
+section of X(__miscmansuffix__).
+.SH "SEE ALSO"
+xfs(__appmansuffix__), fslsfonts(__appmansuffix__), X(__miscmansuffix__).
+.SH AUTHOR
+Dave Lemke, Network Computing Devices, Inc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/xfsinfo.c new/xfsinfo-1.0.4/xfsinfo.c
--- old/xfsinfo-1.0.3/xfsinfo.c 2009-10-16 23:39:22.000000000 +0200
+++ new/xfsinfo-1.0.4/xfsinfo.c 2013-02-11 00:39:39.000000000 +0100
@@ -2,7 +2,6 @@
* xfsinfo -- report info about a font server
*/
-/* $TOG: fsinfo.c /main/7 1998/02/09 13:43:08 kaleb $ */
/*
Portions Copyright 1987, 1998 The Open Group
@@ -30,7 +29,6 @@
from The Open Group.
*/
-/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.3 2001/08/27 17:41:02 dawes Exp $ */
/*
* Copyright 1990 Network Computing Devices;
@@ -70,7 +68,7 @@
static char *progname;
-static void
+static void _X_NORETURN
usage(void)
{
fprintf(stderr, "usage: %s [-server server_name]\n", progname);
@@ -123,6 +121,17 @@
printf("version number: %d\n", FSProtocolVersion(svr));
printf("vendor string: %s\n", FSServerVendor(svr));
printf("vendor release number: %d\n", FSVendorRelease(svr));
+ if (strstr(FSServerVendor(svr), "X.Org")) {
+ int vendrel = FSVendorRelease(svr);
+
+ printf("X.Org xfs version: ");
+ printf("%d.%d.%d", vendrel / 10000000,
+ (vendrel / 100000) % 100,
+ (vendrel / 1000) % 100);
+ if (vendrel % 1000)
+ printf(".%d", vendrel % 1000);
+ printf("\n");
+ }
printf("maximum request size: %ld longwords (%ld bytes)\n",
FSMaxRequestSize(svr), FSMaxRequestSize(svr) * sizeof(long));
print_catalogue_info(svr);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfsinfo-1.0.3/xfsinfo.man new/xfsinfo-1.0.4/xfsinfo.man
--- old/xfsinfo-1.0.3/xfsinfo.man 2009-10-16 23:39:22.000000000 +0200
+++ new/xfsinfo-1.0.4/xfsinfo.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-.\" $TOG: fsinfo.man /main/10 1998/02/09 13:43:12 kaleb $
-.\" Copyright 1991, Network Computing Devices, Inc
-.\" Copyright 1993, 1998 The Open Group
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of The Open Group shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from The Open Group.
-.\"
-.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.4 2001/04/18 16:13:23 dawes Exp $
-.\"
-.TH XFSINFO __appmansuffix__ __xorgversion__
-.SH NAME
-xfsinfo \- X font server information utility
-.SH SYNOPSIS
-.B "xfsinfo"
-[\-server \fIservername\fP]
-.SH DESCRIPTION
-.PP
-.I Xfsinfo
-is a utility for displaying information about an X font server. It is used to
-examine the
-capabilities of a server, the predefined values for various parameters used
-in communicating between clients and the server, and the font catalogues
-and alternate servers that are available.
-.SH "OPTIONS"
-.PP
-.TP
-.B \-server \fIservername\fP
-This option specifies the X font server to contact.
-.I servername
-must be specified in one of the formats defined in the
-.I Font Server Names
-section of X(__miscmansuffix__). If not specified, the server name in the
-.B FONTSERVER
-environment variable is used.
-.SH HISTORY
-.I Xfsinfo
-was originally called
-.I fsinfo.
-It was renamed to avoid a clash with the
-.I fsinfo
-utility from the Berkeley automounter
-.I amd.
-.SH EXAMPLE
-.PP
-The following shows a sample produced by
-.IR xfsinfo .
-.PP
-.nf
-example% xfsinfo -server hansen:7100
-name of server: hansen:7100
-version number: 1
-vendor string: Font Server Prototype
-vendor release number: 17
-maximum request size: 16384 longwords (65536 bytes)
-number of catalogues: 1
- all
-Number of alternate servers: 2
-\& #0 hansen:7101
-\& #1 hansen:7102
-number of extensions: 0
-.fi
-
-.SH ENVIRONMENT
-.PP
-.TP 8
-.B FONTSERVER
-To get the default fontserver. The server name must
-be specified in one of the formats defined in the
-.I Font Server Names
-section of X(__miscmansuffix__).
-.SH "SEE ALSO"
-xfs(__appmansuffix__), fslsfonts(__appmansuffix__), X(__miscmansuffix__).
-.SH AUTHOR
-Dave Lemke, Network Computing Devices, Inc
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org