Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Wed Mar 31 20:04:14 CEST 2010.
--------
--- yast2-printer/yast2-printer.changes 2010-03-18 16:36:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2010-03-30 15:17:43.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Mar 30 14:59:45 CEST 2010 - jsmeix(a)suse.de
+
+- Further cleanup and enhancement of printer_auto.ycp:
+ Added CreateBackupFile to backup /etc/cups/cupsd.conf
+ and /etc/cups/client.conf before "Reset" and "Write".
+ Added restart of local cupsd in "Change" if its config
+ was reset to system defaults by "Reset" before.
+ Made ReadFileContent safe against possible end of CDATA
+ section strings "]]>" inside file contets.
+- 2.19.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.19.6.tar.bz2
New:
----
yast2-printer-2.19.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.PU7Rs6/_old 2010-03-31 20:03:55.000000000 +0200
+++ /var/tmp/diff_new_pack.PU7Rs6/_new 2010-03-31 20:03:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.19.6)
+# spec file for package yast2-printer (Version 2.19.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-printer
-Version: 2.19.6
+Version: 2.19.7
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.19.6.tar.bz2
+Source0: yast2-printer-2.19.7.tar.bz2
Prefix: /usr
@@ -54,7 +54,7 @@
Developer documentation for yast2-printer.
%prep
-%setup -n yast2-printer-2.19.6
+%setup -n yast2-printer-2.19.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,9 +66,7 @@
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-# V=1: verbose build in case we used AM_SILENT_RULES(yes)
-# so that RPM_OPT_FLAGS check works
-make %{?jobs:-j%jobs} V=1
+make %{?jobs:-j%jobs}
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-printer-2.19.6.tar.bz2 -> yast2-printer-2.19.7.tar.bz2 ++++++
++++ 4504 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/yast2-printer-2.19.6/Makefile.am new/yast2-printer-2.19.7/Makefile.am
--- old/yast2-printer-2.19.6/Makefile.am 2010-03-20 09:26:41.000000000 +0100
+++ new/yast2-printer-2.19.7/Makefile.am 2010-03-30 14:58:01.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools install m4 snippets
+# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
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/yast2-printer-2.19.6/VERSION new/yast2-printer-2.19.7/VERSION
--- old/yast2-printer-2.19.6/VERSION 2010-03-11 18:00:36.000000000 +0100
+++ new/yast2-printer-2.19.7/VERSION 2010-03-30 14:57:54.000000000 +0200
@@ -1 +1 @@
-2.19.6
+2.19.7
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/yast2-printer-2.19.6/autodocs-ycp.ami new/yast2-printer-2.19.7/autodocs-ycp.ami
--- old/yast2-printer-2.19.6/autodocs-ycp.ami 2010-03-20 09:26:41.000000000 +0100
+++ new/yast2-printer-2.19.7/autodocs-ycp.ami 2010-03-30 14:58:01.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
+# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,25 +8,20 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
-# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
-# Optional - the default is no subdir, $(docdir)/autodocs
-# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
-# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+htmldir = $(docdir)/autodocs
-html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
+html_DATA = index.html $(wildcard *.html)
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
-AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
+ ${YCPDOC} -d. $^
for i in $(AUTODOCS_PM); do \
- b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
+ b=`basename $$i`; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
done
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/yast2-printer-2.19.6/configure.in new/yast2-printer-2.19.7/configure.in
--- old/yast2-printer-2.19.6/configure.in 2010-03-20 09:26:41.000000000 +0100
+++ new/yast2-printer-2.19.7/configure.in 2010-03-30 14:58:01.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-printer
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.19.6, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.19.7, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.6"
+VERSION="2.19.7"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)novell.com>"
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/yast2-printer-2.19.6/missing new/yast2-printer-2.19.7/missing
--- old/yast2-printer-2.19.6/missing 2010-03-20 09:26:46.000000000 +0100
+++ new/yast2-printer-2.19.7/missing 2010-03-30 14:58:07.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,9 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,9 +89,6 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -107,22 +106,15 @@
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
+# the program).
case $1 in
- lex*|yacc*)
+ lex|yacc)
# Not GNU programs, they don't have --version.
;;
- tar*)
+ tar)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -146,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $program in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -156,7 +148,7 @@
touch aclocal.m4
;;
- autoconf*)
+ autoconf)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -165,7 +157,7 @@
touch configure
;;
- autoheader*)
+ autoheader)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -195,7 +187,7 @@
while read f; do touch "$f"; done
;;
- autom4te*)
+ autom4te)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -218,7 +210,7 @@
fi
;;
- bison*|yacc*)
+ bison|yacc)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -248,7 +240,7 @@
fi
;;
- lex*|flex*)
+ lex|flex)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -271,7 +263,7 @@
fi
;;
- help2man*)
+ help2man)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -285,11 +277,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit $?
+ exit 1
fi
;;
- makeinfo*)
+ makeinfo)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -318,7 +310,7 @@
touch $file
;;
- tar*)
+ tar)
shift
# We have already tried tar in the generic part.
@@ -371,6 +363,5 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
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/yast2-printer-2.19.6/src/Printer.ycp new/yast2-printer-2.19.7/src/Printer.ycp
--- old/yast2-printer-2.19.6/src/Printer.ycp 2010-03-18 15:40:13.000000000 +0100
+++ new/yast2-printer-2.19.7/src/Printer.ycp 2010-03-24 11:35:20.000000000 +0100
@@ -103,7 +103,7 @@
/**
* Filled in by AutoYaST by calling in printer_auto.ycp the "Import" function.
* Reset to the empty map by AutoYaST by calling in printer_auto.ycp the "Reset" function.
- * Preset to the empty map which is the right default for AutoYast.
+ * Preset to the empty map.
*/
global map autoyast_printer_settings = $[];
@@ -118,6 +118,14 @@
global boolean printer_auto_dialogs = false;
/**
+ * Set to 'true' by AutoYaST when in printer_auto.ycp the "Reset" function
+ * resets /etc/cups/cupsd.conf and /etc/cups/client.conf to system defaults.
+ * When it is 'true', the "Change" function in printer_auto.ycp does a cupsd restart.
+ * Preset to false.
+ */
+global boolean printer_auto_requires_cupsd_restart = false;
+
+/**
* Explicite listing of all alphanumeric ASCII characters.
* The reason is that in certain special locales for example [a-z] is not equivalent
* to "abcdefghijklmnopqrstuvwxyz" because in certain special languages the 'z' is
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/yast2-printer-2.19.6/src/printer_auto.ycp new/yast2-printer-2.19.7/src/printer_auto.ycp
--- old/yast2-printer-2.19.6/src/printer_auto.ycp 2010-03-18 15:40:13.000000000 +0100
+++ new/yast2-printer-2.19.7/src/printer_auto.ycp 2010-03-24 12:26:39.000000000 +0100
@@ -101,6 +101,19 @@
+ "</p>";
return "";
}
+ // The file content will appear as CDATA section in the AutoYaST XML control file.
+ // The content in a XML CDATA section cannot contain the string "]]>" because
+ // this exact string (without spaces in between) marks the end of the CDATA section.
+ // Therefore "]]>" in the file content is changed to "] ]>" to be on the safe side.
+ // This change is not reverted in the "Write" function below
+ // (which writes the CDATA section content back to a file)
+ // because "] ]>" should also work (hoping that the particular file format
+ // is not sensitive regarding a space between subsequent closing brackets).
+ // In particular in /etc/cups/cupsd.conf and /etc/cups/client.conf
+ // there is no string "]]>" (except perhaps in a comment).
+ // It is o.k. to ignore when the sed command fails because then
+ // the file content was (hopefully) not changed at all which is the right fallback:
+ Printerlib::ExecuteBashCommand( "sed -i -e 's/]]>/] ]>/g' " + file_name );
string content = (string)SCR::Read( .target.string, file_name );
if( "" == filterchars( content, Printer::alnum_chars ) )
{ // No user information popup because this would block autoinstallation.
@@ -121,6 +134,48 @@
return content;
}
+boolean CreateBackupFile( string file_name )
+{ // Do nothing if no file specified or if file does not exist:
+ if( "" == file_name || ! Printerlib::ExecuteBashCommand( "test -f " + file_name ) )
+ { return true;
+ }
+ // See "Make a backup" in tools/modify_cupsd_conf how to create a backup file:
+ if( Printerlib::ExecuteBashCommand( "rpm -V -f " + file_name + " | grep -q '^..5.*" + file_name + "$'" ) )
+ { // The file was already changed (RPM tells that the MD5 sum differs):
+ if( Printerlib::ExecuteBashCommand( "cp -p " + file_name + " " + file_name + ".yast2save" ) )
+ { return true;
+ }
+ // No user information popup because this would block autoinstallation.
+ y2milestone( "Warning: Failed to backup %1 as %1.yast2save", file_name );
+ Printer::printer_auto_summary = Printer::printer_auto_summary
+ + "<p>"
+ + sformat( // Warning message in the AutoYaST printer client
+ // which is added to its "Summary" text for AutoYaST
+ // where %1 is replaced by the file name.
+ _("Warning: Failed to backup %1 as %1.yast2save"),
+ file_name
+ )
+ + "</p>";
+ return false;
+ }
+ // The file is the original from the RPM package or the file is not owned by any package:
+ if( Printerlib::ExecuteBashCommand( "cp -p " + file_name + " " + file_name + ".yast2orig" ) )
+ { return true;
+ }
+ // No user information popup because this would block autoinstallation.
+ y2milestone( "Warning: Failed to backup %1 as %1.yast2orig", file_name );
+ Printer::printer_auto_summary = Printer::printer_auto_summary
+ + "<p>"
+ + sformat( // Warning message in the AutoYaST printer client
+ // which is added to its "Summary" text for AutoYaST
+ // where %1 is replaced by the file name.
+ _("Warning: Failed to backup %1 as %1.yast2orig"),
+ file_name
+ )
+ + "</p>";
+ return false;
+}
+
/* Create a summary string */
if (func == "Summary")
{ ret = Printer::printer_auto_summary;
@@ -146,13 +201,29 @@
* function by AutoYaST would provide the correct system default values.
*/
else if (func == "Reset")
-{ // It is o.k. to ignore when the next two commands fail
+{ // It is o.k. to ignore when the next commands fail
// because then /etc/cups/cupsd.conf and/or /etc/cups/client.conf
// were (hopefully) not changed at all which is the right fallback
// so that there is no change of system config files in case of errors.
+ CreateBackupFile( "/etc/cups/cupsd.conf" );
Printerlib::ExecuteBashCommand( "cp /etc/cups/cupsd.conf.default /etc/cups/cupsd.conf" );
+ CreateBackupFile( "/etc/cups/client.conf" );
Printerlib::ExecuteBashCommand( "sed -i -e '/^[^#]/s/^/#/' /etc/cups/client.conf" );
- // Ignore read failures and reset to even empty content because to what else could it be reset instead:
+ // After /etc/cups/cupsd.conf and/or /etc/cups/client.conf were changed
+ // a restart of the local cupsd is needed if it is currently accessible
+ // so that a possible subsequent AutoYaST call of the "Change" function
+ // uses a local cupsd with the changed system default config which results
+ // the right system default settings in the "Printing via Network" dialog.
+ // To avoid that the user confirmation yes/no-popup in
+ // Printerlib::GetAndSetCupsdStatus("restart") could block autoinstallation
+ // only Printer::printer_auto_requires_cupsd_restart is set to true here
+ // which postpones and triggers the actual cupsd restart to be done later
+ // in the "Change" function which is meant to run interactive dialogs.
+ if( Printerlib::GetAndSetCupsdStatus( "" ) )
+ { Printer::printer_auto_requires_cupsd_restart = true;
+ }
+ // Ignore read failures and reset to even empty content because
+ // to what else could it be reset instead in case of errors:
Printer::autoyast_printer_settings = $[ "cupsd_conf_content" :
$[ "file_contents" : ReadFileContent( "/etc/cups/cupsd.conf" ) ],
"client_conf_content" :
@@ -172,22 +243,27 @@
/* Change configuration (run the wizards AutoSequence dialogs) */
else if (func == "Change")
{ // Call Printer::Read() here (compare the 'func == "Read"' case below)
- // to make sure that when the full printer module dialogs are launched
+ // to make sure that when the printer module dialogs are launched
// it asks the user to install the packages cups-client and cups:
boolean progress_orig = Progress::set( false );
Printer::Read();
Progress::set( progress_orig );
+ if( Printer::printer_auto_requires_cupsd_restart )
+ { if( Printerlib::GetAndSetCupsdStatus("restart") )
+ { // Only if the restart was successful, a restart is no longer required:
+ Printer::printer_auto_requires_cupsd_restart = false;
+ }
+ }
// Let the Overview dialog disable the checkbox to show local queues
// which disables as a consequence in particular the [Delete] button.
- // Lets the Printing via Network dialog disable the button to
- // run the Connection Wizard (to set up a local queue for a network printer).
+ // Let the "Printing via Network" dialog disable the button to
+ // run the "Connection Wizard" (to set up a local queue for a network printer).
Printer::printer_auto_dialogs = true;
// Let the Overview dialog only show remote queues:
Printer::queue_filter_show_remote = true;
Printer::queue_filter_show_local = false;
// PrinterAutoSequence in wizards.ycp runs only the AutoSequence
- // which is only the "Printing via Network" and the "Overview" dialog
- // (starting with the "Printing via Network" dialog)
+ // which is only the "Printing via Network" and the "Overview" dialogs
// but without running before ReadDialog (which calls only Printer::Read)
// and running afterwards WriteDialog (which calls only Printer::Write)
// which is the reason that Printer::Read is called explicitely above.
@@ -208,7 +284,8 @@
* calls the above Import function.
*/
else if (func == "Export")
-{ // Ignore read failures and export even empty content because what else could be exported instead:
+{ // Ignore read failures and export even empty content because
+ // what else could be exported instead in case of errors:
ret = $[ "cupsd_conf_content" : $[ "file_contents" : ReadFileContent( "/etc/cups/cupsd.conf" ) ],
"client_conf_content" : $[ "file_contents" : ReadFileContent( "/etc/cups/client.conf" ) ]
];
@@ -247,6 +324,7 @@
*/
else if (func == "Write")
{ y2milestone("Writing to system '%1'", Printer::autoyast_printer_settings);
+ CreateBackupFile( "/etc/cups/cupsd.conf" );
if( ! SCR::Write( .target.string,
"/etc/cups/cupsd.conf",
Printer::autoyast_printer_settings["cupsd_conf_content","file_contents"]:""
@@ -259,6 +337,7 @@
+ _("Error: Failed to write /etc/cups/cupsd.conf")
+ "</p>";
}
+ CreateBackupFile( "/etc/cups/client.conf" );
if( ! SCR::Write( .target.string,
"/etc/cups/client.conf",
Printer::autoyast_printer_settings["client_conf_content","file_contents"]:""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Wed Mar 31 20:02:54 CEST 2010.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-03-25 01:45:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2010-03-30 02:36:46.000000000 +0200
@@ -1,0 +2,30 @@
+Tue Mar 30 01:55:50 CEST 2010 - sndirsch(a)suse.de
+
+- xf86-video-intel 2.11.0
+ * The most significant new feature of this release is support for
+ new DRI2 APIs, allowing page flipping to occur for swaps that
+ are full-screen and not rotated.
+ * Dramatically improved performance of large pixmaps on
+ memory-constrained hardware, (such as 945), by using tiling.
+ Note that this fix is new since the most recent release
+ candidate for this release (2.10.903).
+ (https://bugs.freedesktop.org/show_bug.cgi?id=25375)
+ * Elimination of software fallback with alpha-only pixmap (a fix
+ which eliminated a full second from the Moblin boot time)
+ (https://bugs.freedesktop.org/show_bug.cgi?id=26189)
+ * Fix for undesired black borders on some images, (caused several
+ problems with firefox):
+ (http://bugs.freedesktop.org/show_bug.cgi?id=17933)
+ * And other fixes to provide more conformance with existing
+ software-rendering, (as measures by the cairo test suite),
+ such as the sampling location for nearest-neighbor sampling.
+ * Eric Anholt and Daniel Vetter both removed large piles of old
+ and useless code now that the driver requires kernel modesetting
+ (KMS). This continues to reduce the mainteance burden of the
+ driver, making it easier to isolate and fix bugs.
+- removed obsolete patch 'moblin-dump-tools.patch'; bios_reader/
+ reg_dumper moved to intel-gpu-tools
+- update intel-gpu-tools to current git master (2010-03-24, commit
+ #7682c42)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
intel-gpu-tools-1.0.1.tar.bz2
moblin-dump-tools.patch
xf86-video-intel-2.10.0.tar.bz2
New:
----
intel-gpu-tools-1.0.2-20100324-7682c42.tar.bz2
xf86-video-intel-2.11.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.x1oXAF/_old 2010-03-31 20:02:07.000000000 +0200
+++ /var/tmp/diff_new_pack.x1oXAF/_new 2010-03-31 20:02:07.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 2
+Release: 3
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -68,7 +68,7 @@
Source42: xf86-video-voodoo-1.2.3.tar.bz2
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
-Source45: xf86-video-intel-2.10.0.tar.bz2
+Source45: xf86-video-intel-2.11.0.tar.bz2
Source46: xf86-video-ati-6.12.192.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.1.tar.bz2
@@ -76,7 +76,7 @@
Source53: xf86-video-xgixp-1.7.99.3.tar.bz2
Source54: xf86-video-mach64-6.8.2.tar.bz2
Source55: xf86-video-r128-6.8.1.tar.bz2
-Source56: intel-gpu-tools-1.0.1.tar.bz2
+Source56: intel-gpu-tools-1.0.2-20100324-7682c42.tar.bz2
Source99: baselibs.conf
Source100: sax2-hwinfo-data.tar.gz
Patch10: xf86-video-tdfx.diff
@@ -99,7 +99,6 @@
Patch103: xf86-video-ati-6.7.197-r128-xvideo.patch
Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff
# Moblin
-Patch110: moblin-dump-tools.patch
%if %moblin
Patch112: copy-fb.patch
%endif
@@ -120,7 +119,7 @@
%prep
%setup -q -T -c %{name}
for i in $RPM_SOURCE_DIR/xf86-video-*.tar.bz2; do tar xjf $i; done
-tar xjf $RPM_SOURCE_DIR/intel-gpu-tools-1.0.1.tar.bz2
+tar xjf $RPM_SOURCE_DIR/intel-gpu-tools-1.0.2-20100324-7682c42.tar.bz2
# Geode LX/GX is x86 only
%ifnarch %ix86
rm -rf xf86-video-geode*
@@ -184,7 +183,6 @@
%patch71
popd
pushd xf86-video-intel-*
-%patch110 -p1
%if %moblin
%patch112 -p1
%endif
@@ -294,9 +292,6 @@
%dir /var/lib/hardware
%dir /var/lib/hardware/ids
/usr/bin/intel_*
-/usr/bin/bios_dumper
-/usr/bin/bios_reader
-/usr/bin/swf_dumper
%{_libdir}/lib*
%{_libdir}/xorg/modules/
%{_mandir}/man1/*
++++++ xf86-video-intel-2.10.0.tar.bz2 -> xf86-video-intel-2.11.0.tar.bz2 ++++++
++++ 15361 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory
checked in at Wed Mar 31 20:01:56 CEST 2010.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-03-26 11:58:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-03-29 14:40:09.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Mar 29 14:28:12 CEST 2010 - sndirsch(a)suse.de
+
+- xf86-input-vmmouse 12.6.7
+ * Symbol was removed from the xorg-server 1.7 (bnc #574857)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-input-vmmouse-12.6.5.tar.bz2
New:
----
xf86-input-vmmouse-12.6.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.3LxNJn/_old 2010-03-31 20:01:32.000000000 +0200
+++ /var/tmp/diff_new_pack.3LxNJn/_new 2010-03-31 20:01:32.000000000 +0200
@@ -24,7 +24,7 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 45
+Release: 46
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -47,7 +47,7 @@
Source18: xf86-input-mouse-1.5.0.tar.bz2
Source19: xf86-input-mutouch-1.2.1.tar.bz2
Source21: xf86-input-penmount-1.4.0.tar.bz2
-Source26: xf86-input-vmmouse-12.6.5.tar.bz2
+Source26: xf86-input-vmmouse-12.6.7.tar.bz2
Source27: xf86-input-void-1.3.0.tar.bz2
Source29: xf86-input-synaptics-1.2.2.tar.bz2
Source30: xf86-input-evdev-2.3.2.tar.bz2
++++++ xf86-input-vmmouse-12.6.5.tar.bz2 -> xf86-input-vmmouse-12.6.7.tar.bz2 ++++++
++++ 56841 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/xf86-input-vmmouse-12.6.5/ChangeLog new/xf86-input-vmmouse-12.6.7/ChangeLog
--- old/xf86-input-vmmouse-12.6.5/ChangeLog 2006-07-01 08:18:52.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/ChangeLog 2010-03-18 16:26:50.000000000 +0100
@@ -1,25 +1,530 @@
-2006-04-06 Adam Jackson <ajax(a)freedesktop.org>
+commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd
+Author: Jakob Bornecrantz <jakob(a)vmware.com>
+Date: Thu Mar 18 16:23:27 2010 +0100
- * configure.ac:
- * src/vmmouse.c:
- * src/vmmouse_proto.h:
- Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
+ Bump for 12.6.7 release.
-2006-03-28 Philip Langdale <plangdale(a)vmware.com>
+commit fae10ac6c613f6de847e152d615e6da421147139
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Fri Feb 26 17:30:08 2010 +0100
- * configure.ac:
- * src/vmmouse.c: Bump PATCHLEVEL.
- * src/vmmouse_proto.h: Use the right #define
- when detecting a 64bit compilation. This fixes
- the driver to actually work for 64bit builds.
+ vmmouse: don't hardcode the module version in the source
+
+ XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it.
+
+ Signed-off-by: Julien Cristau <jcristau(a)debian.org>
-2006-01-16 Philip Langdale <plangdale(a)vmware.com>
+commit f3ef776415820c7da1728d1fe27dd56dc24e935f
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Wed Feb 10 02:16:43 2010 +0100
- * configure.ac:
- * src/vmmouse.c: Bump PATCHLEVEL.
- * src/vmmouse_proto.c: push/pop ebx to keep
- gcc4 happy when compiling with -fPIC.
+ Bump to 12.6.6
+
+ Signed-off-by: Julien Cristau <jcristau(a)debian.org>
-2006-01-06 Philip Langdale <plangdale(a)vmware.com>
+commit ae58da22e6f4798498a1e9a0b1b6c6c0f19e2532
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Wed Feb 10 02:15:38 2010 +0100
- * Initial release.
+ Require xorg-macros 1.4 for XORG_INSTALL
+
+ Signed-off-by: Julien Cristau <jcristau(a)debian.org>
+
+commit aca67eca8bbb1368a2f36614b0e78b98947f134f
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Fri Jan 15 15:15:54 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit b3b9f36deb3fb1fcf66e591fcb075fe295e0cf0e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson <dbn.lists(a)gmail.com>
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 4eb807b3e7271f5116daebea9412c72e2faae4a5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Nov 23 09:25:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 9bdfaffc1b858737c3fe85bc9b0bb25001f46460
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Fri Nov 20 10:09:24 2009 +1000
+
+ Remove unused bits from configure.ac
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 1f8df297b4d57e2da58faf26df378548efa47251
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit c2f77dcc95ecb5e3cfa1235e67b085aa93e4a724
+Author: Gaetan Nadon <memsize(a)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.
+
+commit db91ec37ea274f69eb5d07c41bef787d5e9537a5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 12:54:20 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit bb622c56b522d7b6962770b25bbe4e89ea280f16
+Author: Gaetan Nadon <memsize(a)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.
+
+commit 43e123c2f4fadfdf6e7cf5aa864102d82e40fe4b
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue Sep 8 22:35:55 2009 -0700
+
+ Symbol was removed from the server.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 989004f300c9fd897837fdee4fd9c1307c6ed6ca
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Thu Jul 16 09:57:27 2009 +1000
+
+ Compile with INPUT ABI 7.
+
+ Button labels up to 7 are essentially default so we can assume they are the
+ usual ones. Beyond that, they are anyone's guess.
+ Axis labels are X/Y.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 2fd8646ff528f4f7c4450dff111b4e9335ae2186
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Wed Jul 29 11:21:19 2009 -0700
+
+ Needed by newer X servers, otherwise the module data is invisible and a dlopen error occurs.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 436582791de540ef85b0b66000f2446d6f8f9802
+Author: Shelley Gong <shelleygong(a)vmware.com>
+Date: Wed Jul 29 11:12:24 2009 -0700
+
+ Turn off built-in fallback-to-mouse-driver mechanism. With input
+ hotplug, HAL handles deciding which driver to use and the presence
+ of mouse_drv can't be assumed anymore on modern distros.
+
+commit 370aab66b97a6fdc18f87d584a252f33f575899e
+Author: Matthias Hopf <mhopf(a)suse.de>
+Date: Fri Jun 5 20:06:40 2009 +0200
+
+ Remove ModuleInfoRec and associated bits.
+
+ ModuleInfoRec was removed with 2107becb0ce2ffda001be65728c53563496d8d50 from
+ the server. The MouseOpts were only used from the ModuleInfoRec, they're gone
+ now too.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit d61609868697825717d2f6a63b2a6177cb13873b
+Author: Shelley Gong <shelleygong(a)vmware.com>
+Date: Mon May 11 10:08:56 2009 -0700
+
+ 1) Fix bug where motion notify events were being sent with every button event.
+
+ 2) Classify relative vs. absolute packets individually rather than from a
+ global flag.
+
+ 3) Compile with older distros.
+
+ 4) Bump for 12.6.4 Release.
+
+ Signed-off-by: Philip Langdale <philipl(a)fido2.homeip.net>
+
+commit d5ae42ec3849672438823b08ad06a69289ae99c5
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu May 7 15:53:32 2009 -0700
+
+ Map Solaris/Sun compiler #defines to gcc equivalents
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit 9719534fa3a184b848ef9e9c3a755703b8708fd2
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 15 07:29:44 2009 -0800
+
+ Make --with-hal* configure options match their help output
+
+commit 5e43144376bfa4491f60dc4da34f8bde9da2f900
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Fri Jan 9 16:23:49 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit bc324161680b1403e5811b3ac2b9ca679829a5c9
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Mon Dec 22 14:19:30 2008 +1000
+
+ Bump for 12.6.3 release
+
+commit 6f855ac348db34726eac68dc114563543ff0eae2
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Mon Dec 22 14:53:27 2008 +1000
+
+ Fix make distcheck allowing custom build directories.
+
+commit 7cb41b467a161461627e6abf1ea979b7058d02f0
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Mon Dec 22 14:10:38 2008 +1000
+
+ Fix build against master - add xf86OSmouse.h
+
+commit bda45dcf9fbbd42c155c7071d547d0d067429dde
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Fri Nov 14 10:52:26 2008 -0800
+
+ Bump for 12.6.2 release.
+
+commit b29b45a25b3b2db58f81e727d787c337bbd87637
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Fri Nov 14 10:24:36 2008 -0800
+
+ Revert "Narrow down the scope of what systems are checked for the vmmouse device."
+
+ This reverts commit 93f032b80b841e1b6beeff814e8d9519e485fdef.
+
+ I'm doing this for now because qemu (with and without kvm) provides
+ an implementation of the vmmouse device and input hotplug works there
+ right now. Later, I'll try and dig up an equivalent id check for them.
+
+commit a5718c9b31d5fb72a88c0e145766efd861e0a3d3
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Nov 13 15:43:31 2008 -0800
+
+ Only turn on absolute mode when we get an actual event; we don't
+ want the driver to throw us into absolute mode just because the
+ device is present but the user has a relative input path configured.
+
+commit aea9dd5694e3b6bdeb704c18dc7930ba412ff259
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Nov 13 15:21:31 2008 -0800
+
+ Don't flush buttons.
+
+ Apply equivalent of commit 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534
+ from xf86-input-mouse.
+
+commit 93f032b80b841e1b6beeff814e8d9519e485fdef
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Oct 27 09:32:22 2008 -0700
+
+ Narrow down the scope of what systems are checked for the vmmouse device.
+
+commit c42ef00eaa590139cb872c086787aaa545eac273
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Oct 23 23:35:56 2008 -0700
+
+ Bump for 12.6.1 release.
+
+commit bcdec3d0cd4434770cd841c33c030e0d7203881f
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Oct 23 23:35:28 2008 -0700
+
+ Remove call to iopl(). It's not portable and isn't necessary.
+
+commit ecb2f313292b4d3f516f5d1ae5c7cde45444041c
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Oct 23 22:26:53 2008 -0700
+
+ Bump version number for 12.6.0 release.
+
+commit a9050a9d407f650b86ee28ff00f5717c965b4554
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Oct 23 22:13:56 2008 -0700
+
+ Switch hal-probe-vmmouse to /bin/sh and add Copyright statement.
+
+commit eb03e96c1974a3fbe1c48c56974ff32bc886c8f7
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Thu Oct 23 21:54:44 2008 -0700
+
+ Add HAL integration to support input hot plug.
+
+ * vmmouse_detect: A simple program that detects whether a vmmouse
+ device is present.
+ * hal-probe-vmmouse: A HAL callout script that uses vmmouse_detect
+ and overrides input.x11_driver.
+ * 11-x11-vmmouse.fdi: fdi descriptor that adds the callout for PS/2
+ mice.
+
+ Additional 'configure' variables have been added to allow for overriding
+ HAL paths, although this shouldn't usually be necessary.
+
+commit 223afd09500672a7fe8a1ab5fc221001863a8bec
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Tue Oct 21 18:53:03 2008 -0700
+
+ Ignore more stuff in .gitignore
+
+commit 370a0ffa789c1c64d5343153bdb5ddccd502a361
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Tue Oct 21 18:52:02 2008 -0700
+
+ Move shared vmmouse files into a separate static lib so we can
+ share it with the vmmouse detection utility I'm about to add.
+
+commit 4c26f5cffba924daa514134e6c6dfcbc3c391d27
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Fri Oct 17 19:59:26 2008 -0700
+
+ Bump version number for 12.5.2 release.
+
+commit 305fd77bdf4a8b241c3155b068acf4147a2f8077
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Fri Oct 17 19:58:50 2008 -0700
+
+ Change ZAxisMapping default to match main mouse driver.
+
+commit 64760dae6b1184405641b6b46a7967d114f4ab80
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Fri Oct 17 19:41:07 2008 -0700
+
+ Properly set axis range and resolution for Server 1.5+
+
+commit f978146de9c798e7405a7a09c5b4421e9429bf91
+Author: Matthias Hopf <mhopf(a)suse.de>
+Date: Tue Oct 14 14:19:29 2008 +0200
+
+ Revert "Grab mouse from kernel if possible."
+
+ This reverts commit 028e7d0001d4948e7b11a68d904c6b307a1ccfb3.
+
+ The test turned out to be bogus, in fact, the patch had no effect.
+ The used kernel mouse driver doesn't even allow grabbing...
+
+commit 028e7d0001d4948e7b11a68d904c6b307a1ccfb3
+Author: Matthias Hopf <mhopf(a)suse.de>
+Date: Mon Sep 29 18:30:55 2008 +0200
+
+ Grab mouse from kernel if possible.
+
+ Avoids mouse event duplication if a mouse driver is sitting on /dev/input/mice
+ on Linux.
+
+commit a5fb5b8cb816ddcdc25a61fa42b560955a4194e3
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Tue Aug 19 15:29:38 2008 -0400
+
+ Remove useless call to xf86AddModuleInfo
+
+commit 9e4c44ab08fe8e5ad701750291970e03fc9aaf88
+Author: Jeff Smith <whydoubt(a)yahoo.com>
+Date: Sun Jun 15 01:42:14 2008 -0500
+
+ Check for XINPUT ABI 3.
+
+ Signed-off-by: Peter Hutterer <peter(a)cs.unisa.edu.au>
+
+commit e72f4fbc61f4a0acf99a4b31f16fdebde9d339f1
+Author: Vinay Bondhugula <vinayb(a)vmware.com>
+Date: Wed May 21 01:36:53 2008 -0400
+
+ Don't call conversion_proc for older Xservers
+
+ There was a bug in the Xserver for a while when it didn't call a driver's
+ conversion_proc to convert device space coordinates to screen space. To fix
+ this, vmmouse starting calling that method (since January), but if this is done
+ on older versions of X, the conversion gets done twice.
+
+ The fix is to add a configure check for the right versions of X and call
+ VMMouseConvertProc() only if we are compiling against an X that has the bug.
+
+ There's some whitespace cleanup for vmmouse.c too.
+
+commit 08f6ba03b1368e23bda4d51b16e182079fe9c409
+Author: Vinay Bondhugula <vinayb(a)vmware.com>
+Date: Tue Apr 22 18:53:16 2008 -0400
+
+ Compatibility with older versions of X
+
+ - Makes the driver compile againt older versions of X (tested upto 4.3).
+ - Bump up the version number in configure.ac and the modinfo section.
+ - A couple of trivial whitespace cleanups.
+
+commit f9629096c1e0ac0e090642cf6a53674842aaf9a8
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Thu Mar 20 16:53:05 2008 -0400
+
+ vmmouse 12.5.0
+
+commit a88387f1276d598843ffa0cd3648f8bf34d10680
+Author: Matthieu Herrb <matthieu(a)bluenote.herrb.net>
+Date: Sat Mar 8 23:17:40 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit c312189cedf7526d61ced521f275ad5c4a972610
+Author: Vinay Bondhugula <vinayb(a)vmware.com>
+Date: Tue Jan 22 23:32:12 2008 -0800
+
+ Fix device to screen space coordinate conversion
+
+ The Xserver no longer calls an input device's conversion_proc to convert x and
+ y coordinates from device to screen space. This fix calls the conversion
+ routine in vmmouse.c before posting the motion event to Xserver.
+
+ Other drivers also seem to rely on conversion_proc, so the real fix should probably
+ go into Xserver's code (maybe in xserver/hw/xfree86/common/xf86Xinput.c?).
+
+commit ca3eb5abeb187a1e40ff7c36bf87d52efb999be9
+Author: Vinay Bondhugula <vinayb(a)vmware.com>
+Date: Sat Jan 19 09:07:16 2008 -0800
+
+ Fix an old sign bug for the relative mode
+
+ Higher order bits for the X and Y inputs (which could be set in case of a
+ relative mouse) were being zeroed off in VMMouseClient_GetInput. This change
+ fixes it.
+
+commit ca4cc3fed99457add3935f8a063558b51e816d74
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Tue Sep 25 16:18:53 2007 -0700
+
+ Update for 12.4.3 release.
+
+commit 4840be10e99a77d567ee9122f57c6fb6b5208cd9
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Sep 24 12:03:56 2007 -0700
+
+ Add compatibility #define for compilation on pre-X.Org
+ versions of the Xserver.
+
+commit d89b0ffc1b994fb8e19cecbab683478b599fea73
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Sep 24 11:48:39 2007 -0700
+
+ There are problems when running with old X releases with a
+ global symbol collision with the svga driver.
+
+commit b1ca22c8bdaa2450d98d5043b504d4a4fe412128
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Sep 10 21:17:12 2007 -0700
+
+ Guard modinfo section against gcc.
+
+commit b20b4c2388a19885b8d686bbc184d69bed5585d9
+Merge: 0cd80f9... d8e1d4d...
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Sep 10 20:46:13 2007 -0700
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-vmmouse
+
+commit 0cd80f9869feef92261d0972f3d2d018a3dcfb18
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Sep 10 20:45:58 2007 -0700
+
+ Ready 12.4.2 release.
+
+ To allow for easier detection of driver version by other VMware tools,
+ we are embedding the version in a .modinfo section so that the Linux
+ kernel 'modinfo' tool can be (ab)used to check it.
+
+commit d8e1d4d1f4eeeb87c573810c0f0d141fe180bb01
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Tue Aug 28 17:39:11 2007 -0700
+
+ Port to new motion history/InitPointerDeviceStruct ABI
+
+ (Copied from daniels' fix to xf86-input-mouse)
+
+commit 5a4e1fe50b1a38cfc489eff49f5a729bd726cd23
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Mon Jul 9 13:46:33 2007 -0700
+
+ Add copyright statement to man page.
+
+commit e854c0c989b57e3d862c363a9c16ee4db315274f
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Tue Jun 26 14:52:32 2007 -0700
+
+ Update the man page to more closely reflect reality.
+ Problems pointed out by Jason MacIntyre. Thanks!
+
+commit 078666eac54f5672e5e7df2f79c92ac412976cd9
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Mar 1 10:36:23 2007 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit ceb33299a512f368529dd052f4acab695b172c7f
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Mar 1 10:35:12 2007 -0800
+
+ Replace references to XFree86/XF86Config in man page
+
+commit 87d047e6132d5734ab65f0ef18354608dae39ec8
+Author: Philip Langdale <philipl(a)fido2.homeip.net>
+Date: Tue Feb 27 18:02:43 2007 -0800
+
+ Under certain circumstances, typically when the kernel PS/2 driver decides
+ to reset the PS/2 device, we can find ourselves in an inconsistent state
+ between the vmmouse driver and the virtual hardware. When this is encountered,
+ we should re-request absolute mode from the hardware to get back in sync.
+
+commit 16e12c2c08a92a7bb9c11d4a359bf9904998e93f
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Fri Apr 7 18:17:10 2006 +0000
+
+ Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
+
+commit 6a74d428e2ce1ad07b9dc8b361bd7c2e71dd19d0
+Author: philipl <philipl>
+Date: Wed Mar 29 02:36:23 2006 +0000
+
+ Bump PATCHLEVEL.
+ Use the right #define when detecting a 64bit compilation. This fixes the
+ driver to actually work for 64bit builds.
+
+commit 1d7b250cbda0b96a494a17fdfb53eb971907a35b
+Author: philipl <philipl>
+Date: Mon Jan 16 23:54:15 2006 +0000
+
+ Fix for compilation with gcc4 and PIC.
+
+commit ee148a2f8ef97557ec2db501295ed8227699d2bf
+Author: philipl <philipl>
+Date: Mon Jan 9 19:12:26 2006 +0000
+
+ Initial release of the vmmouse driver for VMware virtual machines.
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/xf86-input-vmmouse-12.6.5/INSTALL new/xf86-input-vmmouse-12.6.7/INSTALL
--- old/xf86-input-vmmouse-12.6.5/INSTALL 2006-07-01 08:18:52.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/INSTALL 2010-03-18 16:26:50.000000000 +0100
@@ -1,5 +1,8 @@
-Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
-Inc.
+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.
@@ -7,7 +10,10 @@
Basic Installation
==================
- These are generic installation instructions.
+ 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
@@ -20,9 +26,9 @@
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
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@@ -32,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`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. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ 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.
@@ -64,6 +67,9 @@
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
=====================
@@ -71,10 +77,11 @@
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 variables by setting
-them in the environment. You can do that on the command line like this:
+ 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=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -83,34 +90,46 @@
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 must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+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 `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have 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.
+ 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' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+ 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
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+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=PATH' to specify different values for particular
+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.
@@ -133,13 +152,36 @@
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 host the package
-will run on. Usually `configure' can figure that out, but if it prints
-a message saying it cannot guess the host type, give it the
+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:
@@ -151,20 +193,16 @@
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 host type.
+need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+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'. In this case, you should also specify the
-build platform with `--build=TYPE', because, in this case, it may not
-be possible to guess the build platform (it sometimes involves
-compiling and running simple test programs, and this can't be done if
-the compiler is a cross compiler).
+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
================
@@ -188,9 +226,14 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+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
======================
@@ -199,7 +242,14 @@
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ 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'
@@ -226,6 +276,16 @@
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 -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/xf86-input-vmmouse-12.6.5/Makefile.am new/xf86-input-vmmouse-12.6.7/Makefile.am
--- old/xf86-input-vmmouse-12.6.5/Makefile.am 2008-10-22 18:02:09.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/Makefile.am 2010-02-26 17:59:14.000000000 +0100
@@ -18,5 +18,14 @@
# 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.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src tools fdi man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: 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/xf86-input-vmmouse-12.6.5/config.h.in new/xf86-input-vmmouse-12.6.7/config.h.in
--- old/xf86-input-vmmouse-12.6.5/config.h.in 2009-07-29 20:11:14.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/config.h.in 2010-03-18 16:26:16.000000000 +0100
@@ -41,6 +41,10 @@
/* Has version 1.1.0 or greater of the Xserver */
#undef HAVE_XORG_SERVER_1_1_0
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Do not include built-in mouse module fallback */
#undef NO_MOUSE_MODULE
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/xf86-input-vmmouse-12.6.5/configure.ac new/xf86-input-vmmouse-12.6.7/configure.ac
--- old/xf86-input-vmmouse-12.6.5/configure.ac 2009-07-29 20:11:04.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/configure.ac 2010-03-18 16:23:24.000000000 +0100
@@ -22,16 +22,22 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.5,
+ 12.6.7,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
+XORG_DEFAULT_OPTIONS
+
DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME])
@@ -44,24 +50,6 @@
AH_TOP([#include "xorg-server.h"])
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
-
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
@@ -102,7 +90,6 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
@@ -127,7 +114,4 @@
# Checks for header files.
AC_HEADER_STDC
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile])
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/xf86-input-vmmouse-12.6.5/man/Makefile.am new/xf86-input-vmmouse-12.6.7/man/Makefile.am
--- old/xf86-input-vmmouse-12.6.5/man/Makefile.am 2008-10-24 06:27:37.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/man/Makefile.am 2010-02-26 17:59:14.000000000 +0100
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# 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 copyright holders 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 copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
#
man_MANS = @DRIVER_NAME@_detect.1
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/xf86-input-vmmouse-12.6.5/missing new/xf86-input-vmmouse-12.6.7/missing
--- old/xf86-input-vmmouse-12.6.5/missing 2007-02-27 20:35:39.000000000 +0100
+++ new/xf86-input-vmmouse-12.6.7/missing 2010-02-26 17:59:39.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/xf86-input-vmmouse-12.6.5/src/vmmouse.c new/xf86-input-vmmouse-12.6.7/src/vmmouse.c
--- old/xf86-input-vmmouse-12.6.5/src/vmmouse.c 2009-08-06 19:23:09.000000000 +0200
+++ new/xf86-input-vmmouse-12.6.7/src/vmmouse.c 2010-02-26 17:59:14.000000000 +0100
@@ -97,14 +97,11 @@
/*
* Version constants
*/
-#define VMMOUSE_MAJOR_VERSION 12
-#define VMMOUSE_MINOR_VERSION 6
-#define VMMOUSE_PATCHLEVEL 5
#define VMMOUSE_DRIVER_VERSION \
- (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
+ (PACKAGE_VERSION_MAJOR * 65536 + PACKAGE_VERSION_MINOR * 256 + PACKAGE_VERSION_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
- VMW_STRING(VMMOUSE_MAJOR_VERSION) "." VMW_STRING(VMMOUSE_MINOR_VERSION) \
- "." VMW_STRING(VMMOUSE_PATCHLEVEL)
+ VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \
+ "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL)
/*
* Standard four digit version string expected by VMware Tools installer.
@@ -146,6 +143,7 @@
Bool absoluteRequested;
} VMMousePrivRec, *VMMousePrivPtr;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
static const char *reqSymbols[] = {
"InitPointerDeviceStruct",
"LoaderSymbol",
@@ -192,6 +190,7 @@
"Xstrdup",
NULL
};
+#endif
InputDriverRec VMMOUSE = {
1,
@@ -1175,7 +1174,9 @@
{
static Bool Initialised = FALSE;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
xf86LoaderReqSymLists(reqSymbols, NULL);
+#endif
if (!Initialised)
Initialised = TRUE;
@@ -1213,7 +1214,7 @@
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- VMMOUSE_MAJOR_VERSION, VMMOUSE_MINOR_VERSION, VMMOUSE_PATCHLEVEL,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package vim for openSUSE:Factory
checked in at Wed Mar 31 20:01:11 CEST 2010.
--------
--- vim/vim.changes 2010-02-09 17:02:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/vim/vim.changes 2010-03-27 11:46:37.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Mar 27 11:48:28 CET 2010 - vuntz(a)opensuse.org
+
+- Use the icon from the tarball instead of our custom icon. It
+ looks much better.
+- Drop gvim.png from the source package.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gvim.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim.spec ++++++
--- /var/tmp/diff_new_pack.JHPdZe/_old 2010-03-31 20:00:33.000000000 +0200
+++ /var/tmp/diff_new_pack.JHPdZe/_new 2010-03-31 20:00:33.000000000 +0200
@@ -20,7 +20,7 @@
Name: vim
Version: 7.2
-Release: 17
+Release: 18
#
License: Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
Group: Productivity/Editors/Vi
@@ -69,7 +69,6 @@
Source13: vitmp.c
Source14: vitmp.1
Source15: vim132
-Source16: gvim.png
Source18: missing-vim-client
Source19: gvim.desktop
Source20: spec.skeleton
@@ -390,6 +389,9 @@
gcc %{optflags} %{S:13} -o vitmp
%install
+#
+# create icon directory to have the icon from the tarball installed
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%makeinstall STRIP=:
# the last installed binary is gvim. preserve it and
# fix its symlinks. e* was added here as it doesnt make much sense in
@@ -693,7 +695,7 @@
%{_bindir}/rgvim
# menu icon
%{_datadir}/applications/gvim.desktop
-%{_datadir}/pixmaps/gvim.png
+%{_datadir}/icons/hicolor/48x48/apps/gvim.png
%if 0%{?with_splitted_gvim}
%files -n gvim-enhanced
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org