November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Nov 12 14:40:10 CET 2010. -------- --- sysconfig/sysconfig.changes 2010-09-14 12:41:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2010-11-11 14:44:53.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 11 13:38:17 UTC 2010 - mt(a)suse.de + +- version 0.74.2 +- Adopted to search tunctl in /sbin (bnc#650468) +- Fixed check if ipv6 is enabled in ifup-dhcp (bnc#616765). +- Fixed ifplugd-selectif script to use -1 as default carrier + flag and initialize interface type when unset to correctly + print wireless instead of cable messages (bnc#637183). +- Require wpa_supplicant if a wpa_supplicant config is specified +- Improved ifup-bridge port prio and cost handling. + Allow to specify '-' in BRIDGE_PORTPRIORITIES or BRIDGE_PATHCOSTS + lists to skip setting of the port prio or path cost for particular + ports while setting it for others. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysconfig-0.74.1.tar.bz2 sysconfig-no-network-in-runlevel2.diff New: ---- sysconfig-0.74.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.cXur47/_old 2010-11-12 14:39:14.000000000 +0100 +++ /var/tmp/diff_new_pack.cXur47/_new 2010-11-12 14:39:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.74.1) +# spec file for package sysconfig (Version 0.74.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: sysconfig -Version: 0.74.1 -Release: 2 +Version: 0.74.2 +Release: 1 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -30,7 +30,6 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch1: sysconfig-no-network-in-runlevel2.diff %description This package provides the SuSE system configuration scheme and @@ -50,7 +49,6 @@ %prep %setup -n sysconfig-%{version} -%patch1 -p0 %build autoreconf --force --install ++++++ sysconfig-0.74.1.tar.bz2 -> sysconfig-0.74.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/ChangeLog new/sysconfig-0.74.2/ChangeLog --- old/sysconfig-0.74.1/ChangeLog 2010-08-18 15:08:55.000000000 +0200 +++ new/sysconfig-0.74.2/ChangeLog 2010-11-11 14:42:45.000000000 +0100 @@ -1,4 +1,67 @@ -commit 42ee59a584f0c6dfe62706dd9d85ce2b68f70bf6 (HEAD, origin/master, export/master, master) +commit 7cda3f6f76b177f2cbc3aa91e84fffbba2508ffa (HEAD, master) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Nov 11 14:42:03 2010 +0100 + + version 0.74.2, updated sysconfig.changes + +commit 7dc34b79f63f67a53d1f1a2f6596f66e113d89ff +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Nov 11 14:34:35 2010 +0100 + + ifup-tunnel: adopted to search tunctl in /sbin + + Adopted to search tunctl in /sbin (bnc#650468) + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit 8992f269e65472de130c38506d3566af8a21d18c +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Thu Nov 11 14:26:45 2010 +0100 + + ifup-dhcp: fix for check whether ipv6 is enabled + + Fixed check whether ipv6 is enabled or not in /sbin/ifup-dhcp + (again). The last fix, disabled dhcpv6 completely (bnc#616765). + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit 7a325b566171b4c696c7e55567f6ba2aea59fe20 (origin/master, export/master) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Oct 26 13:16:42 2010 +0200 + + Fixed carrier messages in ifplugd-selectif script + + Fixed ifplugd-selectif script to use -1 as default carrier + flag and initialize interface type when unset to correctly + print wireless instead of cable messages (bnc#637183). + +commit a41583749b9bffbd1918f1a9a2d7449f292b4811 +Author: Ludwig Nussel <ludwig.nussel(a)suse.de> +Date: Wed Oct 6 12:01:42 2010 +0200 + + require wpa_supplicant if a wpa_supplicant config is specified + +commit 17537e86e6671419a3d059d788673940cac64451 (test) +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Wed Oct 6 11:43:57 2010 +0200 + + Improved ifup-bridge port prio and cost handling + + Allow to specify '-' in BRIDGE_PORTPRIORITIES or BRIDGE_PATHCOSTS + lists to skip setting of the port prio or path cost for particular + ports while setting it for others. + + Signed-off-by: Marius Tomaschewski <mt(a)suse.de> + +commit bc1e6735c451ba2d3b4d1582648ea6c76e873a4d +Author: Marius Tomaschewski <mt(a)suse.de> +Date: Tue Sep 28 18:40:25 2010 +0200 + + rcnetwork: do not start network in runlevel 2 + + Fixed init flags to not start network in runlevel 2 (bnc#638508). + +commit 42ee59a584f0c6dfe62706dd9d85ce2b68f70bf6 Author: Marius Tomaschewski <mt(a)suse.de> Date: Wed Aug 18 14:33:45 2010 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/configure new/sysconfig-0.74.2/configure --- old/sysconfig-0.74.1/configure 2010-08-18 15:08:13.000000000 +0200 +++ new/sysconfig-0.74.2/configure 2010-11-11 14:42:39.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for sysconfig 0.74.1. +# Generated by GNU Autoconf 2.63 for sysconfig 0.74.2. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -746,8 +746,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.74.1' -PACKAGE_STRING='sysconfig 0.74.1' +PACKAGE_VERSION='0.74.2' +PACKAGE_STRING='sysconfig 0.74.2' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -1479,7 +1479,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.74.1 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.74.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1549,7 +1549,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.74.1:";; + short | recursive ) echo "Configuration of sysconfig 0.74.2:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.74.1 +sysconfig configure 0.74.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1663,7 +1663,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.74.1, which was +It was created by sysconfig $as_me 0.74.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2383,7 +2383,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.74.1' + VERSION='0.74.2' cat >>confdefs.h <<_ACEOF @@ -12360,7 +12360,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.74.1, which was +This file was extended by sysconfig $as_me 0.74.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12414,7 +12414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -sysconfig config.status 0.74.1 +sysconfig config.status 0.74.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/doc/ifcfg-bridge.5 new/sysconfig-0.74.2/doc/ifcfg-bridge.5 --- old/sysconfig-0.74.1/doc/ifcfg-bridge.5 2010-01-20 17:57:54.000000000 +0100 +++ new/sysconfig-0.74.2/doc/ifcfg-bridge.5 2010-11-05 14:01:26.000000000 +0100 @@ -46,12 +46,14 @@ .B BRIDGE_PATHCOSTS <costs1 costs2 ... costsN> This is a space-separated list of costs corresponding to the interfaces in BRIDGE_PORTS. Each interface in BRIDGE_PORTS could have a different speed and this value is used when -deciding which link to use. Faster interfaces should have lower costs. +deciding which link to use. Faster interfaces should have lower costs. +Use '-' to skip setting of the path costs for a port in a non-empty cost list. .TP .B BRIDGE_PORTPRIORITIES <prio1 prio2 ... prioN> This is a space-separated list of priorities corresponding to the interfaces in BRIDGE_PORTS. The priority value is an unsigned 8-bit quantity (a number between 0 and 255), and has no dimension. This metric is used in the designated port and root port selection algorithms. +Use '-' to skip setting of the priority for a port in a non-empty priority list. .TP .B BRIDGE_PRIORITY <priority> This option sets the bridge's priority to <priority>. The priority value is an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/ifplugd-selectif new/sysconfig-0.74.2/scripts/ifplugd-selectif --- old/sysconfig-0.74.1/scripts/ifplugd-selectif 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.2/scripts/ifplugd-selectif 2010-11-02 10:14:23.000000000 +0100 @@ -34,7 +34,7 @@ # . scripts/extradebug get_carrier() { - local -i carrier=0 count=40 + local -i carrier=-1 count=40 local check=/sys/class/net/${1}/carrier while ((count-- > 0)) ; do test -e $check && read -t 1 carrier < $check 2>/dev/null @@ -54,6 +54,7 @@ INTERFACE=$1 ACTION=$2 INTERFACETYPE=$3 # may be empty +test -z "$INTERFACETYPE" && INTERFACETYPE=`get_iface_type $INTERFACE` # Check all available interfaces if they have a ifplugd priority and collect # two ordered lists of interfaces with minor or major priority. @@ -166,7 +167,7 @@ info_mesg "`printf " %-9s has priority %s" "$INTERFACE" "$PRIORITY"`" if [ $PRIORITY -gt 0 ] ; then for IF in $MAJOR; do - test "`get_carrier $IF`" == 1|| continue + test "x`get_carrier $IF`" == x1 || continue mesg "`printf " %-9s has lesser priority than '%s'" \ "$INTERFACE" "$IF"`" exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/ifup-bridge new/sysconfig-0.74.2/scripts/ifup-bridge --- old/sysconfig-0.74.1/scripts/ifup-bridge 2010-01-21 16:39:40.000000000 +0100 +++ new/sysconfig-0.74.2/scripts/ifup-bridge 2010-11-05 14:01:26.000000000 +0100 @@ -150,14 +150,16 @@ # set path costs if [ -n "$BRIDGE_PATHCOSTS" ]; then COSTS=(${BRIDGE_PATHCOSTS}) - if test -n "${COSTS[$COUNTER]}" ; then + if test "x${COSTS[$COUNTER]}" != "x" -a \ + "x${COSTS[$COUNTER]}" != "x-" ; then brctl setpathcost $INTERFACE $PORT_INTERFACE ${COSTS[$COUNTER]} fi fi # set port prio if [ -n "$BRIDGE_PORTPRIORITIES" ]; then PRIOS=(${BRIDGE_PORTPRIORITIES}) - if test -n "${PRIOS[$COUNTER]}" ; then + if test "x${PRIOS[$COUNTER]}" != "x" -a \ + "x${PRIOS[$COUNTER]}" != "x-" ; then brctl setportprio $INTERFACE $PORT_INTERFACE ${PRIOS[$COUNTER]} fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/ifup-dhcp new/sysconfig-0.74.2/scripts/ifup-dhcp --- old/sysconfig-0.74.1/scripts/ifup-dhcp 2010-08-17 10:15:31.000000000 +0200 +++ new/sysconfig-0.74.2/scripts/ifup-dhcp 2010-11-05 14:06:58.000000000 +0100 @@ -199,11 +199,13 @@ ;; *) HAVE_IPv6=yes - test -d /proc/sys/net/ipv6 && { + if test -d /proc/sys/net/ipv6 ; then val1=`cat "/proc/sys/net/ipv6/conf/$INTERFACE/disable_ipv6" 2>/dev/null` val2=`cat "/proc/sys/net/ipv6/conf/all/disable_ipv6" 2>/dev/null` test "x$val1" = x1 -o "x$val2" = x1 && HAVE_IPv6=no - } || HAVE_IPv6=no + else + HAVE_IPv6=no + fi clients=0 bootprotos=(${BOOTPROTOS[@]}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/ifup-tunnel new/sysconfig-0.74.2/scripts/ifup-tunnel --- old/sysconfig-0.74.1/scripts/ifup-tunnel 2010-01-21 16:39:40.000000000 +0100 +++ new/sysconfig-0.74.2/scripts/ifup-tunnel 2010-11-11 14:22:10.000000000 +0100 @@ -196,7 +196,7 @@ # function returning the path of tunctl utility (in /usr on 10.3) tunctl_bin () { - for tunctl in /bin/tunctl /usr/bin/tunctl ; do + for tunctl in /sbin/tunctl /bin/tunctl /usr/bin/tunctl ; do test -x "$tunctl" && echo "$tunctl" done echo "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/ifup-wireless new/sysconfig-0.74.2/scripts/ifup-wireless --- old/sysconfig-0.74.1/scripts/ifup-wireless 2010-08-18 13:59:38.000000000 +0200 +++ new/sysconfig-0.74.2/scripts/ifup-wireless 2010-11-05 14:01:26.000000000 +0100 @@ -146,6 +146,9 @@ need_wpa_supplicant() { + if [ -n "$WIRELESS_WPA_CONF" ]; then + return 0 + fi case "$WIRELESS_AUTH_MODE" in wpa-*|WPA-*|psk|PSK|eap|EAP) return 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/network new/sysconfig-0.74.2/scripts/network --- old/sysconfig-0.74.1/scripts/network 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.2/scripts/network 2010-11-05 14:01:26.000000000 +0100 @@ -34,7 +34,7 @@ # Should-Start: earlysyslog isdn openibd SuSEfirewall2_init # Required-Stop: $local_fs # Should-Stop: isdn openibd SuSEfirewall2_init -# Default-Start: 2 3 5 +# Default-Start: 3 5 # Default-Stop: # Short-Description: Configure the localfs depending network interfaces # Description: Configure the localfs depending network interfaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/scripts/network-remotefs new/sysconfig-0.74.2/scripts/network-remotefs --- old/sysconfig-0.74.1/scripts/network-remotefs 2010-06-08 10:56:35.000000000 +0200 +++ new/sysconfig-0.74.2/scripts/network-remotefs 2010-11-05 14:01:26.000000000 +0100 @@ -30,7 +30,7 @@ # Should-Start: # Required-Stop: $network $remote_fs # Should-Stop: -# Default-Start: 2 3 5 +# Default-Start: 3 5 # Default-Stop: # Short-Description: Configure the remote-fs depending network interfaces # Description: Configure the remote-fs depending network interfaces as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/sysconfig.spec new/sysconfig-0.74.2/sysconfig.spec --- old/sysconfig-0.74.1/sysconfig.spec 2010-08-18 15:08:22.000000000 +0200 +++ new/sysconfig-0.74.2/sysconfig.spec 2010-11-11 14:42:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.74.1) +# spec file for package sysconfig (Version 0.74.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: sysconfig -Version: 0.74.1 +Version: 0.74.2 Release: 0 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.74.1/VERSION new/sysconfig-0.74.2/VERSION --- old/sysconfig-0.74.1/VERSION 2010-08-18 14:32:26.000000000 +0200 +++ new/sysconfig-0.74.2/VERSION 2010-11-11 14:40:18.000000000 +0100 @@ -1 +1 @@ -0.74.1 +0.74.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit nss-shared-helper for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package nss-shared-helper for openSUSE:Factory checked in at Fri Nov 12 14:39:07 CET 2010. -------- --- nss-shared-helper/nss-shared-helper.changes 2010-04-05 11:36:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/nss-shared-helper/nss-shared-helper.changes 2010-10-31 19:04:03.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss-shared-helper.spec ++++++ --- /var/tmp/diff_new_pack.TQDf3s/_old 2010-11-12 14:38:33.000000000 +0100 +++ /var/tmp/diff_new_pack.TQDf3s/_new 2010-11-12 14:38:33.000000000 +0100 @@ -20,10 +20,10 @@ Name: nss-shared-helper BuildRequires: mozilla-nss-devel pkg-config Version: 1.0.9 -Release: 1 +Release: 4 Summary: Helper functions for sharing NSS database Group: Development/Libraries/C and C++ -License: LGPLv2.0+ +License: GPLv2+ Source0: nss-shared-helper-%{version}.tar.bz2 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -65,7 +65,7 @@ %build %configure -%__make %{?jobs:-j%jobs}; +%__make %{?_smp_mflags}; %install %makeinstall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit poppler for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at Fri Nov 12 14:39:01 CET 2010. -------- --- GNOME/poppler/poppler.changes 2010-10-09 11:04:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/poppler/poppler.changes 2010-11-11 11:40:22.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 10:40:04 UTC 2010 - coolo(a)novell.com + +- own parent directories for poppler-qt + +------------------------------------------------------------------- poppler-qt.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.k3OoxN/_old 2010-11-12 14:38:38.000000000 +0100 +++ /var/tmp/diff_new_pack.k3OoxN/_new 2010-11-12 14:38:38.000000000 +0100 @@ -35,7 +35,7 @@ BuildRequires: zlib-devel BuildRequires: pkg-config Version: 0.14.4 -Release: 1 +Release: 2 # Actual version of poppler-data: %define poppler_data_version 0.2.1 %define poppler_soname 7 @@ -269,12 +269,14 @@ %files -n libpoppler-qt3-devel %defattr (-, root, root) +%dir %{_includedir}/poppler %{_includedir}/poppler/qt3 %{_libdir}/libpoppler-qt.so %{_libdir}/pkgconfig/poppler-qt.pc %files -n libpoppler-qt4-devel %defattr (-, root, root) +%dir %{_includedir}/poppler %{_includedir}/poppler/qt4 %{_libdir}/libpoppler-qt4.so %{_libdir}/pkgconfig/poppler-qt4.pc ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.k3OoxN/_old 2010-11-12 14:38:38.000000000 +0100 +++ /var/tmp/diff_new_pack.k3OoxN/_new 2010-11-12 14:38:38.000000000 +0100 @@ -35,7 +35,7 @@ BuildRequires: zlib-devel BuildRequires: pkg-config Version: 0.14.4 -Release: 1 +Release: 2 # Actual version of poppler-data: %define poppler_data_version 0.2.1 %define poppler_soname 7 @@ -269,12 +269,14 @@ %files -n libpoppler-qt3-devel %defattr (-, root, root) +%dir %{_includedir}/poppler %{_includedir}/poppler/qt3 %{_libdir}/libpoppler-qt.so %{_libdir}/pkgconfig/poppler-qt.pc %files -n libpoppler-qt4-devel %defattr (-, root, root) +%dir %{_includedir}/poppler %{_includedir}/poppler/qt4 %{_libdir}/libpoppler-qt4.so %{_libdir}/pkgconfig/poppler-qt4.pc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit xorg-x11-fonts for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at Fri Nov 12 14:36:43 CET 2010. -------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2010-10-30 18:10:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2010-11-11 10:26:29.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Nov 11 09:12:51 UTC 2010 - sndirsch(a)novell.com + +- font-bh-ttf 1.0.3 + * This bug-fix release fixes the installation path of the + fontconfig 42-luxi-mono.conf files introduced in 1.0.2, plus + adds support for finding the correct fontconfig path from the + fontconfig.pc file variables added recently in fontconfig git. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- font-bh-ttf-1.0.2.tar.bz2 New: ---- font-bh-ttf-1.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.iOj5Pj/_old 2010-11-12 14:35:19.000000000 +0100 +++ /var/tmp/diff_new_pack.iOj5Pj/_new 2010-11-12 14:35:19.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 6 +Release: 7 License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +39,7 @@ Source4: font-bh-75dpi-1.0.2.tar.bz2 Source5: font-bh-lucidatypewriter-100dpi-1.0.2.tar.bz2 Source6: font-bh-lucidatypewriter-75dpi-1.0.2.tar.bz2 -Source7: font-bh-ttf-1.0.2.tar.bz2 +Source7: font-bh-ttf-1.0.3.tar.bz2 Source8: font-bh-type1-1.0.2.tar.bz2 Source9: font-bitstream-100dpi-1.0.2.tar.bz2 Source10: font-bitstream-75dpi-1.0.2.tar.bz2 ++++++ font-bh-ttf-1.0.2.tar.bz2 -> font-bh-ttf-1.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/aclocal.m4 new/font-bh-ttf-1.0.3/aclocal.m4 --- old/font-bh-ttf-1.0.2/aclocal.m4 2010-10-05 08:51:15.000000000 +0200 +++ new/font-bh-ttf-1.0.3/aclocal.m4 2010-11-11 06:25:31.000000000 +0100 @@ -1018,7 +1018,7 @@ dnl fontutil.m4. Generated from fontutil.m4.in by configure. dnl -dnl This file comes from X.Org's font-util 1.1.2 +dnl This file comes from X.Org's font-util 1.2.0 dnl dnl Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. dnl @@ -1083,7 +1083,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_FONT_MACROS_VERSION],[ -m4_define([vers_have], [1.1.2]) +m4_define([vers_have], [1.2.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1132,7 +1132,7 @@ AC_ARG_ENABLE(m4_tolower($1), AS_HELP_STRING(m4_join([-], [--disable], m4_tolower($1)), [Build $1 fonts (default: yes)]), - [AS_TR_SH($1)=$enableval], [AS_TR_SH($1)=yes]) + [AS_TR_SH($1)=$enableval]) AC_MSG_CHECKING([whether to build $1 fonts]) AC_MSG_RESULT($[AS_TR_SH($1)]) AM_CONDITIONAL(AS_TR_SH($1), [test "x$AS_TR_SH($1)" = xyes]) @@ -1141,9 +1141,19 @@ # XORG_FONT_CHECK_ENCODING_LIST(encoding1 encoding2....) # ----------------------------------------------------- # Minimum version: 1.1.0 -# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once +# Call XORG_FONT_CHECK_ENCODING for multiple encodings at once. +# Add a shorthand --enable/disable-all-encodings option. AC_DEFUN([XORG_FONT_CHECK_ENCODING_LIST],[ + AC_ARG_ENABLE([all-encodings], + AS_HELP_STRING([--disable-all-encodings], + [Disable building of all font encodings]), + [m4_foreach_w([enc], [$1], [ + AS_TR_SH(enc)=$enableval + ])], + [m4_foreach_w([enc], [$1], [ + AS_TR_SH(enc)=yes + ])]) m4_foreach_w([enc], [$1], [XORG_FONT_CHECK_ENCODING(enc)]) ]) # XORG_FONT_CHECK_ENCODING_LIST @@ -1274,6 +1284,40 @@ +# XORG_FONT_FC_CONFDIR() +# -------------------- +# Minimum version: 1.2.0 +# +# Sets FC_CONFDIR to the fontconfig config directory +# (which should be --with-confdir=... when building fontconfig) +# found from: +# --with-fc-confdir=... +# pkg-config --variable=confdir fontconfig +# ${sysconfdir}/fonts + +AC_DEFUN([XORG_FONT_FC_CONFDIR],[ + dnl Ensure $PKG_CONFIG is set first + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + AC_MSG_CHECKING([for fontconfig's configuration directory]) + AC_ARG_WITH(fc-confdir, + AS_HELP_STRING([--with-fc-confdir=DIR], + [Path to fontconfig's configuration directory]), + [FC_CONFDIR="$withval"]) + # if --with-fc-confdir was not specified + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR=`$PKG_CONFIG --variable=confdir fontconfig` + fi + # ...and if pkg-config didn't find confdir in fontconfig.pc... + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR="${sysconfdir}/fonts" + fi + AC_SUBST(FC_CONFDIR) + AC_MSG_RESULT([${FC_CONFDIR}]) +]) + + + # XORG_FONTROOTDIR() # -------------------- # Minimum version: 1.1.0 @@ -1374,7 +1418,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.10.1]) +m4_define([vers_have], [1.11.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1683,15 +1727,17 @@ AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO([MIN-VERSION]) +# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-xmlto option, it allows maximum flexibilty in making decisions -# as whether or not to use the xmlto package. +# as whether or not to use the xmlto package. When DEFAULT is not specified, +# --with-xmlto assumes 'auto'. # # Interface to module: # HAVE_XMLTO: used in makefiles to conditionally generate documentation @@ -1708,10 +1754,12 @@ # AC_DEFUN([XORG_WITH_XMLTO],[ AC_ARG_VAR([XMLTO], [Path to xmlto command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xmlto, AS_HELP_STRING([--with-xmlto], - [Use xmlto to regenerate documentation (default: yes, if installed)]), - [use_xmlto=$withval], [use_xmlto=auto]) + [Use xmlto to regenerate documentation (default: ]_defopt[)]), + [use_xmlto=$withval], [use_xmlto=]_defopt) +m4_undefine([_defopt]) if test "x$use_xmlto" = x"auto"; then AC_PATH_PROG([XMLTO], [xmlto]) @@ -1765,15 +1813,17 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) ]) # XORG_WITH_XMLTO -# XORG_WITH_ASCIIDOC([MIN-VERSION]) +# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-asciidoc option, it allows maximum flexibilty in making decisions -# as whether or not to use the asciidoc package. +# as whether or not to use the asciidoc package. When DEFAULT is not specified, +# --with-asciidoc assumes 'auto'. # # Interface to module: # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation @@ -1786,10 +1836,12 @@ # AC_DEFUN([XORG_WITH_ASCIIDOC],[ AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(asciidoc, AS_HELP_STRING([--with-asciidoc], - [Use asciidoc to regenerate documentation (default: yes, if installed)]), - [use_asciidoc=$withval], [use_asciidoc=auto]) + [Use asciidoc to regenerate documentation (default: ]_defopt[)]), + [use_asciidoc=$withval], [use_asciidoc=]_defopt) +m4_undefine([_defopt]) if test "x$use_asciidoc" = x"auto"; then AC_PATH_PROG([ASCIIDOC], [asciidoc]) @@ -1830,15 +1882,17 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) ]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN([MIN-VERSION]) +# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT]) # -------------------------------- # Minimum version: 1.5.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-doxygen option, it allows maximum flexibilty in making decisions -# as whether or not to use the doxygen package. +# as whether or not to use the doxygen package. When DEFAULT is not specified, +# --with-doxygen assumes 'auto'. # # Interface to module: # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation @@ -1851,10 +1905,12 @@ # AC_DEFUN([XORG_WITH_DOXYGEN],[ AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(doxygen, AS_HELP_STRING([--with-doxygen], - [Use doxygen to regenerate documentation (default: yes, if installed)]), - [use_doxygen=$withval], [use_doxygen=auto]) + [Use doxygen to regenerate documentation (default: ]_defopt[)]), + [use_doxygen=$withval], [use_doxygen=]_defopt) +m4_undefine([_defopt]) if test "x$use_doxygen" = x"auto"; then AC_PATH_PROG([DOXYGEN], [doxygen]) @@ -1895,15 +1951,17 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) ]) # XORG_WITH_DOXYGEN -# XORG_WITH_GROFF +# XORG_WITH_GROFF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-groff option, it allows maximum flexibilty in making decisions -# as whether or not to use the groff package. +# as whether or not to use the groff package. When DEFAULT is not specified, +# --with-groff assumes 'auto'. # # Interface to module: # HAVE_GROFF: used in makefiles to conditionally generate documentation @@ -1932,10 +1990,12 @@ # AC_DEFUN([XORG_WITH_GROFF],[ AC_ARG_VAR([GROFF], [Path to groff command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(groff, AS_HELP_STRING([--with-groff], - [Use groff to regenerate documentation (default: yes, if installed)]), - [use_groff=$withval], [use_groff=auto]) + [Use groff to regenerate documentation (default: ]_defopt[)]), + [use_groff=$withval], [use_groff=]_defopt) +m4_undefine([_defopt]) if test "x$use_groff" = x"auto"; then AC_PATH_PROG([GROFF], [groff]) @@ -1998,15 +2058,17 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP +# XORG_WITH_FOP([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-fop option, it allows maximum flexibilty in making decisions -# as whether or not to use the fop package. +# as whether or not to use the fop package. When DEFAULT is not specified, +# --with-fop assumes 'auto'. # # Interface to module: # HAVE_FOP: used in makefiles to conditionally generate documentation @@ -2019,10 +2081,12 @@ # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], - [Use fop to regenerate documentation (default: yes, if installed)]), - [use_fop=$withval], [use_fop=auto]) + [Use fop to regenerate documentation (default: ]_defopt[)]), + [use_fop=$withval], [use_fop=]_defopt) +m4_undefine([_defopt]) if test "x$use_fop" = x"auto"; then AC_PATH_PROG([FOP], [fop]) @@ -2049,15 +2113,17 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -# XORG_WITH_PS2PDF +# XORG_WITH_PS2PDF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 +# Minimum version for optional DEFAULT argument: 1.11.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with # the --with-ps2pdf option, it allows maximum flexibilty in making decisions -# as whether or not to use the ps2pdf package. +# as whether or not to use the ps2pdf package. When DEFAULT is not specified, +# --with-ps2pdf assumes 'auto'. # # Interface to module: # HAVE_PS2PDF: used in makefiles to conditionally generate documentation @@ -2070,10 +2136,12 @@ # AC_DEFUN([XORG_WITH_PS2PDF],[ AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +m4_define([_defopt], m4_default([$1], [auto])) AC_ARG_WITH(ps2pdf, AS_HELP_STRING([--with-ps2pdf], - [Use ps2pdf to regenerate documentation (default: yes, if installed)]), - [use_ps2pdf=$withval], [use_ps2pdf=auto]) + [Use ps2pdf to regenerate documentation (default: ]_defopt[)]), + [use_ps2pdf=$withval], [use_ps2pdf=]_defopt) +m4_undefine([_defopt]) if test "x$use_ps2pdf" = x"auto"; then AC_PATH_PROG([PS2PDF], [ps2pdf]) @@ -2124,14 +2192,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DOCS],[ -default=$1 -if test "x$default" = x ; then - default="yes" -fi +m4_define([default], m4_default([$1], [yes])) AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs], - [Enable building the documentation (default: yes)]), - [build_docs=$enableval], [build_docs=$default]) + [Enable building the documentation (default: ]default[)]), + [build_docs=$enableval], [build_docs=]default) +m4_undefine([default]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AC_MSG_CHECKING([whether to build documentation]) AC_MSG_RESULT([$build_docs]) @@ -2159,14 +2225,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ -devel_default=$1 -if test "x$devel_default" = x ; then - devel_default="yes" -fi +m4_define([devel_default], m4_default([$1], [yes])) AC_ARG_ENABLE(devel-docs, AS_HELP_STRING([--enable-devel-docs], - [Enable building the developer documentation (default: yes)]), - [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) + [Enable building the developer documentation (default: ]devel_default[)]), + [build_devel_docs=$enableval], [build_devel_docs=]devel_default) +m4_undefine([devel_default]) AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) AC_MSG_CHECKING([whether to build developer documentation]) AC_MSG_RESULT([$build_devel_docs]) @@ -2194,14 +2258,12 @@ # parm1: specify the default value, yes or no. # AC_DEFUN([XORG_ENABLE_SPECS],[ -spec_default=$1 -if test "x$spec_default" = x ; then - spec_default="yes" -fi +m4_define([spec_default], m4_default([$1], [yes])) AC_ARG_ENABLE(specs, AS_HELP_STRING([--enable-specs], - [Enable building the specs (default: yes)]), - [build_specs=$enableval], [build_specs=$spec_default]) + [Enable building the specs (default: ]spec_default[)]), + [build_specs=$enableval], [build_specs=]spec_default) +m4_undefine([spec_default]) AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) AC_MSG_CHECKING([whether to build functional specifications]) AC_MSG_RESULT([$build_specs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/ChangeLog new/font-bh-ttf-1.0.3/ChangeLog --- old/font-bh-ttf-1.0.2/ChangeLog 2010-10-05 08:51:19.000000000 +0200 +++ new/font-bh-ttf-1.0.3/ChangeLog 2010-11-11 06:25:40.000000000 +0100 @@ -1,3 +1,34 @@ +commit 65a15b8dfe79e1941c85a96aaa48b8ec1369a9e4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Nov 10 21:24:40 2010 -0800 + + font-bh-ttf 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4f6484b0a4834ffa2d7f69c61b12fc8dcbfaacd6 +Author: Jeremy Huddleston <jeremyhu(a)apple.com> +Date: Wed Oct 6 17:08:56 2010 -0700 + + Use XORG_FONT_FC_CONFDIR from font-util 1.2 to find fontconfig's confdir + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)apple.com> + Reviewed-by: Gaetan Nadon <memsize(a)videotron.ca> + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 1c388c46660827782879a539c8d239e01060cb52 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Oct 5 16:30:51 2010 -0700 + + Correct installation path for fontconfig files + + Should be /etc/fonts/{conf.d,conf.avail}, + not /etc/fonts/conf/{conf.d,conf.avail} + + Reported-by: Frédéric L. W. Meunier <fredlwm(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Julien Cristau <jcristau(a)debian.org> + commit 1421e1089749ddcbe5e72fa70cfc153cb107e9ae Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Mon Oct 4 23:43:59 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/configure new/font-bh-ttf-1.0.3/configure --- old/font-bh-ttf-1.0.2/configure 2010-10-05 08:51:16.000000000 +0200 +++ new/font-bh-ttf-1.0.3/configure 2010-11-11 06:25:32.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for font-bh-ttf 1.0.2. +# Generated by GNU Autoconf 2.68 for font-bh-ttf 1.0.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -561,8 +561,8 @@ # Identity of this package. PACKAGE_NAME='font-bh-ttf' PACKAGE_TARNAME='font-bh-ttf' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='font-bh-ttf 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='font-bh-ttf 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -606,6 +606,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +FC_CONFDIR MKFONTSCALE MKFONTDIR RUN_FCCACHE @@ -733,6 +734,7 @@ enable_silent_rules with_fontrootdir with_fontdir +with_fc_confdir ' ac_precious_vars='build_alias host_alias @@ -1286,7 +1288,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures font-bh-ttf 1.0.2 to adapt to many kinds of systems. +\`configure' configures font-bh-ttf 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1356,7 +1358,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of font-bh-ttf 1.0.2:";; + short | recursive ) echo "Configuration of font-bh-ttf 1.0.3:";; esac cat <<\_ACEOF @@ -1379,6 +1381,7 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-fontrootdir=DIR Path to root directory for font files --with-fontdir=DIR Path to TTF files [FONTROOTDIR/TTF] + --with-fc-confdir=DIR Path to fontconfig's configuration directory Some influential environment variables: CC C compiler command @@ -1457,7 +1460,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -font-bh-ttf configure 1.0.2 +font-bh-ttf configure 1.0.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1668,7 +1671,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by font-bh-ttf $as_me 1.0.2, which was +It was created by font-bh-ttf $as_me 1.0.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2483,7 +2486,7 @@ # Define the identity of the package. PACKAGE='font-bh-ttf' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -4581,7 +4584,7 @@ -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later @@ -4779,6 +4782,29 @@ + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig's configuration directory" >&5 +$as_echo_n "checking for fontconfig's configuration directory... " >&6; } + +# Check whether --with-fc-confdir was given. +if test "${with_fc_confdir+set}" = set; then : + withval=$with_fc_confdir; FC_CONFDIR="$withval" +fi + + # if --with-fc-confdir was not specified + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR=`$PKG_CONFIG --variable=confdir fontconfig` + fi + # ...and if pkg-config didn't find confdir in fontconfig.pc... + if test "x${FC_CONFDIR}" = "x"; then + FC_CONFDIR="${sysconfdir}/fonts" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${FC_CONFDIR}" >&5 +$as_echo "${FC_CONFDIR}" >&6; } + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF @@ -5355,7 +5381,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by font-bh-ttf $as_me 1.0.2, which was +This file was extended by font-bh-ttf $as_me 1.0.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5412,7 +5438,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -font-bh-ttf config.status 1.0.2 +font-bh-ttf config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/configure.ac new/font-bh-ttf-1.0.3/configure.ac --- old/font-bh-ttf-1.0.2/configure.ac 2010-10-05 08:50:07.000000000 +0200 +++ new/font-bh-ttf-1.0.3/configure.ac 2010-11-11 06:24:18.000000000 +0100 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT([font-bh-ttf], [1.0.2], +AC_INIT([font-bh-ttf], [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [font-bh-ttf]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -36,12 +36,13 @@ AC_PROG_INSTALL -# Require X.Org's font util macros 1.1 or later +# Require X.Org's font util macros 1.2 or later m4_ifndef([XORG_FONT_MACROS_VERSION], - [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) + [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.2) XORG_FONTDIR([TTF]) XORG_FONT_SCALED_UTILS +XORG_FONT_FC_CONFDIR AC_OUTPUT([Makefile]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/Makefile.am new/font-bh-ttf-1.0.3/Makefile.am --- old/font-bh-ttf-1.0.2/Makefile.am 2010-10-05 08:50:01.000000000 +0200 +++ new/font-bh-ttf-1.0.3/Makefile.am 2010-10-09 01:59:49.000000000 +0200 @@ -36,9 +36,8 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -fontconfigdir = $(sysconfdir)/fonts/conf -actualconfigdir = $(fontconfigdir)/conf.d -availconfigdir = $(fontconfigdir)/conf.avail +actualconfigdir = $(FC_CONFDIR)/conf.d +availconfigdir = $(FC_CONFDIR)/conf.avail dist_availconfig_DATA = 42-luxi-mono.conf EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/font-bh-ttf-1.0.2/Makefile.in new/font-bh-ttf-1.0.3/Makefile.in --- old/font-bh-ttf-1.0.2/Makefile.in 2010-10-05 08:51:17.000000000 +0200 +++ new/font-bh-ttf-1.0.3/Makefile.in 2010-11-11 06:25:32.000000000 +0100 @@ -140,6 +140,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FCCACHE = @FCCACHE@ +FC_CONFDIR = @FC_CONFDIR@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ FONTDIR = @FONTDIR@ @@ -248,9 +249,8 @@ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -fontconfigdir = $(sysconfdir)/fonts/conf -actualconfigdir = $(fontconfigdir)/conf.d -availconfigdir = $(fontconfigdir)/conf.avail +actualconfigdir = $(FC_CONFDIR)/conf.d +availconfigdir = $(FC_CONFDIR)/conf.avail dist_availconfig_DATA = 42-luxi-mono.conf EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH MAINTAINERCLEANFILES = ChangeLog INSTALL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit bluez for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at Fri Nov 12 14:36:02 CET 2010. -------- --- bluez/bluez.changes 2010-10-27 10:07:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez/bluez.changes 2010-11-09 22:44:32.000000000 +0100 @@ -1,0 +2,30 @@ +Tue Nov 9 21:36:56 UTC 2010 - seife(a)opensuse.org + +- update to bluez-4.79: + - Fix issue with adapter initialization race condition. + - Update new Bluetooth Management interface support. + +------------------------------------------------------------------- +Mon Nov 8 09:32:16 UTC 2010 - seife(a)opensuse.org + +- patch to current git to fix race condition in hciops causing + adapter detection to fail + +------------------------------------------------------------------- +Sun Nov 7 09:32:52 UTC 2010 - seife(a)opensuse.org + +- update to bluez-4.78: + - Fix various issues with AVDTP timer handling. + - Fix various issues with handling of mode changes. + - Fix issue with audio disconnect watch in connecting state. + - Fix issue with handling call waiting indicators in telephony. + - Fix issue with handling UUID parameter and RegisterEndpoint. + - Add initial support for Bluetooth Management interface. + - Add support for Application property to HealthChannel. + +------------------------------------------------------------------- +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- bluez-gstreamer.changes: same change calling whatdependson for head-i586 Old: ---- bluez-4.77.tar.bz2 New: ---- bluez-4.79.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.FAqrG1/_old 2010-11-12 14:34:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FAqrG1/_new 2010-11-12 14:34:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bluez-gstreamer (Version 4.77) +# spec file for package bluez-gstreamer (Version 4.79) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ BuildRequires: alsa-devel libsndfile-devel pkg-config udev BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel Url: http://www.bluez.org -Version: 4.77 +Version: 4.79 Release: 1 Summary: Bluetooth Sound Support Group: Productivity/Multimedia/Sound/Utilities @@ -91,7 +91,7 @@ --enable-attrib \ --enable-pcmcia \ %{?with_libcapng} -make %{?jobs:-j %jobs} all +make %{?_smp_mflags} all %install make DESTDIR=$RPM_BUILD_ROOT install ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.FAqrG1/_old 2010-11-12 14:34:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FAqrG1/_new 2010-11-12 14:34:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bluez (Version 4.77) +# spec file for package bluez (Version 4.79) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ BuildRequires: glib2-devel libnl-devel libusb-devel BuildRequires: alsa-devel libsndfile-devel pkg-config udev Url: http://www.bluez.org -Version: 4.77 +Version: 4.79 Release: 1 Summary: Bluetooth Stack for Linux Group: Hardware/Mobile @@ -210,7 +210,7 @@ --enable-attrib \ --enable-pcmcia \ %{?with_libcapng} -make %{?jobs:-j %jobs} all +make %{?_smp_mflags} all %install make DESTDIR=$RPM_BUILD_ROOT install ++++++ bluez-4.77.tar.bz2 -> bluez-4.79.tar.bz2 ++++++ ++++ 8039 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

1 0

commit xorg-x11 for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Nov 12 14:35:05 CET 2010. -------- --- xorg-x11/xorg-x11.changes 2010-11-09 10:30:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-11-11 10:17:40.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Nov 11 09:03:33 UTC 2010 - sndirsch(a)novell.com + +- xkill 1.0.3 + * This minor maintenance release provides some hopefully very + non-dangerous build configuration improvements and janitorial + cleanups. +- xrdb 1.0.7 + * This minor maintenance release provides the usual recent + collection of build configuration improvements and janitorial + cleanups. +- xrefresh 1.0.4 + * This minor maintenance release refreshes the tarball with the + usual recent collection of build configuration improvements + and janitorial cleanups. +- xset 1.2.1 + * This minor maintenance release provides the usual recent + collection of build configuration improvements and janitorial + cleanups, plus some more unusual cleanups specific to xset. +- xinput 1.5.3 + * This release brings a minor fix when checking for the device + mode. Out-of-proximity device could report the wrong mode. + The UI has two minor improvements. First, it doesn't interpret + random strings as "relative" anymore when switching modes. + Second, valuators are printed on separate lines now with the + valuator number prefixed. This is helpful for devices that + don't always report continuous valuator ranges. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xinput-1.5.2.tar.bz2 xkill-1.0.2.tar.bz2 xrdb-1.0.6.tar.bz2 xrefresh-1.0.3.tar.bz2 xset-1.2.0.tar.bz2 New: ---- xinput-1.5.3.tar.bz2 xkill-1.0.3.tar.bz2 xrdb-1.0.7.tar.bz2 xrefresh-1.0.4.tar.bz2 xset-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.ZruXu7/_old 2010-11-12 14:32:25.000000000 +0100 +++ /var/tmp/diff_new_pack.ZruXu7/_new 2010-11-12 14:32:25.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 31 +Release: 32 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -91,7 +91,7 @@ Source57: xkbevd-1.1.1.tar.bz2 Source58: xkbprint-1.0.2.tar.bz2 Source59: xkbutils-1.0.3.tar.bz2 -Source60: xkill-1.0.2.tar.bz2 +Source60: xkill-1.0.3.tar.bz2 Source61: xload-1.1.0.tar.bz2 Source62: xlogo-1.0.3.tar.bz2 Source63: xlsatoms-1.1.0.tar.bz2 @@ -108,10 +108,10 @@ Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2 Source76: xprop-1.2.0.tar.bz2 Source77: xrandr-1.3.4.tar.bz2 -Source78: xrdb-1.0.6.tar.bz2 -Source79: xrefresh-1.0.3.tar.bz2 +Source78: xrdb-1.0.7.tar.bz2 +Source79: xrefresh-1.0.4.tar.bz2 Source80: xrx-1.0.4.tar.bz2 -Source81: xset-1.2.0.tar.bz2 +Source81: xset-1.2.1.tar.bz2 Source82: xsetmode-X11R7.0-1.0.0.tar.bz2 Source83: xsetpointer-1.0.1.tar.bz2 Source84: xsetroot-1.1.0.tar.bz2 @@ -126,7 +126,7 @@ Source93: mkcomposecache-1.2.1.tar.bz2 Source94: rendercheck-1.3.tar.bz2 Source96: xbacklight-1.1.1.tar.bz2 -Source97: xinput-1.5.2.tar.bz2 +Source97: xinput-1.5.3.tar.bz2 Source98: xcompmgr-1.1.5.tar.bz2 Source99: xrestop-0.4.tar.bz2 Source100: xscope-1.3.tar.bz2 ++++++ xinput-1.5.2.tar.bz2 -> xinput-1.5.3.tar.bz2 ++++++ ++++ 10579 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/xinput-1.5.2/ChangeLog new/xinput-1.5.3/ChangeLog --- old/xinput-1.5.2/ChangeLog 2010-06-04 03:11:27.000000000 +0200 +++ new/xinput-1.5.3/ChangeLog 2010-11-11 05:00:08.000000000 +0100 @@ -1,3 +1,48 @@ +commit 13d9a0906acca18a268b8898addc1a192c5a2b12 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Nov 11 13:56:22 2010 +1000 + + xinput 1.5.3 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 84798d18421535f47a00f4bc43787432f6725032 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 11 13:46:54 2010 +1000 + + Print an error if mode is neither ABSOLUTE nor RELATIVE. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Julien Cristau <jcristau(a)debian.org> + +commit 6a794ab3ceb6d3527c0a87f610bc1d6cf26971ba +Author: Chase Douglas <chase.douglas(a)canonical.com> +Date: Thu Jul 1 18:36:42 2010 -0400 + + xinput: Split XI2 valuators and print index of events + + XI2 events support bitmask selected valuators. When printing masked + events, we need to also print the index of the valuator value. This + change prints each valuator on its own line, prefixed by its index + + Signed-off-by: Chase Douglas <chase.douglas(a)canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a5c9b0ffb969f71ec73a6c65f5135f5aa7805a38 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Jun 9 15:52:31 2010 +1000 + + list: only check the last bit in the device mode. + + This works around a bug in X servers 1.7.x, 1.8.0 and 1.8.1 where the device + mode could sometimes be binary OR'd with the OutOfProximity flag. The result + was a value of 0b10 for relative and 0b11 for Absolute, both of which were + interpreted as relative by this code. + + Affected is only the XIQueryDevice call, not the XListInputDevices call. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit 3778f707cca0b9f023a8a5fc86e26776ef6e1b6c Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Fri Jun 4 11:11:03 2010 +1000 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/xinput-1.5.2/config.h.in new/xinput-1.5.3/config.h.in --- old/xinput-1.5.2/config.h.in 2010-04-07 07:55:36.000000000 +0200 +++ new/xinput-1.5.3/config.h.in 2010-11-11 05:00:08.000000000 +0100 @@ -45,6 +45,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/xinput-1.5.2/configure.ac new/xinput-1.5.3/configure.ac --- old/xinput-1.5.2/configure.ac 2010-06-04 03:07:22.000000000 +0200 +++ new/xinput-1.5.3/configure.ac 2010-11-11 04:54:53.000000000 +0100 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xinput,[1.5.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput) +AC_INIT(xinput,[1.5.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE 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/xinput-1.5.2/src/list.c new/xinput-1.5.3/src/list.c --- old/xinput-1.5.2/src/list.c 2009-10-08 00:48:02.000000000 +0200 +++ new/xinput-1.5.3/src/list.c 2010-06-09 07:52:25.000000000 +0200 @@ -163,6 +163,10 @@ XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i]; char *name = v->label ? XGetAtomName(display, v->label) : NULL; + /* XXX: Bug in X servers 1.7..1.8.1, mode was | + OutOfProximity. Remove this once 1.9 is out. */ + v->mode &= DeviceMode; + printf("\t\tDetail for Valuator %d:\n", v->number); printf("\t\t Label: %s\n", (name) ? name : "None"); printf("\t\t Range: %f - %f\n", v->min, v->max); 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/xinput-1.5.2/src/setmode.c new/xinput-1.5.3/src/setmode.c --- old/xinput-1.5.2/src/setmode.c 2010-03-08 00:11:11.000000000 +0100 +++ new/xinput-1.5.3/src/setmode.c 2010-10-11 05:46:38.000000000 +0200 @@ -49,8 +49,11 @@ if (strcmp(argv[1], "ABSOLUTE") == 0) { mode = Absolute; - } else { + } else if (strcmp(argv[1], "RELATIVE") == 0) { mode = Relative; + } else { + fprintf(stderr, "Invalid mode, use ABSOLUTE or RELATIVE.\n"); + return EXIT_FAILURE; } device = XOpenDevice(display, info->id); 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/xinput-1.5.2/src/test_xi2.c new/xinput-1.5.3/src/test_xi2.c --- old/xinput-1.5.2/src/test_xi2.c 2010-04-29 07:42:19.000000000 +0200 +++ new/xinput-1.5.3/src/test_xi2.c 2010-07-02 03:16:51.000000000 +0200 @@ -65,13 +65,12 @@ printf(" group: locked %#x latched %#x base %#x effective: %#x\n", event->group.locked, event->group.latched, event->group.base, event->group.effective); - printf(" valuators:"); + printf(" valuators:\n"); val = event->valuators.values; for (i = 0; i < event->valuators.mask_len * 8; i++) if (XIMaskIsSet(event->valuators.mask, i)) - printf(" %.2f", *val++); - printf("\n"); + printf(" %i: %.2f\n", i, *val++); printf(" windows: root 0x%lx event 0x%lx child 0x%ld\n", event->root, event->event, event->child); ++++++ xkill-1.0.2.tar.bz2 -> xkill-1.0.3.tar.bz2 ++++++ ++++ 8664 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/xkill-1.0.2/ChangeLog new/xkill-1.0.3/ChangeLog --- old/xkill-1.0.2/ChangeLog 2009-10-13 06:08:03.000000000 +0200 +++ new/xkill-1.0.3/ChangeLog 2010-11-11 04:26:39.000000000 +0100 @@ -1,3 +1,140 @@ +commit 6f00d84fb6d44bc76e50c111f8afc1c961778d7c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Nov 10 19:26:12 2010 -0800 + + xkill 1.0.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ea276533fbc9da4588d4707c1a21a9d480924b3c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 10:30:07 2010 -0800 + + Simplify options list for usage from array to constant string + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e3c094aa41b2ca724ded1c33fe2ecec9b4155dc7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 10:22:57 2010 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit dfd1f9ddc40dc8082010cd6b649812e57c4542bf +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 10:20:25 2010 -0800 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 649f4494e956e58c5dc440047f55c19117334590 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 10:19:46 2010 -0800 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e945e97c2bf5d03f6ad154c20cae7c870db2e73e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Nov 9 10:19:29 2010 -0800 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 40fe5f11c024ac28f10b9f82efb734b11957c952 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + +commit 6678df25e56029d312e80252b80229ab2821c4da +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 3dd4335f634a4db4392ded6807e05f1b393e047b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit e6f1691628bcdee1c090933957e41b11515d9678 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 4fe9b5706aef7e95e9db699e341bd5d1f3368905 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:15 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit e923b9e70dbc2a1b1efdecab5804e4445ec53d1c +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:21 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit 5ac1abf7369fc81a07df94e26f4ae21c05610285 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Oct 12 21:01:06 2009 -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/xkill-1.0.2/config.h.in new/xkill-1.0.3/config.h.in --- old/xkill-1.0.2/config.h.in 2009-10-13 06:01:26.000000000 +0200 +++ new/xkill-1.0.3/config.h.in 2010-11-11 04:26:26.000000000 +0100 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/xkill-1.0.2/configure.ac new/xkill-1.0.3/configure.ac --- old/xkill-1.0.2/configure.ac 2009-10-13 05:58:53.000000000 +0200 +++ new/xkill-1.0.3/configure.ac 2010-11-11 04:26:04.000000000 +0100 @@ -21,26 +21,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xkill, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkill) -AM_INIT_AUTOMAKE([dist-bzip2]) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xkill], [1.0.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xkill]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AM_CONFIG_HEADER(config.h) - -AC_PROG_CC -AC_PROG_INSTALL - + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XKILL, x11 xmuu) -AC_SUBST(XKILL_CFLAGS) -AC_SUBST(XKILL_LIBS) AC_OUTPUT([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/xkill-1.0.2/INSTALL new/xkill-1.0.3/INSTALL --- old/xkill-1.0.2/INSTALL 2006-07-11 04:53:20.000000000 +0200 +++ new/xkill-1.0.3/INSTALL 2010-11-11 04:26:39.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -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/xkill-1.0.2/Makefile.am new/xkill-1.0.3/Makefile.am --- old/xkill-1.0.2/Makefile.am 2009-10-13 05:52:03.000000000 +0200 +++ new/xkill-1.0.3/Makefile.am 2010-11-09 19:19:46.000000000 +0100 @@ -36,38 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +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/xkill-1.0.2/xkill.c new/xkill-1.0.3/xkill.c --- old/xkill-1.0.2/xkill.c 2009-01-24 23:53:58.000000000 +0100 +++ new/xkill-1.0.3/xkill.c 2010-11-09 19:33:47.000000000 +0100 @@ -1,4 +1,3 @@ -/* $Xorg: xkill.c,v 1.5 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/xkill/xkill.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */ /* * xkill - simple program for destroying unwanted clients @@ -75,22 +73,18 @@ static void usage(void) { - static char *options[] = { -"where options include:", -" -display displayname X server to contact", -" -id resource resource whose client is to be killed", -" -frame don't ignore window manager frames", -" -button number specific button to be pressed to select window", -" -all kill all clients with top level windows", -"", -NULL}; + const char *options = +"where options include:\n" +" -display displayname X server to contact\n" +" -id resource resource whose client is to be killed\n" +" -frame don't ignore window manager frames\n" +" -button number specific button to be pressed to select window\n" +" -all kill all clients with top level windows\n" +"\n"; char **cpp; - fprintf (stderr, "usage: %s [-option ...]\n", - ProgramName); - for (cpp = options; *cpp; cpp++) { - fprintf (stderr, "%s\n", *cpp); - } + fprintf (stderr, "usage: %s [-option ...]\n%s", + ProgramName, options); Exit (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/xkill-1.0.2/xkill.man new/xkill-1.0.3/xkill.man --- old/xkill-1.0.2/xkill.man 2006-07-11 04:53:20.000000000 +0200 +++ new/xkill-1.0.3/xkill.man 2010-10-07 05:36:26.000000000 +0200 @@ -1,4 +1,3 @@ -.\" $Xorg: xkill.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xkill.man,v 1.8 2001/12/14 20:02:06 dawes Exp $ -.\" .TH XKILL 1 __xorgversion__ .SH NAME xkill - kill a client by its X resource ++++++ xrdb-1.0.6.tar.bz2 -> xrdb-1.0.7.tar.bz2 ++++++ ++++ 9181 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/xrdb-1.0.6/ChangeLog new/xrdb-1.0.7/ChangeLog --- old/xrdb-1.0.6/ChangeLog 2009-10-13 00:07:50.000000000 +0200 +++ new/xrdb-1.0.7/ChangeLog 2010-11-11 04:32:27.000000000 +0100 @@ -1,3 +1,133 @@ +commit 6606863fc8467bcbc829cea63764be0d283c4b8a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Nov 10 19:32:04 2010 -0800 + + xrdb 1.0.7 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3a1f0f784bfd537096d4d37a77b7be7904bb88aa +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:26:45 2010 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 4139da28b7c9bb5bd35933e28a6f0f6e325d921e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:25:38 2010 -0800 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit a6ca7c4c8b330bfd8a1a225afe826d7dbfa820fb +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:24:37 2010 -0800 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0720655ecd3c8f3bc8c8bcb97863c02d73cae674 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Nov 9 16:24:08 2010 -0800 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit da50b50cc1befae114dd8f9ce67b2aa034bcedf3 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:50 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 532959ec60149589a72f027d96cb57f1368cdf89 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 0fa4fd255c494b8d9551453c07521fc7473fc2b6 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit b90564dc7339082f8325d06edb28264f1b6e8bb6 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit aa5fd3d4dded23b6045e93ac220edb13b68a4658 +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 cf6bd9d305726420905f2aa7c7471665f5e70f7c +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:21 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <jeremyhu(a)freedesktop.org> + commit b3a7a1fb2356d6fba676746f60176f1a69b9a72a Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Mon Oct 12 15:04:50 2009 -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/xrdb-1.0.6/config.h.in new/xrdb-1.0.7/config.h.in --- old/xrdb-1.0.6/config.h.in 2009-10-13 00:05:14.000000000 +0200 +++ new/xrdb-1.0.7/config.h.in 2010-11-11 04:32:21.000000000 +0100 @@ -54,6 +54,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/xrdb-1.0.6/configure.ac new/xrdb-1.0.7/configure.ac --- old/xrdb-1.0.6/configure.ac 2009-10-13 00:04:42.000000000 +0200 +++ new/xrdb-1.0.7/configure.ac 2010-11-11 04:31:42.000000000 +0100 @@ -20,20 +20,21 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xrdb, [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrdb) -AM_INIT_AUTOMAKE([dist-bzip2]) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xrdb], [1.0.7], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xrdb]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AC_PROG_CC -AC_PROG_INSTALL - + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS AC_CHECK_FUNC([mkstemp], @@ -83,7 +84,5 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XRDB, xmuu x11) -AC_SUBST(XRDB_CFLAGS) -AC_SUBST(XRDB_LIBS) AC_OUTPUT([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/xrdb-1.0.6/INSTALL new/xrdb-1.0.7/INSTALL --- old/xrdb-1.0.6/INSTALL 2006-07-11 04:54:07.000000000 +0200 +++ new/xrdb-1.0.7/INSTALL 2010-11-11 04:32:27.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -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/xrdb-1.0.6/Makefile.am new/xrdb-1.0.7/Makefile.am --- old/xrdb-1.0.6/Makefile.am 2009-10-12 23:40:07.000000000 +0200 +++ new/xrdb-1.0.7/Makefile.am 2010-11-10 01:24:24.000000000 +0100 @@ -34,37 +34,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog +EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -MAINTAINERCLEANFILES=ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' +dist-hook: ChangeLog INSTALL 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/xrdb-1.0.6/xrdb.c new/xrdb-1.0.7/xrdb.c --- old/xrdb-1.0.6/xrdb.c 2009-01-28 03:21:22.000000000 +0100 +++ new/xrdb-1.0.7/xrdb.c 2010-10-07 05:38:04.000000000 +0200 @@ -1,8 +1,6 @@ /* * xrdb - X resource manager database utility * - * $Xorg: xrdb.c,v 1.6 2000/08/17 19:54:56 cpqbld Exp $ - * $XdotOrg: app/xrdb/xrdb.c,v 1.5 2006/04/03 18:23:14 alanc Exp $ */ /* @@ -31,7 +29,6 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.16tsi Exp $ */ /* * this program is used to load, or dump the resource manager database 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/xrdb-1.0.6/xrdb.man new/xrdb-1.0.7/xrdb.man --- old/xrdb-1.0.6/xrdb.man 2007-04-12 00:31:46.000000000 +0200 +++ new/xrdb-1.0.7/xrdb.man 2010-10-07 05:38:04.000000000 +0200 @@ -1,5 +1,3 @@ -.\" $XdotOrg: $ -.\" $Xorg: xrdb.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1991, Digital Equipment Corporation. .\" Copyright 1991, 1994, 1998 The Open Group .\" @@ -25,8 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ -.\" .TH XRDB 1 __xorgversion__ .SH NAME xrdb - X server resource database utility ++++++ xrefresh-1.0.3.tar.bz2 -> xrefresh-1.0.4.tar.bz2 ++++++ ++++ 8621 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/xrefresh-1.0.3/ChangeLog new/xrefresh-1.0.4/ChangeLog --- old/xrefresh-1.0.3/ChangeLog 2009-10-17 04:25:58.000000000 +0200 +++ new/xrefresh-1.0.4/ChangeLog 2010-11-11 04:47:16.000000000 +0100 @@ -1,3 +1,118 @@ +commit 631be2568befbd4aee98a3cd4849403554db79d7 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Nov 10 19:46:37 2010 -0800 + + xrefresh 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 6d3d5b90e0ab621cd215b007936dc3bc2a8c0053 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 17:01:30 2010 -0800 + + man page: change (3X) to (__libmansuffix__) + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 5b487ce8e51dec698b7c71d978d8666a098eb3f4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:35:11 2010 -0800 + + Purge CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 724fd273618e44ec181cee670a16afcbe1e4f3fc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:31:31 2010 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 894a6fdd37ff5c14f53db08f77bbec4a1387c9a2 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:29:37 2010 -0800 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 09a8377a96411bd62a08a4f0e921a18162ef669e +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 16:28:57 2010 -0800 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3344c9d26e243e5a79cf7437606ca496c3b7042f +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Nov 9 16:28:53 2010 -0800 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3f2443358056f366adc1f95d8d41fe690e336aac +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Nov 26 09:19:54 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 98885558f39792425d6579fe063517da1a241665 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 20ce8ee10701e53b3b18d73a68827d1c6f1278a3 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:39 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit d82a88edd20f9e0ef00f7d6ffcf83e6533c3f0a8 +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 d940fdcf80c5e5d71f5fce071a6301420de85607 Author: Alan Coopersmith <alan.coopersmith(a)sun.com> Date: Fri Oct 16 19:20:34 2009 -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/xrefresh-1.0.3/config.h.in new/xrefresh-1.0.4/config.h.in --- old/xrefresh-1.0.3/config.h.in 2009-10-17 04:20:53.000000000 +0200 +++ new/xrefresh-1.0.4/config.h.in 2010-11-11 04:47:08.000000000 +0100 @@ -42,6 +42,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/xrefresh-1.0.3/configure.ac new/xrefresh-1.0.4/configure.ac --- old/xrefresh-1.0.3/configure.ac 2009-10-17 04:20:26.000000000 +0200 +++ new/xrefresh-1.0.4/configure.ac 2010-11-11 04:45:46.000000000 +0100 @@ -21,26 +21,24 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xrefresh, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xrefresh) -AM_INIT_AUTOMAKE([dist-bzip2]) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xrefresh], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xrefresh]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) - -AM_CONFIG_HEADER(config.h) - -AC_PROG_CC -AC_PROG_INSTALL - + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XREFRESH, x11) -AC_SUBST(XREFRESH_CFLAGS) -AC_SUBST(XREFRESH_LIBS) AC_OUTPUT([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/xrefresh-1.0.3/INSTALL new/xrefresh-1.0.4/INSTALL --- old/xrefresh-1.0.3/INSTALL 2006-07-11 04:54:09.000000000 +0200 +++ new/xrefresh-1.0.4/INSTALL 2010-11-11 04:47:15.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff -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/xrefresh-1.0.3/Makefile.am new/xrefresh-1.0.4/Makefile.am --- old/xrefresh-1.0.3/Makefile.am 2009-10-17 04:18:04.000000000 +0200 +++ new/xrefresh-1.0.4/Makefile.am 2010-11-10 01:34:32.000000000 +0100 @@ -36,38 +36,22 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +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/xrefresh-1.0.3/xrefresh.c new/xrefresh-1.0.4/xrefresh.c --- old/xrefresh-1.0.3/xrefresh.c 2009-01-28 03:21:24.000000000 +0100 +++ new/xrefresh-1.0.4/xrefresh.c 2010-11-10 01:34:45.000000000 +0100 @@ -1,4 +1,3 @@ -/* $XdotOrg: $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -47,12 +46,9 @@ ******************************************************************/ /* - * $Xorg: xrefresh.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ - * * Kitchen sink version, useful for clearing small areas and flashing the * screen. */ -/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.5 2001/07/25 15:05:28 dawes Exp $ */ #include <stdio.h> #include <errno.h> 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/xrefresh-1.0.3/xrefresh.man new/xrefresh-1.0.4/xrefresh.man --- old/xrefresh-1.0.3/xrefresh.man 2006-07-11 04:54:09.000000000 +0200 +++ new/xrefresh-1.0.4/xrefresh.man 2010-11-10 02:01:05.000000000 +0100 @@ -1,4 +1,3 @@ -.\" $Xorg: xrefresh.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +22,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.7 2001/01/27 18:21:22 dawes Exp $ -.\" .TH XREFRESH 1 __xorgversion__ .SH NAME xrefresh - refresh all or part of an X screen @@ -81,7 +78,7 @@ The .I xrefresh program uses the routine -.I XGetDefault(3X) +.I XGetDefault(__libmansuffix__) to read defaults, so its resource names are all capitalized. .PP .TP 8 ++++++ xset-1.2.0.tar.bz2 -> xset-1.2.1.tar.bz2 ++++++ ++++ 3985 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/xset-1.2.0/ChangeLog new/xset-1.2.1/ChangeLog --- old/xset-1.2.0/ChangeLog 2010-08-06 05:15:26.000000000 +0200 +++ new/xset-1.2.1/ChangeLog 2010-11-11 05:02:46.000000000 +0100 @@ -1,3 +1,116 @@ +commit 8a3ad532fc8e00ea5066355a783cb270315596fe +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Nov 10 20:02:19 2010 -0800 + + xset 1.2.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d75ab3dcae8bcb022e87fd73c9f798421d040c46 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 18:16:27 2010 -0800 + + Strip trailing whitespace + + Generated via: perl -i -p -e 's{\s+$}{\n}' * + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 33580bb84fb5ca6d1a49c1f1ac7b785fe4f92d11 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 18:13:51 2010 -0800 + + Restore man page copyright accidentally removed in ce3f6a73c2beef + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0d807d97e8387a38b6a9324912b9c65662949038 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 17:13:41 2010 -0800 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Regroup AC statements under the Autoconf initialization section. + Regroup AM sttaements under the Automake initialization section. + Add missing AC_CONFIG_SRCDIR + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit edeb291f81424ec04798618379ad252c122377ec +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 9 17:11:42 2010 -0800 + + config: AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 5b4a8121b1cb2c0dc643460ee7c9363dc0d83a38 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Nov 9 17:09:45 2010 -0800 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit ce3f6a73c2beef0c486575f7797d92b44a718973 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:29:50 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 41743c6fbea9f58dff4e9fe200837fe718eefc9d +Author: Bryce Harrington <bryce(a)canonical.com> +Date: Tue Aug 10 12:46:14 2010 -0400 + + Spelling fix in help docs. + + Reviewed-by: Robert Hooker <sarvatt(a)ubuntu.com> + Signed-off-by: Bryce Harrington <bryce(a)canonical.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 5948a0e2095c4e032dd93e22a65077ff81288666 +Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> +Date: Fri Aug 6 00:26:48 2010 -0500 + + Use silent rules + + Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit d36afd69f0c5129b6b50c9062257560342d81ebd +Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> +Date: Fri Aug 6 00:26:47 2010 -0500 + + Use AC_PROG_SED and MAN_SUBSTS in macros-1.8 + + Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 0ac4f20a863d69b99193da26d468397827c672a1 +Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> +Date: Fri Aug 6 00:26:46 2010 -0500 + + Remove unused variable warning with !XF86MISC + + xset.c: In function 'query': + xset.c:1317: warning: unused variable 'dummy' + + Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit c963b0cb393630962e9094e849b291c539b655ca Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Fri Aug 6 13:10:36 2010 +1000 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/xset-1.2.0/configure.ac new/xset-1.2.1/configure.ac --- old/xset-1.2.0/configure.ac 2010-08-06 05:10:27.000000000 +0200 +++ new/xset-1.2.1/configure.ac 2010-11-11 05:01:57.000000000 +0100 @@ -1,5 +1,5 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -9,7 +9,7 @@ dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -20,21 +20,22 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xset,[1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xset], [1.2.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xset]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) - -AC_PROG_CC -AC_PROG_INSTALL - # Checks for system functions AC_CHECK_FUNCS([usleep]) @@ -51,16 +52,16 @@ AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -PKG_CHECK_MODULES(SET_XKB, x11, +PKG_CHECK_MODULES(SET_XKB, x11, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS" AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) -AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), +AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) if test "x$USE_XF86MISC" != "xno" ; then - PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, + PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc, [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SET_XF86MISC_CFLAGS $SET_X11_CFLAGS" AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/xf86mscstr.h],,, 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/xset-1.2.0/Makefile.am new/xset-1.2.1/Makefile.am --- old/xset-1.2.0/Makefile.am 2010-08-06 05:07:57.000000000 +0200 +++ new/xset-1.2.1/Makefile.am 2010-11-10 03:15:26.000000000 +0100 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # 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 @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -35,7 +35,7 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) @@ -49,26 +49,11 @@ dist-hook: ChangeLog INSTALL -SED = sed - # Strings to replace in man pages XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(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/xset-1.2.0/xset.c new/xset-1.2.1/xset.c --- old/xset-1.2.0/xset.c 2010-08-06 05:07:57.000000000 +0200 +++ new/xset-1.2.1/xset.c 2010-11-10 03:15:26.000000000 +0100 @@ -1,7 +1,3 @@ -/* - * $Xorg: xset.c,v 1.6 2001/02/09 02:05:58 xorgcvs Exp $ - */ - /* Copyright 1985, 1998 The Open Group @@ -27,7 +23,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xset/xset.c,v 3.31 2003/05/27 22:27:09 tsi Exp $ */ /* Modified by Stephen so keyboard rate is set using XKB extensions */ #ifdef HAVE_CONFIG_H @@ -573,7 +568,7 @@ * * On OS/2, use _sleep2() */ - + #ifdef HAVE_USLEEP # define Usleep(us) usleep((us)) #else @@ -934,7 +929,7 @@ } /* - * parse the path list. If before or after is non-zero, we'll need + * parse the path list. If before or after is non-zero, we'll need * the current value. */ @@ -1314,7 +1309,6 @@ XKeyboardState values; int acc_num, acc_denom, threshold; int timeout, interval, prefer_blank, allow_exp; - int dummy; #ifdef XF86MISC XF86MiscKbdSettings kbdinfo; @@ -1425,10 +1419,14 @@ #endif #endif #ifdef XF86MISC - if (XF86MiscQueryExtension(dpy, &dummy, &dummy) && - XF86MiscGetKbdSettings(dpy, &kbdinfo)) - printf(" auto repeat delay: %d repeat rate: %d\n", - kbdinfo.delay, kbdinfo.rate); + { + int dummy; + + if (XF86MiscQueryExtension(dpy, &dummy, &dummy) && + XF86MiscGetKbdSettings(dpy, &kbdinfo)) + printf(" auto repeat delay: %d repeat rate: %d\n", + kbdinfo.delay, kbdinfo.rate); + } #endif printf(" auto repeating keys: "); for (i = 0; i < 4; i++) { @@ -1657,8 +1655,8 @@ #ifdef FONTCACHE fprintf(stderr, " To control font cache:\n"); fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n"); - fprintf(stderr, "\t both mark values spcecified in KB\n"); - fprintf(stderr, "\t balance value spcecified in percent (10 - 90)\n"); + fprintf(stderr, "\t both mark values specified in KB\n"); + fprintf(stderr, "\t balance value specified in percent (10 - 90)\n"); fprintf(stderr, " Show font cache statistics:\n"); fprintf(stderr, "\t fc s\n"); #endif 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/xset-1.2.0/xset.man new/xset-1.2.1/xset.man --- old/xset-1.2.0/xset.man 2009-12-20 23:25:33.000000000 +0100 +++ new/xset-1.2.1/xset.man 2010-11-10 03:15:26.000000000 +0100 @@ -1,15 +1,14 @@ -.\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 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. @@ -17,14 +16,12 @@ .\" 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/xset/xset.man,v 3.14 2001/12/14 20:02:22 dawes Exp $ -.\" +.\" .TH XSET 1 __xorgversion__ .SH NAME xset - user preference utility for X @@ -40,27 +37,27 @@ .br [+dpms] [-dpms] .br - [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] + [dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] [dpms force {standby|suspend|off|on}] .br -[fp=\fIpathlist\fP] -[-fp=\fIpathlist\fP] -[+fp=\fIpathlist\fP] -[fp-\fIpathlist\fP] -[fp+\fIpathlist\fP] +[fp=\fIpathlist\fP] +[-fp=\fIpathlist\fP] +[+fp=\fIpathlist\fP] +[fp-\fIpathlist\fP] +[fp+\fIpathlist\fP] .br [fp default] [fp rehash] .br [-led [\fIinteger\fP|named \fIindicator\fP]] [led [\fIinteger\fP|named \fIindicator\fP]] -.br +.br [led {on|off}] .br [mouse [\fIaccel_mult\fP[/\fIaccel_div\fP] [\fIthreshold\fP]]] [mouse default] .br [p \fIpixel\fP \fIcolor\fP] .br -[-r [keycode]] [r [keycode]] +[-r [keycode]] [r [keycode]] [r {on|off}] [r rate \fIdelay\fP [\fIrate\fP]] .br [s [\fIlength\fP [\fIperiod\fP]]] [s {blank|noblank}] @@ -163,8 +160,8 @@ .PP .TP 8 .B "\+fp \fRor\fP fp\+" -This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the -current font path, respectively. They must be followed by a comma-separated +This \fB\+fp\fP and \fBfp\+\fP options prepend and append elements to the +current font path, respectively. They must be followed by a comma-separated list of entries. .PP .TP 8 @@ -200,7 +197,7 @@ transition range. This way, the pointing device can be used for precise alignment when it is moved slowly, yet it can be set to travel across the screen in a flick of the wrist when desired. One or both -parameters for the +parameters for the .B m option can be omitted, but if only one is given, it will be interpreted as the acceleration. @@ -243,14 +240,14 @@ not typically valid for this command. Example: "\fBxset\ -r\ 10\fP" will disable autorepeat for the "1" key on the top row of an IBM PC keyboard. -If the server supports the XFree86-Misc extension, or the XKB extension, +If the server supports the XFree86-Misc extension, or the XKB extension, then a parameter of 'rate' is accepted and should be followed by zero, one or two numeric values. The first specifies the delay before autorepeat starts and the second specifies the repeat rate. In the case that the server supports the XKB extension, the delay is the number of milliseconds before autorepeat starts, and the rate is the number of repeats -per second. If the rate or delay is not given, it will be set +per second. If the rate or delay is not given, it will be set to the default value. .PP .TP 8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit samba for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Fri Nov 12 14:33:55 CET 2010. -------- --- samba/samba.changes 2010-09-12 17:54:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2010-11-11 23:02:04.000000000 +0100 @@ -1,0 +2,43 @@ +Thu Nov 11 12:36:36 UTC 2010 - lmuelle(a)suse.de + +- Add the _build_arch at the end of the vendor version suffix. + +------------------------------------------------------------------- +Thu Oct 28 15:06:20 UTC 2010 - lmuelle(a)suse.de + +- Provide and Obsolete samba-gplv3 to replace potentially installed packages. + +------------------------------------------------------------------- +Sat Oct 10 13:24:17 CEST 2010 - jmcdonough(a)suse.de + +- Update to 3.5.6 + + Fix auto printers with registry config; (bso#7280); (bnc#617153). + + Fix SPNEGO auth when contacting Win7 system using Microsoft Live + Sign-in Assistant; (bso#7577). + + Fix 'net idmap restore' setting HWM to avoid duplicates; (bso#7578). + + Fix "admin users" when using vfs_acl_xattr; (bso#7581). + + Fix using cached credentials in ntlm_auth; (bso#7589). + + Fix Winbind offline login; (bso#7590). + + Fix Winbind internal error; (bso#7636). + + Fix mknod/mkfifo failing with "No such file or directory"; (bso#7651). + + Fix smbd changing mode of files on rename; (bso#7693). + + Fix crash bug with invalid SPNEGO token; (bso#7694). + + Fix smbd panic on invalid NetBIOS session request; (bso#7698). + + Fix smbd crash caused by "%D" in "printer admin"; (bso#7541). + + Fix 'smbclient -M'; (bso#7635). + + Fix scalability problem with hundreds of printers; (bso#7656). + + Fix crash bug in rpcclient; (bso#7688). + + Fix file corruption when setting Samba "write wache wize"; (bso#7715). + +------------------------------------------------------------------- +Fri Sep 24 01:40:30 CEST 2010 - ddiss(a)suse.de + +- Fix smbd crash with CUPS printers and no [printers] share defined; + (bso#7297); (bnc#637755). + +------------------------------------------------------------------- +Tue Sep 21 01:18:17 CEST 2010 - jmcdonough(a)suse.de + +- Fix printing from 64-bit windows clients; (bso#6888); (bnc#640870). + +------------------------------------------------------------------- @@ -4 +47,20 @@ -- fix baselibs.conf for libtalloc +- Fix baselibs.conf for libtalloc. + +------------------------------------------------------------------- +Wed Sep 8 12:09:39 UTC 2010 - lmuelle(a)suse.de + +- Fix buffer overflow in sid_parse() to correctly check the input lengths when + reading a binary representation of a Windows Security ID (SID); + CVE-2010-3069; (bso#7669); (bnc#637218). + +------------------------------------------------------------------- +Mon Aug 30 22:11:20 CEST 2010 - jmcdonough(a)suse.de + +- Use cached ntlm password in libsmbclient. Prevent lockouts + when kerberos tickets are lost; (bnc#602418); (bnc#606304). + +------------------------------------------------------------------- +Thu Aug 26 11:08:42 UTC 2010 - gber(a)opensuse.org + +- Add a dependency on nfs to the smbfs/ cifs init scripts as they require the + en_US locale and /usr might be on NFS. @@ -20,0 +83,5 @@ + +------------------------------------------------------------------- +Thu Aug 19 20:21:50 UTC 2010 - lmuelle(a)suse.de + +- Create the /var/run/samba directory on the fly and package it as %ghost. calling whatdependson for head-i586 Old: ---- samba-3.5.4.tar.bz2 New: ---- samba-3.5.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.SMM55a/_old 2010-11-12 14:32:25.000000000 +0100 +++ /var/tmp/diff_new_pack.SMM55a/_new 2010-11-12 14:32:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package samba-doc (Version 3.5.4) +# spec file for package samba-doc (Version 3.5.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,19 +58,21 @@ %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.4 +%define samba_ver 3.5.6 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif Url: http://www.samba.org/ -Version: 3.5.4 -Release: 7 +Version: 3.5.6 +Release: 1 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on +Provides: samba-gplv3-doc = %{version}-%{release} +Obsoletes: samba-gplv3-doc < %{version} PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 @@ -193,6 +195,9 @@ 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi +# Add the build architecture +test "%{_build_arch}" != "" && \ + product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION @@ -389,7 +394,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.SMM55a/_old 2010-11-12 14:32:25.000000000 +0100 +++ /var/tmp/diff_new_pack.SMM55a/_new 2010-11-12 14:32:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package samba (Version 3.5.4) +# spec file for package samba (Version 3.5.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -58,7 +58,7 @@ %else BuildRequires: pkgconfig %endif -%define samba_ver 3.5.4 +%define samba_ver 3.5.6 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} %if 0%{?suse_version} && 0%{?suse_version} < 1111 @@ -70,8 +70,10 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on -Version: 3.5.4 -Release: 7 +Version: 3.5.6 +Release: 1 +Provides: samba-gplv3 = %{version}-%{release} +Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -171,15 +173,16 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package client License: GPLv3+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba AutoReqProv: on -Provides: smbfs +Provides: smbfs samba-gplv3-client = %{version}-%{release} +Obsoletes: samba-gplv3-client < %{version} %ifarch ppc64 Obsoletes: samba-client-64bit %endif @@ -214,8 +217,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -224,6 +227,8 @@ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ AutoReqProv: on +Provides: samba-gplv3-devel = %{version}-%{release} +Obsoletes: samba-gplv3-devel < %{version} %ifarch ppc64 Obsoletes: samba-devel-64bit %endif @@ -239,8 +244,8 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 @@ -250,6 +255,8 @@ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on +Provides: samba-gplv3-doc = %{version}-%{release} +Obsoletes: samba-gplv3-doc < %{version} PreReq: coreutils findutils %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -265,8 +272,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif @@ -275,6 +282,8 @@ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-krb-printing = %{version}-%{release} +Obsoletes: samba-gplv3-krb-printing < %{version} PreReq: coreutils %if 0%{?suse_version} > 1000 PreReq: /sbin/conf.d/SuSEconfig.permissions @@ -290,8 +299,8 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if %{make_utils} @@ -301,6 +310,8 @@ Summary: debug tools Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-utils = %{version}-%{release} +Obsoletes: samba-gplv3-utils < %{version} %description utils Some of the debug-tools for developpers. @@ -318,6 +329,8 @@ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba AutoReqProv: on +Provides: samba-gplv3-winbind = %{version}-%{release} +Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd %ifarch ppc64 Obsoletes: samba-winbind-64bit @@ -337,8 +350,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -362,8 +375,8 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %else @@ -407,8 +420,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libnetapi0 License: GPLv3+ @@ -426,8 +439,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libnetapi-devel License: GPLv3+ @@ -446,8 +459,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -466,8 +479,8 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %else @@ -502,8 +515,8 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtalloc2 License: LGPLv3+ @@ -521,8 +534,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtalloc-devel License: LGPLv3+ @@ -541,8 +554,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtdb1 License: LGPLv3+ @@ -560,8 +573,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtdb-devel License: LGPLv3+ @@ -580,8 +593,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libwbclient0 License: GPLv3+ @@ -599,8 +612,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libwbclient-devel License: GPLv3+ @@ -619,8 +632,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtevent0 License: LGPLv3+ @@ -638,8 +651,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libtevent-devel License: LGPLv3+ @@ -659,8 +672,8 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libldb0 License: LGPLv3+ @@ -679,8 +692,8 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %package -n libldb-devel License: LGPLv3+ @@ -699,8 +712,8 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %if %{make_ldapsmb} @@ -710,7 +723,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 292 +Release: 293 Requires: perl-ldap %description -n ldapsmb @@ -723,8 +736,8 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if 0%{?suse_version} > 920 && 0%{?suse_version} < 1121 @@ -746,8 +759,8 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2420 -Branch : 3.5.4 +Source Timestamp: 2450 +Branch : 3.5.6 %endif %if %{make_vscan} @@ -847,6 +860,9 @@ 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi +# Add the build architecture +test "%{_build_arch}" != "" && \ + product_suffix="${product_suffix}-%{_build_arch}" # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file mv VERSION VERSION.orig sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/ VERSION.orig >VERSION @@ -1704,7 +1720,7 @@ %ghost %{_var}/lock/subsys/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} -%dir %{PIDDIR} +%ghost %dir %{PIDDIR} %if 0%{?suse_version} && 0%{?suse_version} < 921 /sbin/mount.cifs /sbin/umount.cifs ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.SMM55a/_old 2010-11-12 14:32:25.000000000 +0100 +++ /var/tmp/diff_new_pack.SMM55a/_new 2010-11-12 14:32:25.000000000 +0100 @@ -1,2 +1,2 @@ -2420 -Branch : 3.5.4 +2450 +Branch : 3.5.6 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f new/patches/samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f --- old/patches/samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f 2010-08-17 15:49:33.000000000 +0200 +++ new/patches/samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -commit 6e48267c28b05c3837a3e5ffc1f5b58316cc286f -Author: Bo Yang <boyang(a)samba.org> -Date: Sun Mar 21 16:00:26 2010 +0800 - - s3: Open winbindd_cache.tdb with read/write access. - - Open winbindd_cache.tdb with read/write access when validate the cache, - otherwise, validation fails to get lock in tdb_check. It results in - validation failure even the cache is good. - - Signed-off-by: Bo Yang <boyang(a)samba.org> - -Index: source3/lib/tdb_validate.c -=================================================================== ---- source3/lib/tdb_validate.c.orig -+++ source3/lib/tdb_validate.c -@@ -192,7 +192,7 @@ int tdb_validate_open(const char *tdb_pa - - DEBUG(5, ("tdb_validate_open called for tdb '%s'\n", tdb_path)); - -- tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDONLY, 0); -+ tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDWR, 0); - if (!tdb) { - DEBUG(1, ("Error opening tdb %s\n", tdb_path)); - return ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f new/patches/samba.org/bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f --- old/patches/samba.org/bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f 2010-08-31 15:35:36.000000000 +0200 +++ new/patches/samba.org/bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -commit bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f -Author: Jim McDonough <jmcd(a)samba.org> -Date: Mon Aug 23 11:13:06 2010 +0200 - - s3-printing: fix BUG 7280 - auto printers not loading with registry config - -Index: source3/printing/load.c -=================================================================== ---- source3/printing/load.c.orig -+++ source3/printing/load.c -@@ -31,6 +31,10 @@ static void add_auto_printers(void) - char *saveptr; - - if (pnum < 0) -+ if (process_registry_service(PRINTERS_NAME)) -+ pnum = lp_servicenumber(PRINTERS_NAME); -+ -+ if (pnum < 0) - return; - - if ((str = SMB_STRDUP(lp_auto_services())) == NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2010-09-01 22:12:21.000000000 +0200 +++ new/patches/series 2010-10-14 13:03:41.000000000 +0200 @@ -7,9 +7,7 @@ # Samba patches from upstream, git.samba.org samba.org/2f5c2f4c72735c0764d6e022b770d8e8b9865c01 -p0 # bnc 538923. Backported from master. samba.org/aaafadb7d5a835f88fce3fbea8127d9c5ddb7181 -p0 # bnc 538923 -samba.org/6e48267c28b05c3837a3e5ffc1f5b58316cc286f -p0 # bnc 587014 samba.org/c67b4ed3a406011d0fc7e1e2cbdc27ec4822e57c -p0 # bso 6364, bnc 630812 -samba.org/bb92b0e1571e4766ab20bb3eea53f9e7f9567a5f -p0 # bso 7280, bnc 617153 samba.org/0ec0095d1a40435042b8ff9e4bc7fedbeb371e5f -p0 # bnc 632055 # SuSE specific changes ++++++ samba-3.5.4.tar.bz2 -> samba-3.5.6.tar.bz2 ++++++ samba/samba-3.5.4.tar.bz2 /mounts/work_src_done/STABLE/samba/samba-3.5.6.tar.bz2 differ: byte 11, line 1 ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs new/vendor-files/init/cifs --- old/vendor-files/init/cifs 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/cifs 2010-11-11 22:58:51.000000000 +0100 @@ -25,9 +25,9 @@ # ### BEGIN INIT INFO # Provides: cifs -# Required-Start: $network $syslog +# Required-Start: $network $syslog nfs # Should-Start: nmb -# Required-Stop: $network $syslog +# Required-Stop: $network $syslog nfs # Should-Stop: nmb # Default-Start: 3 5 # Default-Stop: 0 1 2 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/nmb new/vendor-files/init/nmb --- old/vendor-files/init/nmb 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/nmb 2010-11-11 13:55:29.000000000 +0100 @@ -72,6 +72,8 @@ 0) echo -n "- Warning: daemon already running. " ;; 1) echo -n "- Warning: ${PID_FILE} exists. " ;; esac + test -d "${PID_FILE%/nmbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/nmbd.pid}" startproc -p ${PID_FILE} ${NMBD_BIN} -D -s ${SMB_CONF} rc_status -v ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smb new/vendor-files/init/smb --- old/vendor-files/init/smb 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/smb 2010-11-11 13:55:29.000000000 +0100 @@ -74,6 +74,8 @@ 0) echo -n "- Warning: daemon already running. " ;; 1) echo -n "- Warning: ${PID_FILE} exists. " ;; esac + test -d "${PID_FILE%/smbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/smbd.pid}" test -f /etc/sysconfig/language && \ . /etc/sysconfig/language export LC_ALL="$RC_LC_ALL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smb-900 new/vendor-files/init/smb-900 --- old/vendor-files/init/smb-900 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/smb-900 2010-11-11 13:55:29.000000000 +0100 @@ -73,6 +73,8 @@ 0) echo -n "- Warning: daemon already running. " ;; 1) echo -n "- Warning: ${PID_FILE} exists. " ;; esac + test -d "${PID_FILE%/smbd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/smbd.pid}" test -f /etc/sysconfig/language && \ . /etc/sysconfig/language export LC_ALL="$RC_LC_ALL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs new/vendor-files/init/smbfs --- old/vendor-files/init/smbfs 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/smbfs 2010-11-11 22:58:51.000000000 +0100 @@ -25,9 +25,9 @@ # ### BEGIN INIT INFO # Provides: smbfs -# Required-Start: $network $syslog +# Required-Start: $network $syslog nfs # Should-Start: nmb -# Required-Stop: $network $syslog +# Required-Stop: $network $syslog nfs # Should-Stop: nmb # Default-Start: 3 5 # Default-Stop: 0 1 2 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/winbind new/vendor-files/init/winbind --- old/vendor-files/init/winbind 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/winbind 2010-11-11 13:55:29.000000000 +0100 @@ -72,6 +72,8 @@ 0) echo -n "- Warning: daemon already running. " ;; 1) echo -n "- Warning: ${PID_FILE} exists. " ;; esac + test -d "${PID_FILE%/winbindd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/winbindd.pid}" startproc -p ${PID_FILE} ${WINBINDD_BIN} -s ${SMB_CONF} rc_status -v ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/winbind-900 new/vendor-files/init/winbind-900 --- old/vendor-files/init/winbind-900 2010-08-17 15:49:33.000000000 +0200 +++ new/vendor-files/init/winbind-900 2010-11-11 13:55:29.000000000 +0100 @@ -71,6 +71,8 @@ 0) echo -n "- Warning: daemon already running. " ;; 1) echo -n "- Warning: ${PID_FILE} exists. " ;; esac + test -d "${PID_FILE%/winbindd.pid}" || \ + mkdir -m 0755 -p "${PID_FILE%/winbindd.pid}" startproc -p ${PID_FILE} ${WINBINDD_BIN} -s ${SMB_CONF} rc_status -v ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2010-09-01 22:13:02.000000000 +0200 +++ new/vendor-files/tools/package-data 2010-11-11 23:01:19.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2420" +SAMBA_PACKAGE_SVN_VERSION="2450" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit udev for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package udev for openSUSE:Factory checked in at Fri Nov 12 14:32:07 CET 2010. -------- --- udev/udev.changes 2010-10-23 15:37:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2010-11-11 11:12:20.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 11 10:09:07 UTC 2010 - coolo(a)novell.com + +- own parent dirs for systemd files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.XHBLFs/_old 2010-11-12 14:30:47.000000000 +0100 +++ /var/tmp/diff_new_pack.XHBLFs/_new 2010-11-12 14:30:47.000000000 +0100 @@ -21,7 +21,7 @@ Name: udev Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Version: 164 -Release: 1 +Release: 2 License: LGPLv2.1+ Group: System/Kernel Summary: A rule-based device node and kernel event manager @@ -196,7 +196,9 @@ %{_datadir}/pkgconfig/udev.pc %doc %{_docdir}/udev %dir /lib/udev/devices/ +%dir /lib/systemd/system /lib/systemd/system/udev*.service +%dir /lib/systemd/system/basic.target.wants /lib/systemd/system/basic.target.wants/udev*.service %files -n libudev0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit cups for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at Fri Nov 12 14:31:41 CET 2010. -------- --- cups/cups.changes 2010-07-15 15:09:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/cups/cups.changes 2010-11-12 09:33:34.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Nov 12 08:47:49 CET 2010 - jsmeix(a)suse.de + +- Upgraded to CUPS 1.4.5 + CUPS 1.4.5 fixes several scheduler and printing bugs + as well as a reported security bug, in particular: + * Fixed a IPP parsing memory corruption bug + (CVE-2010-2941, STR #3648, Novell/Suse Bugzilla bnc#649256) + * Fixed a PPD loader bug that could crash the cupsd (STR #3680) + * The scheduler restarts jobs while shutting down (STR #3679) + * Did not initialize Kerberos in all cases (STR #3662) + * The socket backend could go into an infinite loop + with certain printers (STR #3622) + * Moving a job via the web interface failed without + asking for authentication (STR #3559) + * The web interface did not allow a user to change + the driver (STR #3537, STR #3601) + * For a complete list see the CHANGES.txt file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cups-1.4.4-source.tar.bz2 New: ---- cups-1.4.5-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.Jx7Rx6/_old 2010-11-12 14:30:54.000000000 +0100 +++ /var/tmp/diff_new_pack.Jx7Rx6/_new 2010-11-12 14:30:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cups (Version 1.4.4) +# spec file for package cups (Version 1.4.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ License: GPLv2+ ; LGPLv2.1+ Group: Hardware/Printing Summary: The Common UNIX Printing System -Version: 1.4.4 -Release: 3 +Version: 1.4.5 +Release: 1 # Require the exact matching version-release of the cups-libs sub-package because # non-matching CUPS libraries may let CUPS software crash (e.g. segfault) # because all CUPS software is built from the one same CUPS source tar ball @@ -52,8 +52,8 @@ Obsoletes: cups-SUSE-ppds-dat Provides: cups-SUSE-ppds-dat # Source0...Source9 is for sources from upstream: -# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.4/cups-1.4.4-source.tar.bz2 -# MD5 sum for Source0 on http://www.cups.org/software.php 8776403ad60fea9e85eab9c04d88560d +# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.5/cups-1.4.5-source.tar.bz2 +# MD5 sum for Source0 on http://www.cups.org/software.php 50729f6fc46ba54223e0eaf5009f3419 Source0: cups-%{version}-source.tar.bz2 # Patch0...Patch9 is for patches from upstream: # Source10...Source99 is for sources from Novell/openSUSE which are intended for upstream: @@ -458,7 +458,6 @@ %doc %{_mandir}/man5/printers.conf.5.gz %doc %{_mandir}/man5/subscriptions.conf.5.gz %doc %{_mandir}/man7/backend.7.gz -%doc %{_mandir}/man7/drv.7.gz %doc %{_mandir}/man7/filter.7.gz %doc %{_mandir}/man7/notifier.7.gz %doc %{_mandir}/man8/cups-deviced.8.gz ++++++ cups-1.4.4-source.tar.bz2 -> cups-1.4.5-source.tar.bz2 ++++++ ++++ 9286 lines of diff (skipped) ++++++ cups-1.4-additional_policies.patch ++++++ --- /var/tmp/diff_new_pack.Jx7Rx6/_old 2010-11-12 14:30:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Jx7Rx6/_new 2010-11-12 14:30:56.000000000 +0100 @@ -1,17 +1,19 @@ ---- conf/cupsd.conf.in.orig 2010-01-27 11:49:09.000000000 +0100 -+++ conf/cupsd.conf.in 2010-01-27 11:55:34.000000000 +0100 -@@ -120,3 +120,23 @@ DefaultAuthType Basic +--- conf/cupsd.conf.in.orig 2010-11-12 09:04:07.000000000 +0100 ++++ conf/cupsd.conf.in 2010-11-12 09:16:14.000000000 +0100 +@@ -124,3 +124,25 @@ DefaultAuthType Basic # - # End of "$Id: cupsd.conf.in 8805 2009-08-31 16:34:06Z mike $". + # End of "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $". # + +# The policy below is added by openSUSE/Novell during build of our cups package. +# The policy 'allowallforanybody' is totally open and insecure and therefore +# it can only be used within an internal network where only trused users exist -+# and where the cupsd is not accessible at all from any external host. ++# and where the cupsd is not accessible at all from any external host, see ++# http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings +# Have in mind that any user who is allowed to do printer admin tasks -+# can change the print queues as he likes (e.g. send copies of confidental -+# print jobs from an internal network to any external destination). ++# can change the print queues as he likes - e.g. send copies of confidental ++# print jobs from an internal network to any external destination, see ++# http://en.opensuse.org/SDB:CUPS_in_a_Nutshell +# For documentation regarding 'Managing Operation Policies' see +# http://www.cups.org/documentation.php/doc-1.4/policies.html +<Policy allowallforanybody> @@ -20,7 +22,7 @@ + Allow from all + </Limit> +</Policy> -+# Explicitely set the CUPS 'default' policy to be used by default: ++# Explicitly set the CUPS 'default' policy to be used by default: +DefaultPolicy default +# End of additions by openSUSE/Novell. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit xorg-x11-util-devel for openSUSE:Factory
by root＠hilbert.suse.de 12 Nov '10

12 Nov '10

Hello community, here is the log from the commit of package xorg-x11-util-devel for openSUSE:Factory checked in at Fri Nov 12 14:30:05 CET 2010. -------- --- xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-10-31 03:29:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-11-12 13:59:45.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 12 12:55:11 UTC 2010 - sndirsch(a)novell.com + +- xorg-sgml-doctools 1.5.99.901 (1.6 RC1) + * This snapshot for the upcoming 7.6RC1 katamari makes the + entities compatible with the XML documents we now build in + xorg-docs, as well as providing various stylesheet updates + to improve the documentation formatting and generation. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xorg-sgml-doctools-1.5.tar.bz2 New: ---- xorg-sgml-doctools-1.5.99.901.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-util-devel.spec ++++++ --- /var/tmp/diff_new_pack.FBzoC2/_old 2010-11-12 14:28:17.000000000 +0100 +++ /var/tmp/diff_new_pack.FBzoC2/_new 2010-11-12 14:28:17.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: pkgconfig xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 5 +Release: 6 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -33,7 +33,7 @@ Source2: xorg-cf-files-1.0.3.tar.bz2 Source3: lndir-1.0.2.tar.bz2 Source4: makedepend-1.0.3.tar.bz2 -Source5: xorg-sgml-doctools-1.5.tar.bz2 +Source5: xorg-sgml-doctools-1.5.99.901.tar.bz2 Patch1: xconf-sparc.diff %description ++++++ xorg-sgml-doctools-1.5.tar.bz2 -> xorg-sgml-doctools-1.5.99.901.tar.bz2 ++++++ ++++ 2351 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/xorg-sgml-doctools-1.5/ChangeLog new/xorg-sgml-doctools-1.5.99.901/ChangeLog --- old/xorg-sgml-doctools-1.5/ChangeLog 2010-06-23 21:45:53.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/ChangeLog 2010-11-12 01:49:25.000000000 +0100 @@ -1,3 +1,96 @@ +commit e4638539f045f1095b25d3a68dc4256493852b9c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Nov 11 16:48:36 2010 -0800 + + 1.5.99.901 (1.6 RC 1) snapshot for X11R7.6 RC1 docs + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d0cec99095e0cdf01ff2695b1cc471214f2294ee +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Nov 7 19:48:37 2010 -0500 + + Upgrade xorg-sgml-doctools to Autoconf 2.60 directory architecture + + Currently the value of sgmlrootdir is hard coded relative to $prefix. + In Autoconf 2.60, $datarootdir has been added to define the architecture + independent data directory. + + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + + Relative to that location, a number of subdirectories have been defined: + + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root + [DATAROOTDIR/doc/xorg-sgml-doctools] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] + + The sgmlrootdir should hang off datarootdir. If there is a need to specify + a different location, a new configure option should be added: + + --sgmldir=DIR sgml stylesheets and entities [DATAROOTDIR/sgml] + + An sgmlrootdir Automake variable is defined in configure.ac to provide + a unique value holder for the sgmlrootdir. + + Variable PACKAGE_VERSION is preferred over the undocumented VERSION variable. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 45ee22dd4a64d4a07d6f67d5bdb80d4f2394e222 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sat Nov 6 13:29:16 2010 -0700 + + xorg.css: center <othercredit> as well + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 0ccec393a557df0469794483f68eec0276a1faed +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Nov 2 21:26:19 2010 -0700 + + defs.ent: Remove CDATA declarations from entities for xml compatibility + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit aafcb82452d58fafc3bd0ac013355c269ac9f7ee +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Sun Oct 31 16:20:11 2010 -0700 + + Update defs.ent for X11R7.6 RC1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit e89183b682bd81a974f48f8f9177674020996562 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 8 17:33:41 2010 -0700 + + xorg.xsl: make index links point to the indexterm location + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 251ae8ac450171ba9b868c9173e6cc0b50a569bc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Fri Oct 8 17:33:04 2010 -0700 + + xorg.css: center more bits of title pages + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 3286e44b95a8de6c563fc136c71b5defd6ae530c +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Mon Jun 28 00:00:42 2010 -0700 + + Add style rules for <screen> output sections to xorg.css + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + commit 54baef2c1d4dd6a99282530219f47bb4de0c6841 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Wed Jun 23 11:29:48 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/xorg-sgml-doctools-1.5/configure.ac new/xorg-sgml-doctools-1.5.99.901/configure.ac --- old/xorg-sgml-doctools-1.5/configure.ac 2010-06-23 20:30:03.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/configure.ac 2010-11-12 01:47:27.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ([2.60]) AC_INIT(xorg-sgml-doctools, - [1.5], + [1.5.99.901], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xorg-sgml-doctools) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -34,6 +34,8 @@ XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS +AC_SUBST([sgmlrootdir],['${datarootdir}/sgml']) + AC_PROG_INSTALL 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/xorg-sgml-doctools-1.5/defs.ent new/xorg-sgml-doctools-1.5.99.901/defs.ent --- old/xorg-sgml-doctools-1.5/defs.ent 2009-10-23 02:38:33.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/defs.ent 2010-11-03 05:25:08.000000000 +0100 @@ -3,18 +3,18 @@   -<!ENTITY majorvers CDATA "7"> -<!ENTITY reldate CDATA "October 2009"> -<!ENTITY relvers CDATA "7.5"> -<!ENTITY fullrelvers CDATA "7.5"> -<!ENTITY prevrelvers CDATA "7.4"> -<!ENTITY prevfullrelvers CDATA "7.4"> -<!ENTITY nextrelvers CDATA "7.6"> -<!ENTITY nextfullrelvers CDATA "7.6"> -<!ENTITY nextfullreldate CDATA "2010"> +<!ENTITY majorvers "7"> +<!ENTITY reldate "November 2010"> +<!ENTITY relvers "7.6"> +<!ENTITY fullrelvers "7.6"> +<!ENTITY prevrelvers "7.5"> +<!ENTITY prevfullrelvers "7.5"> +<!ENTITY nextrelvers "7.7"> +<!ENTITY nextfullrelvers "7.7"> +<!ENTITY nextfullreldate "2011"> -<!ENTITY whichfullrel CDATA "sixth"> -<!ENTITY rcnum CDATA "0"> +<!ENTITY whichfullrel "seventh"> +<!ENTITY rcnum "1">  <!ENTITY % firstsnap 'IGNORE'> 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/xorg-sgml-doctools-1.5/Makefile.am new/xorg-sgml-doctools-1.5.99.901/Makefile.am --- old/xorg-sgml-doctools-1.5/Makefile.am 2010-06-16 06:44:46.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/Makefile.am 2010-11-12 01:47:05.000000000 +0100 @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -sgmldir = $(prefix)/share/sgml/X11 +sgmldir = $(sgmlrootdir)/X11 dist_sgml_DATA = defs.ent xorg.css xorg.xsl 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/xorg-sgml-doctools-1.5/xorg.css new/xorg-sgml-doctools-1.5.99.901/xorg.css --- old/xorg-sgml-doctools-1.5/xorg.css 2010-06-19 04:24:11.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/xorg.css 2010-11-06 21:30:14.000000000 +0100 @@ -34,7 +34,7 @@ } .structname, .property, .errorname, .function, .parameter, .filename, -.type, .symbol, .funcsynopsis, .synopsis { +.type, .symbol, .funcsynopsis, .synopsis, .screen { font-family: monospace; } @@ -51,6 +51,17 @@ padding-top: 0.5em; } +.screen { + background: #e0ffff; + margin: 0 1.0em; + padding: 0.5em; + border: 1px solid #B0C4DE; + -moz-border-radius: 1.0em; + -webkit-border-radius: 1.0em; + -khtml-border-radius: 1.0em; + border-radius: 1.0em; +} + .funcsynopsis p, table p, .synopsis p, .figure p { margin: 0; } @@ -63,7 +74,8 @@ padding-left: 0.5em; } -h1, .author, .pubdate, .abstract { +h1, .author, .pubdate, .abstract, .subtitle, .releaseinfo, .authorgroup, +.othercredit { text-align: center; } 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/xorg-sgml-doctools-1.5/xorg-sgml-doctools.pc.in new/xorg-sgml-doctools-1.5.99.901/xorg-sgml-doctools.pc.in --- old/xorg-sgml-doctools-1.5/xorg-sgml-doctools.pc.in 2010-04-10 02:40:07.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/xorg-sgml-doctools.pc.in 2010-11-10 17:16:03.000000000 +0100 @@ -1,6 +1,7 @@ prefix=@prefix@ -sgmlrootdir=${prefix}/share/sgml +datarootdir=@datarootdir@ +sgmlrootdir=@sgmlrootdir@ Name: xorg-sgml-doctools -Description: SGML entities for X.Org documentation -Version: @VERSION@ +Description: Stylesheets and entities for X.Org documentation +Version: @PACKAGE_VERSION@ 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/xorg-sgml-doctools-1.5/xorg.xsl new/xorg-sgml-doctools-1.5.99.901/xorg.xsl --- old/xorg-sgml-doctools-1.5/xorg.xsl 2010-06-23 20:30:03.000000000 +0200 +++ new/xorg-sgml-doctools-1.5.99.901/xorg.xsl 2010-11-12 01:47:05.000000000 +0100 @@ -37,4 +37,7 @@ <xsl:param name="abstract.notitle.enabled" select="1"/> <xsl:param name="variablelist.as.table" select="1"/> <xsl:param name="use.svg" select="1"/> + +  + <xsl:param name="index.links.to.section" select="0"/> </xsl:stylesheet> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0