October 2010 - openSUSE Commits - openSUSE Mailing Lists

commit susedoc-buildbook for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Thu Oct 28 16:43:31 CEST 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-09-21 10:34:44.000000000 +0200 +++ susedoc-buildbook/susedoc-buildbook.changes 2010-10-27 15:41:46.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Oct 27 15:40:49 CEST 2010 - ke(a)suse.de + +- 0.17: +* doc_pre_checkin.sh: New. +* buildbook.sh: New features: copypac and initpac; allow automatic + submitreq; allow check_pack on-the-fly. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-buildbook-0.16.tar.bz2 New: ---- susedoc-buildbook-0.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.decJAd/_old 2010-10-28 16:43:02.000000000 +0200 +++ /var/tmp/diff_new_pack.decJAd/_new 2010-10-28 16:43:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.16) +# spec file for package susedoc-buildbook (Version 0.17) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Documentation/SUSE AutoReqProv: on Summary: susedoc Book Build Script -Version: 0.16 +Version: 0.17 Release: 1 Source: %{name}-%{version}.tar.bz2 Url: https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/susedoc-buildbook ++++++ susedoc-buildbook-0.16.tar.bz2 -> susedoc-buildbook-0.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/Makefile.am new/susedoc-buildbook-0.17/Makefile.am --- old/susedoc-buildbook-0.16/Makefile.am 2010-07-15 14:00:42.000000000 +0200 +++ new/susedoc-buildbook-0.17/Makefile.am 2010-10-27 15:37:47.000000000 +0200 @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign SPEC_IN = book.spec.in # SCRIPT_IN = buildbook-for-obs.sh.in -EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) +EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) doc_pre_checkin.sh packdir = $(DESTDIR)$(datadir)/@PACKAGE@ @@ -13,6 +13,7 @@ pushd $(packdir) ; \ ln -s buildbook.sh buildbook-for-obs.sh ; \ popd + $(install_sh_DATA) doc_pre_checkin.sh $(packdir) # buildbook-for-obs.sh: buildbook-for-obs.sh.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/Makefile.in new/susedoc-buildbook-0.17/Makefile.in --- old/susedoc-buildbook-0.16/Makefile.in 2010-09-21 10:09:10.000000000 +0200 +++ new/susedoc-buildbook-0.17/Makefile.in 2010-10-27 15:38:40.000000000 +0200 @@ -156,7 +156,7 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign SPEC_IN = book.spec.in # SCRIPT_IN = buildbook-for-obs.sh.in -EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) +EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) doc_pre_checkin.sh packdir = $(DESTDIR)$(datadir)/@PACKAGE@ # buildbook-for-obs.sh: buildbook-for-obs.sh.in @@ -511,6 +511,7 @@ pushd $(packdir) ; \ ln -s buildbook.sh buildbook-for-obs.sh ; \ popd + $(install_sh_DATA) doc_pre_checkin.sh $(packdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/NEWS new/susedoc-buildbook-0.17/NEWS --- old/susedoc-buildbook-0.16/NEWS 2010-09-21 10:32:49.000000000 +0200 +++ new/susedoc-buildbook-0.17/NEWS 2010-10-27 15:31:32.000000000 +0200 @@ -1,3 +1,8 @@ +0.17: +* doc_pre_checkin.sh: New. +* buildbook.sh: New features: copypac and initpac; allow automatic + submitreq; allow check_pack on-the-fly. + 0.16: * update_spec.pl: Fix typo, actually use obsoletes entries. * buildbook.sh: Fix the obsoleting opensuse-manuals_??-pdf statement. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/buildbook.sh new/susedoc-buildbook-0.17/buildbook.sh --- old/susedoc-buildbook-0.16/buildbook.sh 2010-09-21 13:07:04.000000000 +0200 +++ new/susedoc-buildbook-0.17/buildbook.sh 2010-10-27 14:51:06.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -TEMP=$(getopt -o ce:d:l:n:p:s:u:x \ - --long check-pack,debug,def:,extdir:,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \ +TEMP=$(getopt -o acf:e:d:il:n:p:r:s:u:x \ + --long automatic,check-pack,copy,copypac,copypack,debug,def:,extdir:,init,initpac,initpack,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \ -n "$0" -- "$@") # Note the quotes around `$TEMP': they are essential! eval set -- "$TEMP" @@ -28,14 +28,20 @@ # default obsuser=keichwa +my_echo=echo while true ; do case "$1" in + -a|--automatic) my_echo=""; shift 1;; -c|--check-pack) check_pack=yes; shift 1;; - -e|--extdir) packdir=$2 ; extdir=true ; check_dir $packdir; shift 2 ;; + --copy|--copypac|--copypack) make_type=copy; shift 1;; -d|--def) product_file=$2 ; check_file $product_file; shift 2 ;; + -e|--extdir) packdir=$2 ; extdir=true ; check_dir $packdir; shift 2 ;; + -f) from_api_server=$2; shift 2 ;; + -i|--init|--initpac|--initpack) make_type=init; shift 1;; -l|--lang) LL=$2 ; shift 2 ;; -p|--pdf) pdf=$2 ; check_file $pdf; shift 2 ;; --prep-local) prep_local=yes ; shift 1 ;; + -r) from_repo=$2; shift 2 ;; -s|--spec) spec_in=$2; shift 2 ;; -n|--name|--product) product=$2 ; shift 2 ;; -u|--user|--obsuser) obsuser=$2 ; shift 2;; @@ -55,6 +61,8 @@ Usage: $0 [options] -d DEF-file -n package_name Valid options are: + -u user + specify the OBS username, default: '$obsuser' -n package-name (without _LL) Ususally 'PRODUCTNAME-guide', check the Product devel projects for example names. @@ -68,8 +76,12 @@ prepare local, do not submit to a build service instance -s spec-file use this spec-file as the template spec file - -u user - specify the OBS username, default: '$obsuser' + -a + automatic update (= send submitreq without human interaction) + --copy -f SOURCE-API-SERVER -r SOURCE-REPO + copy package (untested) + -i + initialize package -x enable debugging. EOFusage @@ -77,12 +89,27 @@ exit 1 } -#echo $product_file $pdf $product -#exit +#echo=echo +[ -z "$my_echo" ] && \ + [ "$make_type" = copy -o "$make_type" = init ] && { + echo "automactic submission does not work with --copypac or --initpac" + exit 1 +} +[ -z "$make_type" ] && make_type=update +if [ "$make_type" = copy ]; then + [ -z "$from_api_server" ] && { + echo "from where to copy is missing: -f SOURCE-API-SERVER"; exit 1 + } + [ -z "$from_repo" ] && { + echo "from which repo to copy is missing: -r SOURCE-REPO"; exit 1 + } +fi if [ -z "$LL" ]; then - # LL=$(make VARIABLE=LL showvariable) - LL=$(basename $(pwd)) + LL=$(make VARIABLE=LL showvariable) + [ -z "$LL"] && { echo "source ENV-* first"; exit 1; } + # this is not reliable enough... + # LL=$(basename $(pwd)) fi # product=opensuse-manual #product=$2 @@ -107,11 +134,15 @@ fi # echo $spec_in; exit spec=autobuild/${product}_${LL}.spec -# comment if packages are to be built -#echo=echo -make_package () { +make_validate () { $echo make validate || exit 1 + # now build the environment +} + +make_package () { + # $echo make validate || exit 1 + make_validate $echo make package || exit 1 } @@ -292,7 +323,8 @@ : else if [ -z "$extdir" ]; then - $echo make validate || exit 1 + # $echo make validate || exit 1 + make_validate $echo make package-pdf || exit 1 # $echo make pdf-color # sources and graphics come with the HTML package @@ -381,7 +413,8 @@ else # build the real package if [ -z "$extdir" ]; then - $echo make validate || exit 1 + # $echo make validate || exit 1 + make_validate $echo make package-html || exit 1 cp -p package-html-$1/${1}_$LL-{graphics,html,desktop}.tar.bz2 \ package-html-$1/${1}_$LL.tar.bz2 autobuild @@ -479,6 +512,16 @@ done ### append "-pdf" after(!) the version number!!! pdfobs="$pdfobs opensuse-manuals_$LL=11.3-pdf" + pdfobs="$pdfobs opensuse-apparmor-admin_$LL=11.3-pdf" + case $LL in + de) pdfobs="$pdfobs opensuse-apps_$LL=11.3-pdf" + pdfobs="$pdfobs opensuse-gnomeuser_$LL=11.3-pdf" + pdfobs="$pdfobs opensuse-kdeuser_$LL=11.3-pdf" + pdfobs="$pdfobs opensuse-security_$LL=11.3-pdf" + ;; + *) true + ;; + esac set_obs_in_spec elif [ $product = sled-manuals ]; then # obsolete since sle11 @@ -546,42 +589,13 @@ if osc -A $check_server meta pkg $check_repo $package; then echo $? else - echo does not exist in BS: $? + echo "$package does not exist in $check_repo: $?" + echo "copy it from somewhere else or initialize it manually" + exit 0 fi - exit 0 } -prep_xbs () { - sr_server=${1:-https\://api.opensuse.org} - sr_repo=${2:-openSUSE\:Factory} -# finally prep package dir for the build system - [ -d $package ] && old $package - { - # osc -A $sr_server branch $sr_repo $package - # check whether a devel project exists - devel=$(osc -A $sr_server meta pkg $sr_repo $package \ - | xml sel -t -v //devel/@project) - # check whether user is $devel maintainer - [ -n "$devel" ] \ - && userp=$(osc -A $sr_server meta prj $devel \ - | xml sel -t -v //person/@userid=\'$obsuser\') - repo=${devel:-$sr_repo} - if [ -n "$userp" ]; then - # $devel exists and user is maintainer, thus use $devel - old $devel/$package - osc -A $sr_server co $devel/$package - wdir=$devel/$package - else - # first delete to avoid conflicts - osc -A $sr_server rdelete home:$obsuser:branches:$repo $package - osc -A $sr_server branch -m"branch from $sr_repo" $sr_repo $package - wdir=home:$obsuser:branches:$repo/$package - osc -A $sr_server co $wdir - fi - } || { - echo $package not accessible by osc - install -d $package - } +fix_spec_and_copy_autobuild () { [ -n "$DISTVER" ] && PACK_VER=${DISTVER/ *SP/.} sed -i "\ s:@version@:${PACK_VER:-$version}: @@ -600,20 +614,133 @@ cd $wdir # home:$obsuser:branches:$repo/$package sed -i s:update_spec.pl:/usr/bin/update_spec: doc_pre_checkin.sh bash ./doc_pre_checkin.sh - osc vc -m"Update text and image files." - osc ci -m"Update $package" + default_msg="Update text and image files" + osc vc -m"$default_msg." + osc addremove + osc ci -m"$package: $default_msg" +} + +tmp_project_values="<project name=\"home:$obsuser:tmp\">\ + <title>tmp</title>\ + <description> </description>\ + <person role=\"maintainer\" userid=\"$obsuser\"/>\ + <person role=\"bugowner\" userid=\"$obsuser\"/>\ + <debuginfo> <disable/> </debuginfo>\ + <build> <enable/> </build>\ + <publish> <disable/> </publish>\ +</project>" + +tmp_package_values="<package name=\"$package\">\ + <title>$package</title>\ + <description> </description>\ + <person role=\"maintainer\" userid=\"$obsuser\"/>\ + <person role=\"bugowner\" userid=\"$obsuser\"/>\ +</package>" + +copypac () { + osc -A $sr_server rdelete home:$obsuser:tmp $package + osc -A $sr_server meta prj home:$obsuser:tmp \ + || echo $tmp_project_values \ + | osc -A https://api.suse.de meta prj home:$obsuser:tmp -F - + osc -A $from_api_server copypac \ + -t $sr_server $from_repo $package home:$obsuser:tmp + wdir=home:$obsuser:tmp/$package + fix_spec_and_copy_autobuild + + echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser $package $sr_repo" +} + +initpac () { + osc -A $sr_server rdelete home:$obsuser:tmp $package + osc -A $sr_server meta prj home:$obsuser:tmp \ + || echo $tmp_project_values \ + | osc -A https://api.suse.de meta prj home:$obsuser:tmp -F - + osc -A $sr_server meta pkg home:$obsuser:tmp $package \ + || echo $tmp_package_values \ + | osc -A https://api.suse.de meta pkg home:$obsuser:tmp $package -F - + wdir=home:$obsuser:tmp/$package + osc -A $sr_server co $wdir + echo true > $wdir/doc_pre_checkin.sh + { + echo "group.$package Documentation/SUSE" + echo "license.$package GFDL 1.2" + echo "summary.$package guide (English)" + echo "+description.$package" + echo "" + echo "-description.$package" + echo "group.$package-pdf Documentation/SUSE" + echo "license.$package-pdf GFDL 1.2" + echo "summary.$package-pdf guide (English)" + echo "+description.$package-pdf" + echo "" + echo "-description.$package-pdf" + } > $wdir/attributes + + fix_spec_and_copy_autobuild + + echo "osc -A $sr_server sr -m \"$default_msg\" home:$obsuser:tmp $package $sr_repo" +} + +updatepac () { +# finally prep package dir for the build system + [ -d $package ] && old $package + { + # osc -A $sr_server branch $sr_repo $package + # check whether a devel project exists + devel=$(osc -A $sr_server meta pkg $sr_repo $package \ + | xml sel -t -v //devel/@project) - if [ -n "$userp" ]; then - echo "osc -A $sr_server sr $devel $package $sr_repo" - else if [ -n "$devel" ]; then - echo "osc -A $sr_server sr home:$obsuser:branches:$repo $package $devel" + repo=$devel else - echo "osc -A $sr_server sr home:$obsuser:branches:$repo $package $sr_repo" + repo=$sr_repo fi + + userp=$(osc -A $sr_server meta prj $repo \ + | xml sel -t -v //person[@role=\'maintainer\']/@userid=\'$obsuser\') + if "$userp" ; then + # $devel exists and user is maintainer, thus use $devel + old $repo/$package + osc -A $sr_server co $repo/$package + wdir=$repo/$package + else + # first delete to avoid conflicts + osc -A $sr_server rdelete home:$obsuser:branches:$repo $package + osc -A $sr_server branch -m"branch from $repo" $repo $package + wdir=home:$obsuser:branches:$repo/$package + osc -A $sr_server co $wdir + fi + } || { + echo $package not accessible by osc + install -d $package + } + + fix_spec_and_copy_autobuild + + if [ -n "$devel" -a "$userp" = true ]; then + # submitreq to product + $my_echo "osc -A $sr_server sr -m\"$default_msg\" $repo $package $repo" + elif [ -n "$devel" -a "$userp" = false ]; then + $my_echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser:branches:$repo $package $devel" + elif [ -z "$devel" -a "$userp" = false ]; then + $my_echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser:branches:$repo $package $repo" + else + # $userp, but no $devel -- everything is fine + : fi } +prep_xbs () { + sr_server=${1:-https\://api.opensuse.org} + sr_repo=${2:-openSUSE\:Factory} + case $3 in + update) updatepac ;; + copy) copypac ;; + init) initpac ;; + *) echo "unsupported make_type"; exit 1 ;; + esac +} + ### ### main ### @@ -643,6 +770,6 @@ echo $((no++)) >/dev/null done < <(grep -v ^# $product_file) -[ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj +[ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj $make_type exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/configure new/susedoc-buildbook-0.17/configure --- old/susedoc-buildbook-0.16/configure 2010-09-21 10:09:11.000000000 +0200 +++ new/susedoc-buildbook-0.17/configure 2010-10-27 15:32:29.000000000 +0200 @@ -2121,7 +2121,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.16 + VERSION=0.17 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/configure.ac new/susedoc-buildbook-0.17/configure.ac --- old/susedoc-buildbook-0.16/configure.ac 2010-09-21 10:04:44.000000000 +0200 +++ new/susedoc-buildbook-0.17/configure.ac 2010-10-27 15:31:53.000000000 +0200 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.16]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.17]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.16/doc_pre_checkin.sh new/susedoc-buildbook-0.17/doc_pre_checkin.sh --- old/susedoc-buildbook-0.16/doc_pre_checkin.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/susedoc-buildbook-0.17/doc_pre_checkin.sh 2010-09-24 10:55:16.000000000 +0200 @@ -0,0 +1,7 @@ +#!/bin/bash + +filename=$(echo *.spec) +perl /usr/bin/update_spec $filename attributes > $filename.new + mv $filename.new $filename + +exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 decibel-audio-player for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package decibel-audio-player for openSUSE:Factory checked in at Thu Oct 28 16:42:48 CEST 2010. -------- --- decibel-audio-player/decibel-audio-player.changes 2010-08-05 16:26:29.000000000 +0200 +++ decibel-audio-player/decibel-audio-player.changes 2010-10-28 15:46:36.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Oct 22 17:53:30 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 1.06: + + Features: + - Albums in the Library can be added to favorites using the + popup menu + - lp#605644: Added an option to search for covers in parent + directories as well + + Bugs fixed: + - lp#603902" CD explorer not always removed when unloading the + CD module + - lp#604016: AudioScrobbler submission blocked by '\0' bytes + - lp#607261: Tracklist scrolls up upon insertion + - lp#610202: List of explorers not kept sorted when renaming a + library + - File chooser dialog box does not appear on some systems + - lp#656040: Can't play previous track from the remote + - lp#654321: Scaling covers should preserve ratio + + Other changes: + - Revamped the preferences dialog box + - lp#611703: Respect the "Show hidden files" option when + playing tracks from the File Explorer + - Automatically show preferences the first time the application + is started. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- decibel-audio-player-1.05.tar.bz2 New: ---- decibel-audio-player-1.06.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ decibel-audio-player.spec ++++++ --- /var/tmp/diff_new_pack.6BdIth/_old 2010-10-28 16:42:16.000000000 +0200 +++ /var/tmp/diff_new_pack.6BdIth/_new 2010-10-28 16:42:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package decibel-audio-player (Version 1.05) +# spec file for package decibel-audio-player (Version 1.06) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: decibel-audio-player -Version: 1.05 +Version: 1.06 Release: 1 License: GPLv2+ Summary: Decibel Audio Player Is an Easy to Use Audio Player ++++++ decibel-audio-player-1.05.tar.bz2 -> decibel-audio-player-1.06.tar.bz2 ++++++ ++++ 5030 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 cherrytree for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package cherrytree for openSUSE:Factory checked in at Thu Oct 28 16:42:06 CEST 2010. -------- --- GNOME/cherrytree/cherrytree.changes 2010-09-19 09:20:14.000000000 +0200 +++ cherrytree/cherrytree.changes 2010-10-28 15:43:23.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Oct 22 17:46:50 CEST 2010 - dimstar(a)opensuse.org + +- Update to version 0.15: + + Improved the find/replace utility adding the 'all matches' + option which allows to find/replace all matches at once and + list the results + + Fixed find/replace bugs + + Added the menu item (help--check newer version) and preferences + dialog option to automatically check for newer version + + Fixed bugs in the import from basket + + Fixed bug in the printing of codeboxes bigger than the A4 size + + Fixed bug in bulleted and numbered lists + + Added the find/replace menu items to right click menus, + reorganized some menu items + + When inserting a codebox, if some text is highlighted it will + be automatically moved into the codebox + + Fixed bug crashing the app when closing from top right cross + and then selecting cancel. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cherrytree-0.14.2.tar.bz2 New: ---- cherrytree-0.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cherrytree.spec ++++++ --- /var/tmp/diff_new_pack.FX6sY2/_old 2010-10-28 16:41:43.000000000 +0200 +++ /var/tmp/diff_new_pack.FX6sY2/_new 2010-10-28 16:41:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cherrytree (Version 0.14.2) +# spec file for package cherrytree (Version 0.15) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: cherrytree -Version: 0.14.2 +Version: 0.15 Release: 1 License: GPLv2+ Summary: A hierarchical note taking application @@ -55,10 +55,9 @@ %install %{__python} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot} -rm %{buildroot}%{_datadir}/cherrytree/glade/cherrytree.glade.h # Remove old mime registration files -rm -f %{buildroot}%{_datadir}/application-registry/cherrytree.* -rm -f %{buildroot}%{_datadir}/mime-info/cherrytree.* +rm %{buildroot}%{_datadir}/application-registry/cherrytree.* +rm %{buildroot}%{_datadir}/mime-info/cherrytree.* %find_lang %{name} %suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor ++++++ cherrytree-0.14.2.tar.bz2 -> cherrytree-0.15.tar.bz2 ++++++ ++++ 19668 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-libs for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at Thu Oct 28 16:41:19 CEST 2010. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2010-10-27 09:36:56.000000000 +0200 +++ xorg-x11-libs/xorg-x11-libs.changes 2010-10-28 16:20:31.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Oct 28 14:14:29 UTC 2010 - sndirsch(a)novell.com + +- libXcomposite 0.4.3 + * This minor maintenance release provides build improvements and + reduces both buildtime & runtime dependencies of the library. +- libXcursor 1.1.11 + * This minor maintenance release provides the usual recent set + of build configuration improvements and janitorial cleanups. +- libXinerama 1.1.1 + * This minor maintenance release of the Xlib-based library for + the Xinerama extension protocol provides the usual set of + recent build configuration improvements and janitorial + cleanups. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libXcomposite-0.4.2.tar.bz2 libXcursor-1.1.10.tar.bz2 libXinerama-1.1.tar.bz2 New: ---- libXcomposite-0.4.3.tar.bz2 libXcursor-1.1.11.tar.bz2 libXinerama-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.YBJMHE/_old 2010-10-28 16:40:02.000000000 +0200 +++ /var/tmp/diff_new_pack.YBJMHE/_new 2010-10-28 16:40:02.000000000 +0200 @@ -34,7 +34,7 @@ # Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 8 +Release: 9 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -44,14 +44,14 @@ Source3: libXScrnSaver-1.2.0.tar.bz2 Source4: libXTrap-X11R7.0-1.0.0.tar.bz2 Source5: libXaw-1.0.8.tar.bz2 -Source6: libXcomposite-0.4.2.tar.bz2 -Source7: libXcursor-1.1.10.tar.bz2 +Source6: libXcomposite-0.4.3.tar.bz2 +Source7: libXcursor-1.1.11.tar.bz2 Source8: libXdamage-1.1.3.tar.bz2 Source9: libXevie-1.0.2.tar.bz2 Source10: libXfont-1.4.2.tar.bz2 Source11: libXfontcache-1.0.5.tar.bz2 Source12: libXft-2.1.14.tar.bz2 -Source14: libXinerama-1.1.tar.bz2 +Source14: libXinerama-1.1.1.tar.bz2 Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2 Source16: libXrandr-1.3.0.tar.bz2 Source17: libXtst-1.1.0.tar.bz2 ++++++ libXcomposite-0.4.2.tar.bz2 -> libXcomposite-0.4.3.tar.bz2 ++++++ ++++ 10268 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/libXcomposite-0.4.2/ChangeLog new/libXcomposite-0.4.3/ChangeLog --- old/libXcomposite-0.4.2/ChangeLog 2010-06-09 02:06:00.000000000 +0200 +++ new/libXcomposite-0.4.3/ChangeLog 2010-10-28 07:40:53.000000000 +0200 @@ -1,3 +1,77 @@ +commit 8898782b98457292057d249ab9e40cfc2fed7d8d +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Oct 27 22:40:32 2010 -0700 + + libXcomposite 0.4.3 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 206af895a90d5582a8078c86a33a0ba5888b7e27 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sun Aug 15 10:41:17 2010 -0400 + + man: list files to install only once + + Newer versions of autoconf detect that error. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 542ff68e43a33a5c1849f9a88d2d5cc6d0827d04 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Aug 14 20:12:57 2010 -0400 + + man: store shadow man pages in git rather than generating them + + Simplify the build process and the makefile. + + Local fix in CVS for bug 5628 is not required + as the problem has been fixed in + util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 976db8a67a3e0462d0a675e2bfb2fe715e715bae +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Sat Aug 14 19:58:14 2010 -0400 + + 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 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit dc0afc177521014462baa966359b45d7a40a0c63 +Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br> +Date: Thu Jul 1 06:52:10 2010 -0300 + + Purge macros NEED_EVENTS and NEED_REPLIES + + Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br> + Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 219e4de3666e3a7dda42c64ab1539a4cc5adbee4 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jun 30 22:49:26 2010 -0700 + + Remove unneeded dependencies from configure.ac & xcomposite.pc + + We only need Xfixes headers for the XserverRegion definition, don't + need to link against it directly or require clients link against it, + so only use CFLAGS from it in the Makefile, and only list it in + Requires.private in the .pc file. + + Don't need libXext at all - no headers or functions from it are used. + + Also clean up some extra appearances of *_CFLAGS & *_LIBS that aren't needed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> + Acked-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit 01c4691e18b536de6585a0e93e05e2831cf2be34 Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> Date: Tue Jun 8 17:05:02 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXcomposite-0.4.2/configure.ac new/libXcomposite-0.4.3/configure.ac --- old/libXcomposite-0.4.2/configure.ac 2010-06-09 02:04:49.000000000 +0200 +++ new/libXcomposite-0.4.3/configure.ac 2010-10-28 07:39:50.000000000 +0200 @@ -33,16 +33,16 @@ dnl synchronized. dnl AC_INIT(libXcomposite, - 0.4.2, + [0.4.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: 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.6 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.6) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) AM_CONFIG_HEADER(config.h) # Check for progs @@ -65,9 +65,8 @@ fi COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^$[0-9][0-9]*\.[0-9][0-9]*$.*$/\1/'`] AC_SUBST(COMPOSITEEXT_VERSION) -PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto) -AC_SUBST(XCOMPOSITE_CFLAGS) -AC_SUBST(XCOMPOSITE_LIBS) +PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11) +PKG_CHECK_MODULES(XFIXES, xfixes) AC_OUTPUT([Makefile src/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/libXcomposite-0.4.2/man/Makefile.am new/libXcomposite-0.4.3/man/Makefile.am --- old/libXcomposite-0.4.2/man/Makefile.am 2010-01-30 08:38:16.000000000 +0100 +++ new/libXcomposite-0.4.3/man/Makefile.am 2010-09-04 01:15:46.000000000 +0200 @@ -1,12 +1,11 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - libman_xml = Xcomposite.xml -libman_PRE = $(libman_xml:xml=man) +libman_PRE = $(libman_xml:xml=man) \ + $(Xcomposite_shadows:=.man) -Xcomposite_man_aliases = \ +Xcomposite_shadows = \ XCompositeQueryExtension \ XCompositeQueryVersion \ XCompositeVersion \ @@ -19,45 +18,21 @@ XCompositeGetOverlayWindow \ XCompositeReleaseOverlayWindow -Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) - if INSTALL_MANPAGES -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xcomposite_shadowmen) +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) endif EXTRA_DIST = $(libman_PRE) $(libman_xml) CLEANFILES = $(libman_DATA) -MAINTAINERCLEANFILES = $(libman_PRE) - -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) -$(Xcomposite_shadowmen): - $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ - -# Substitute system-specific values 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' +MAINTAINERCLEANFILES = $(libman_xml:xml=man) SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate nroff sources from DocBook/xml 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/libXcomposite-0.4.2/man/XCompositeCreateRegionFromBorderClip.man new/libXcomposite-0.4.3/man/XCompositeCreateRegionFromBorderClip.man --- old/libXcomposite-0.4.2/man/XCompositeCreateRegionFromBorderClip.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeCreateRegionFromBorderClip.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeGetOverlayWindow.man new/libXcomposite-0.4.3/man/XCompositeGetOverlayWindow.man --- old/libXcomposite-0.4.2/man/XCompositeGetOverlayWindow.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeGetOverlayWindow.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeNameWindowPixmap.man new/libXcomposite-0.4.3/man/XCompositeNameWindowPixmap.man --- old/libXcomposite-0.4.2/man/XCompositeNameWindowPixmap.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeNameWindowPixmap.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeQueryExtension.man new/libXcomposite-0.4.3/man/XCompositeQueryExtension.man --- old/libXcomposite-0.4.2/man/XCompositeQueryExtension.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeQueryExtension.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeQueryVersion.man new/libXcomposite-0.4.3/man/XCompositeQueryVersion.man --- old/libXcomposite-0.4.2/man/XCompositeQueryVersion.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeQueryVersion.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeRedirectSubwindows.man new/libXcomposite-0.4.3/man/XCompositeRedirectSubwindows.man --- old/libXcomposite-0.4.2/man/XCompositeRedirectSubwindows.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeRedirectSubwindows.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeRedirectWindow.man new/libXcomposite-0.4.3/man/XCompositeRedirectWindow.man --- old/libXcomposite-0.4.2/man/XCompositeRedirectWindow.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeRedirectWindow.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeReleaseOverlayWindow.man new/libXcomposite-0.4.3/man/XCompositeReleaseOverlayWindow.man --- old/libXcomposite-0.4.2/man/XCompositeReleaseOverlayWindow.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeReleaseOverlayWindow.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeUnredirectSubwindows.man new/libXcomposite-0.4.3/man/XCompositeUnredirectSubwindows.man --- old/libXcomposite-0.4.2/man/XCompositeUnredirectSubwindows.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeUnredirectSubwindows.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeUnredirectWindow.man new/libXcomposite-0.4.3/man/XCompositeUnredirectWindow.man --- old/libXcomposite-0.4.2/man/XCompositeUnredirectWindow.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeUnredirectWindow.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/man/XCompositeVersion.man new/libXcomposite-0.4.3/man/XCompositeVersion.man --- old/libXcomposite-0.4.2/man/XCompositeVersion.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcomposite-0.4.3/man/XCompositeVersion.man 2010-09-04 01:15:46.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ 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/libXcomposite-0.4.2/src/Makefile.am new/libXcomposite-0.4.3/src/Makefile.am --- old/libXcomposite-0.4.2/src/Makefile.am 2009-10-16 23:26:57.000000000 +0200 +++ new/libXcomposite-0.4.3/src/Makefile.am 2010-07-01 07:42:53.000000000 +0200 @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include lib_LTLIBRARIES = libXcomposite.la @@ -28,7 +28,7 @@ xcompositeint.h \ Xcomposite.c -libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS) +libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined 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/libXcomposite-0.4.2/src/xcompositeint.h new/libXcomposite-0.4.3/src/xcompositeint.h --- old/libXcomposite-0.4.2/src/xcompositeint.h 2010-06-09 01:59:12.000000000 +0200 +++ new/libXcomposite-0.4.3/src/xcompositeint.h 2010-07-08 00:33:38.000000000 +0200 @@ -45,8 +45,6 @@ #ifndef _XCOMPOSITEINT_H_ #define _XCOMPOSITEINT_H_ -#define NEED_EVENTS -#define NEED_REPLIES #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xlibint.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/libXcomposite-0.4.2/xcomposite.pc.in new/libXcomposite-0.4.3/xcomposite.pc.in --- old/libXcomposite-0.4.2/xcomposite.pc.in 2009-10-16 23:26:57.000000000 +0200 +++ new/libXcomposite-0.4.3/xcomposite.pc.in 2010-07-01 07:47:16.000000000 +0200 @@ -4,9 +4,9 @@ includedir=@includedir@ Name: Xcomposite -Description: X Composite Library +Description: X Composite Extension Library Version: @PACKAGE_VERSION@ -Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes -Requires.private: x11 xfixes xext +Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ +Requires.private: x11 xfixes Cflags: -I${includedir} Libs: -L${libdir} -lXcomposite ++++++ libXcursor-1.1.10.tar.bz2 -> libXcursor-1.1.11.tar.bz2 ++++++ ++++ 38926 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/libXcursor-1.1.10/ChangeLog new/libXcursor-1.1.11/ChangeLog --- old/libXcursor-1.1.10/ChangeLog 2009-08-28 06:50:03.000000000 +0200 +++ new/libXcursor-1.1.11/ChangeLog 2010-10-28 07:48:48.000000000 +0200 @@ -1,3 +1,162 @@ +commit 731e84d79e83b59d022d0f453b245696b4d2750f +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Oct 27 22:48:19 2010 -0700 + + libXcursor 1.1.11 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 42b7717c32b3c7097180667a9ba2f62e40fc6506 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Aug 16 19:28:57 2010 -0400 + + man: whitespace management + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 862bc06d58152e74e85fc29db7eaec06af20e00b +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Aug 16 19:25:25 2010 -0400 + + man: reorder makefile statements + + No functional change. Shadows are part of libman_PRE. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b18568dd5b5a11ae49cad66a54ec50465c6ffa77 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Aug 16 19:17:21 2010 -0400 + + man: store shadow man pages in git rather than generating them + + Simplify the build process and the makefile. + + Local fix in CVS for bug 5628 is not required + as the problem has been fixed in + util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 68d830bcf67632b474c8996b6a2c9bcde8e27f97 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Aug 16 19:05:35 2010 -0400 + + 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 + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 0caadca51ca56a2ae2cfe67cbd2b29e89b6a68d8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Mar 29 16:50:33 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit b511b260ddcec34035c1d97285f27f3182663a6a +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Mar 29 14:53:48 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit a3e03bb23bf7a92bf20d51eebe692e0a4f667065 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Feb 16 10:37:21 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 8198d1490959d49573790405e205a471ac7a5b98 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit ecddb70049a1e79b88d4d647f7e944237055fa2e +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 02cd3d7a617c71dbc13023f91f41b896dc260c50 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 1ca6aefa6690930b336490525f5ed515ddad26ac +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:42 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 1c158db62ad2c7584d88e840f3c7fe151de84150 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:19 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 5e14cd9bd8a8f9266ecaa69d58c15d8e298d8a78 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:24 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 fbf229879370a96a070ebf087426f6f6c0dbe5a2 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Fri Aug 28 14:49:15 2009 +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/libXcursor-1.1.10/INSTALL new/libXcursor-1.1.11/INSTALL --- old/libXcursor-1.1.10/INSTALL 2009-03-10 00:25:59.000000000 +0100 +++ new/libXcursor-1.1.11/INSTALL 2010-10-28 07:48:48.000000000 +0200 @@ -1,5 +1,8 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -7,7 +10,10 @@ Basic Installation ================== - These are generic installation instructions. + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -20,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -32,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -64,6 +67,9 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== @@ -75,7 +81,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -84,34 +90,46 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -134,6 +152,28 @@ 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 ========================== @@ -156,7 +196,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -186,9 +226,14 @@ ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is +causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + `configure' Invocation ====================== @@ -197,7 +242,14 @@ `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -224,6 +276,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXcursor-1.1.10/Makefile.am new/libXcursor-1.1.11/Makefile.am --- old/libXcursor-1.1.10/Makefile.am 2009-03-10 00:25:59.000000000 +0100 +++ new/libXcursor-1.1.11/Makefile.am 2010-04-10 02:45:46.000000000 +0200 @@ -26,19 +26,20 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xcursor.pc -EXTRA_DIST = xcursor.pc.in +MAINTAINERCLEANFILES = ChangeLog INSTALL if LINT lint: (cd src && $(MAKE) $(MFLAGS) lint) endif LINT -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/libXcursor-1.1.10/config.h.in new/libXcursor-1.1.11/config.h.in --- old/libXcursor-1.1.10/config.h.in 2009-08-28 06:49:51.000000000 +0200 +++ new/libXcursor-1.1.11/config.h.in 2010-10-28 07:48:44.000000000 +0200 @@ -52,6 +52,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/libXcursor-1.1.10/configure.ac new/libXcursor-1.1.11/configure.ac --- old/libXcursor-1.1.10/configure.ac 2009-08-28 06:48:54.000000000 +0200 +++ new/libXcursor-1.1.11/configure.ac 2010-10-28 07:47:31.000000000 +0200 @@ -21,27 +21,29 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) dnl dnl This is the package version number, not the shared library dnl version. This same version number must appear in Xcursor.h dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from Xcursor.h dnl -AC_INIT([libXcursor],1.1.10,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor]) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT([libXcursor], [1.1.11], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_SRCDIR([Makefile.am]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require 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.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=<path>], @@ -68,13 +70,6 @@ # Check for X PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto) AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes]) -XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS" -AC_SUBST(XCURSOR_CFLAGS) -AC_SUBST(XCURSOR_LIBS) - -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT 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/libXcursor-1.1.10/man/Makefile.am new/libXcursor-1.1.11/man/Makefile.am --- old/libXcursor-1.1.10/man/Makefile.am 2009-03-10 00:25:59.000000000 +0100 +++ new/libXcursor-1.1.11/man/Makefile.am 2010-09-04 01:15:50.000000000 +0200 @@ -1,73 +1,51 @@ libmandir = $(LIB_MAN_DIR) -libman_PRE = Xcursor.man -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) +libman_PRE = \ + Xcursor.man \ + $(Xcursor_shadows:=.man) + +Xcursor_shadows = \ + XcursorImageCreate \ + XcursorImageDestroy \ + XcursorImagesCreate \ + XcursorImagesDestroy \ + XcursorCursorsCreate \ + XcursorCursorsDestroy \ + XcursorXcFileLoadImage \ + XcursorXcFileLoadImages \ + XcursorXcFileLoadAllImages \ + XcursorXcFileLoad \ + XcursorXcFileSave \ + XcursorFilenameLoadImage \ + XcursorFilenameLoadImages \ + XcursorFilenameLoadAllImages \ + XcursorFilenameLoad \ + XcursorFilenameSaveImages \ + XcursorFilenameSave \ + XcursorLibraryLoadImage \ + XcursorLibraryLoadImages \ + XcursorFilenameLoadCursor \ + XcursorLibraryLoadCursor \ + XcursorLibraryLoadCursors \ + XcursorShapeLoadImage \ + XcursorShapeLoadImages \ + XcursorShapeLoadCursor \ + XcursorShapeLoadCursors \ + XcursorSupportsARGB \ + XcursorSetDefaultSize \ + XcursorGetDefaultSize \ + XcursorSetTheme \ + XcursorGetTheme -all-local: $(libman_DATA) +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) SUFFIXES = .$(LIB_MAN_SUFFIX) .man -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - -MAN_SUBSTS = \ - -e 's|__xorgversion__|"$(XORGRELSTRING)"|' \ - -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \ - -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' +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' .man.$(LIB_MAN_SUFFIX): - -rm -f $@ - sed $(MAN_SUBSTS) < $< > $@ - -# Generate man page shadow files - -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) -libman_DATA += $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) -BUILT_SOURCES = shadows.DONE -CLEANFILES += shadows.DONE - -Xcursor_shadows = \ - XcursorImageCreate \ - XcursorImageDestroy \ - XcursorImagesCreate \ - XcursorImagesDestroy \ - XcursorCursorsCreate \ - XcursorCursorsDestroy \ - XcursorXcFileLoadImage \ - XcursorXcFileLoadImages \ - XcursorXcFileLoadAllImages \ - XcursorXcFileLoad \ - XcursorXcFileSave \ - XcursorFilenameLoadImage \ - XcursorFilenameLoadImages \ - XcursorFilenameLoadAllImages \ - XcursorFilenameLoad \ - XcursorFilenameSaveImages \ - XcursorFilenameSave \ - XcursorLibraryLoadImage \ - XcursorLibraryLoadImages \ - XcursorFilenameLoadCursor \ - XcursorLibraryLoadCursor \ - XcursorLibraryLoadCursors \ - XcursorShapeLoadImage \ - XcursorShapeLoadImages \ - XcursorShapeLoadCursor \ - XcursorShapeLoadCursors \ - XcursorSupportsARGB \ - XcursorSetDefaultSize \ - XcursorGetDefaultSize \ - XcursorSetTheme \ - XcursorGetTheme - -shadows.DONE: - -rm -f $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcursor.$(LIB_MAN_SUFFIX) > $$i; \ - done) + $(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/libXcursor-1.1.10/man/XcursorCursorsCreate.man new/libXcursor-1.1.11/man/XcursorCursorsCreate.man --- old/libXcursor-1.1.10/man/XcursorCursorsCreate.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorCursorsCreate.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorCursorsDestroy.man new/libXcursor-1.1.11/man/XcursorCursorsDestroy.man --- old/libXcursor-1.1.10/man/XcursorCursorsDestroy.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorCursorsDestroy.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameLoad.man new/libXcursor-1.1.11/man/XcursorFilenameLoad.man --- old/libXcursor-1.1.10/man/XcursorFilenameLoad.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameLoad.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameLoadAllImages.man new/libXcursor-1.1.11/man/XcursorFilenameLoadAllImages.man --- old/libXcursor-1.1.10/man/XcursorFilenameLoadAllImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameLoadAllImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameLoadCursor.man new/libXcursor-1.1.11/man/XcursorFilenameLoadCursor.man --- old/libXcursor-1.1.10/man/XcursorFilenameLoadCursor.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameLoadCursor.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameLoadImage.man new/libXcursor-1.1.11/man/XcursorFilenameLoadImage.man --- old/libXcursor-1.1.10/man/XcursorFilenameLoadImage.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameLoadImage.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameLoadImages.man new/libXcursor-1.1.11/man/XcursorFilenameLoadImages.man --- old/libXcursor-1.1.10/man/XcursorFilenameLoadImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameLoadImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameSave.man new/libXcursor-1.1.11/man/XcursorFilenameSave.man --- old/libXcursor-1.1.10/man/XcursorFilenameSave.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameSave.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorFilenameSaveImages.man new/libXcursor-1.1.11/man/XcursorFilenameSaveImages.man --- old/libXcursor-1.1.10/man/XcursorFilenameSaveImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorFilenameSaveImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorGetDefaultSize.man new/libXcursor-1.1.11/man/XcursorGetDefaultSize.man --- old/libXcursor-1.1.10/man/XcursorGetDefaultSize.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorGetDefaultSize.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorGetTheme.man new/libXcursor-1.1.11/man/XcursorGetTheme.man --- old/libXcursor-1.1.10/man/XcursorGetTheme.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorGetTheme.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorImageCreate.man new/libXcursor-1.1.11/man/XcursorImageCreate.man --- old/libXcursor-1.1.10/man/XcursorImageCreate.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorImageCreate.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorImageDestroy.man new/libXcursor-1.1.11/man/XcursorImageDestroy.man --- old/libXcursor-1.1.10/man/XcursorImageDestroy.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorImageDestroy.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorImagesCreate.man new/libXcursor-1.1.11/man/XcursorImagesCreate.man --- old/libXcursor-1.1.10/man/XcursorImagesCreate.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorImagesCreate.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorImagesDestroy.man new/libXcursor-1.1.11/man/XcursorImagesDestroy.man --- old/libXcursor-1.1.10/man/XcursorImagesDestroy.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorImagesDestroy.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorLibraryLoadCursor.man new/libXcursor-1.1.11/man/XcursorLibraryLoadCursor.man --- old/libXcursor-1.1.10/man/XcursorLibraryLoadCursor.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorLibraryLoadCursor.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorLibraryLoadCursors.man new/libXcursor-1.1.11/man/XcursorLibraryLoadCursors.man --- old/libXcursor-1.1.10/man/XcursorLibraryLoadCursors.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorLibraryLoadCursors.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorLibraryLoadImage.man new/libXcursor-1.1.11/man/XcursorLibraryLoadImage.man --- old/libXcursor-1.1.10/man/XcursorLibraryLoadImage.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorLibraryLoadImage.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorLibraryLoadImages.man new/libXcursor-1.1.11/man/XcursorLibraryLoadImages.man --- old/libXcursor-1.1.10/man/XcursorLibraryLoadImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorLibraryLoadImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorSetDefaultSize.man new/libXcursor-1.1.11/man/XcursorSetDefaultSize.man --- old/libXcursor-1.1.10/man/XcursorSetDefaultSize.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorSetDefaultSize.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorSetTheme.man new/libXcursor-1.1.11/man/XcursorSetTheme.man --- old/libXcursor-1.1.10/man/XcursorSetTheme.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorSetTheme.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorShapeLoadCursor.man new/libXcursor-1.1.11/man/XcursorShapeLoadCursor.man --- old/libXcursor-1.1.10/man/XcursorShapeLoadCursor.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorShapeLoadCursor.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorShapeLoadCursors.man new/libXcursor-1.1.11/man/XcursorShapeLoadCursors.man --- old/libXcursor-1.1.10/man/XcursorShapeLoadCursors.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorShapeLoadCursors.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorShapeLoadImage.man new/libXcursor-1.1.11/man/XcursorShapeLoadImage.man --- old/libXcursor-1.1.10/man/XcursorShapeLoadImage.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorShapeLoadImage.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorShapeLoadImages.man new/libXcursor-1.1.11/man/XcursorShapeLoadImages.man --- old/libXcursor-1.1.10/man/XcursorShapeLoadImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorShapeLoadImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorSupportsARGB.man new/libXcursor-1.1.11/man/XcursorSupportsARGB.man --- old/libXcursor-1.1.10/man/XcursorSupportsARGB.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorSupportsARGB.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorXcFileLoad.man new/libXcursor-1.1.11/man/XcursorXcFileLoad.man --- old/libXcursor-1.1.10/man/XcursorXcFileLoad.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorXcFileLoad.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorXcFileLoadAllImages.man new/libXcursor-1.1.11/man/XcursorXcFileLoadAllImages.man --- old/libXcursor-1.1.10/man/XcursorXcFileLoadAllImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorXcFileLoadAllImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorXcFileLoadImage.man new/libXcursor-1.1.11/man/XcursorXcFileLoadImage.man --- old/libXcursor-1.1.10/man/XcursorXcFileLoadImage.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorXcFileLoadImage.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorXcFileLoadImages.man new/libXcursor-1.1.11/man/XcursorXcFileLoadImages.man --- old/libXcursor-1.1.10/man/XcursorXcFileLoadImages.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorXcFileLoadImages.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/man/XcursorXcFileSave.man new/libXcursor-1.1.11/man/XcursorXcFileSave.man --- old/libXcursor-1.1.10/man/XcursorXcFileSave.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXcursor-1.1.11/man/XcursorXcFileSave.man 2010-09-04 01:15:50.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcursor.__libmansuffix__ 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/libXcursor-1.1.10/missing new/libXcursor-1.1.11/missing --- old/libXcursor-1.1.10/missing 2009-03-10 00:49:19.000000000 +0100 +++ new/libXcursor-1.1.11/missing 2010-10-28 07:48:44.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXcursor-1.1.10/src/Makefile.am new/libXcursor-1.1.11/src/Makefile.am --- old/libXcursor-1.1.10/src/Makefile.am 2009-03-10 00:25:59.000000000 +0100 +++ new/libXcursor-1.1.11/src/Makefile.am 2010-02-25 08:37:25.000000000 +0100 @@ -6,8 +6,11 @@ XCURSORPATH=@XCURSORPATH@ libXcursor_la_LIBADD = $(XCURSOR_LIBS) -AM_CFLAGS = $(XCURSOR_CFLAGS) \ - -DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\" +AM_CFLAGS = \ + $(XCURSOR_CFLAGS) \ + $(CWARNFLAGS)\ + -DICONDIR=\"$(ICONDIR)\" \ + -DXCURSORPATH=\"$(XCURSORPATH)\" INCLUDES = -I$(top_srcdir)/include/X11/Xcursor ++++++ libXinerama-1.1.tar.bz2 -> libXinerama-1.1.1.tar.bz2 ++++++ ++++ 44042 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/libXinerama-1.1/COPYING new/libXinerama-1.1.1/COPYING --- old/libXinerama-1.1/COPYING 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/COPYING 2010-10-28 08:27:02.000000000 +0200 @@ -1,12 +1,66 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. -Please submit updated COPYING files to the Xorg bugzilla: +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg +Copyright 2003 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. 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/libXinerama-1.1/ChangeLog new/libXinerama-1.1.1/ChangeLog --- old/libXinerama-1.1/ChangeLog 2009-10-02 05:27:36.000000000 +0200 +++ new/libXinerama-1.1.1/ChangeLog 2010-10-28 08:29:12.000000000 +0200 @@ -1,3 +1,209 @@ +commit 8e62595cc1af274f1c40868c5d7461c176982062 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Oct 27 23:28:24 2010 -0700 + + libXinerama 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d94e21941a296ed125d4704c31af020fd140fcbc +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Oct 27 23:27:21 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d3da9510deb14255ee7eabdecc3988af57441ee7 +Author: Jesse Adkins <jesserayadkins(a)gmail.com> +Date: Tue Sep 28 13:30:03 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 c09ed03c45c8141b620a49bce2dc19a2729b60b8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Aug 16 20:06:56 2010 -0400 + + man: store shadow man pages in git rather than generating them + + Simplify the build process and the makefile. + + Local fix in CVS for bug 5628 is not required + as the problem has been fixed in + util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit ade2b02753362b178d7e926e18601ae2b0698532 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jul 7 16:38:03 2010 -0700 + + Use make rules instead of shell for loops to generate shadow man pages + + Allows parallel make and simpler build logs/error reporting + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 2921352cfef9faf007f2b35aa06089425ba095ed +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Jul 7 16:32:00 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit 2b5874a864152ac0466476b1c5b8ab0203887d20 +Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br> +Date: Thu Jul 1 06:57:33 2010 -0300 + + Purge macros NEED_EVENTS and NEED_REPLIES + + Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br> + Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit d8a51c48a4278b3481a5301be8ecb533fe87e9a7 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Mar 29 16:50:34 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit fa1772317219f2e2b4079c463f4139e02bec9853 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Mar 29 14:53:49 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit 43b50ccdd50511aad7bdd1869b294813550f7741 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Feb 16 10:37:21 2010 -0500 + + config: move CWARNFLAGS from configure.ac to Makefile.am + + Compiler warning flags should be explicitly set in the makefile + rather than being merged with other packages compiler flags. + + Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca> + +commit e528b336ce5aa66aa720fd94df4618f40a85b818 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 20:43:47 2010 -0800 + + Fill in COPYING with licenses from source files + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit e569f85315c0ff82a1481706f0736b85dc3bccf9 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Thu Jan 14 20:40:40 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit a470f6392f4bd532e6e855445346f00e680983db +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 31f4af6528b6b45ea6f946f5ac97260f06c24071 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit f23ac859c9d47158c9ef58b93361e43e8cd63db3 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 94b6ea6665839bb399fe4befd3b6d1b20d128de8 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Mon Oct 26 22:08:43 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 231ee8c9bbed45d89eed56e6c861af259b12f005 +Author: Gaetan Nadon <memsize(a)videotron.ca> +Date: Thu Oct 22 12:34:19 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 968cb085c8e3fece7f10fe8e4c290f32e0b246b0 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Mon Nov 2 14:58:54 2009 -0800 + + Fix PanroamiXOff typo in comment in panoramiXext.h + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit 96c0d0e13c90e01c4335b64369adfac02ff8a148 +Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org> +Date: Wed Oct 21 12:47:25 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 ee877cebfea0773a91337439d32ece12444cf0a6 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Fri Oct 2 13:27:04 2009 +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/libXinerama-1.1/INSTALL new/libXinerama-1.1.1/INSTALL --- old/libXinerama-1.1/INSTALL 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/INSTALL 2010-10-28 08:29:12.000000000 +0200 @@ -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/libXinerama-1.1/Makefile.am new/libXinerama-1.1.1/Makefile.am --- old/libXinerama-1.1/Makefile.am 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/Makefile.am 2010-04-10 02:46:20.000000000 +0200 @@ -24,15 +24,17 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xinerama.pc -EXTRA_DIST = xinerama.pc.in ChangeLog -MAINTAINERCLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT lint: 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/libXinerama-1.1/config.h.in new/libXinerama-1.1.1/config.h.in --- old/libXinerama-1.1/config.h.in 2009-10-02 05:27:26.000000000 +0200 +++ new/libXinerama-1.1.1/config.h.in 2010-10-28 08:29:04.000000000 +0200 @@ -49,6 +49,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/libXinerama-1.1/configure.ac new/libXinerama-1.1.1/configure.ac --- old/libXinerama-1.1/configure.ac 2009-10-02 05:26:58.000000000 +0200 +++ new/libXinerama-1.1.1/configure.ac 2010-10-28 08:28:03.000000000 +0200 @@ -20,27 +20,27 @@ dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) -AC_INIT(libXinerama, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_INIT([libXinerama], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [libXinerama]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) +# 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.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1]) -XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS" -AC_SUBST(XINERAMA_CFLAGS) -AC_SUBST(XINERAMA_LIBS) dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT 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/libXinerama-1.1/include/X11/extensions/panoramiXext.h new/libXinerama-1.1.1/include/X11/extensions/panoramiXext.h --- old/libXinerama-1.1/include/X11/extensions/panoramiXext.h 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/include/X11/extensions/panoramiXext.h 2009-11-02 23:58:27.000000000 +0100 @@ -36,7 +36,7 @@ typedef struct { Window window; /* PanoramiX window - may not exist */ int screen; - int State; /* PanroamiXOff, PanoramiXOn */ + int State; /* PanoramiXOff, PanoramiXOn */ int width; /* width of this screen */ int height; /* height of this screen */ int ScreenCount; /* real physical number of screens */ 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/libXinerama-1.1/man/Makefile.am new/libXinerama-1.1.1/man/Makefile.am --- old/libXinerama-1.1/man/Makefile.am 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/man/Makefile.am 2010-10-28 08:26:43.000000000 +0200 @@ -1,73 +1,45 @@ # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. -# +# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - -libman_PRE = Xinerama.man - -BUILT_SOURCES = shadows.DONE +libman_PRE = \ + Xinerama.man \ + $(Xinerama_shadows:=.man) + +Xinerama_shadows = \ + XineramaQueryExtension \ + XineramaQueryVersion \ + XineramaIsActive \ + XineramaQueryScreens EXTRA_DIST = $(libman_PRE) +CLEANFILES = $(libman_DATA) -CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) - -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__xservername__/Xorg/g' \ - -e 's/__xconfigfile__/xorg.conf/g' \ - -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \ - -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g' +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ - -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) - -Xinerama_shadows = \ - XineramaQueryExtension \ - XineramaQueryVersion \ - XineramaIsActive \ - XineramaQueryScreens - -shadows.DONE: - -rm -f $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/Xinerama.$(LIB_MAN_SUFFIX) > $$i; \ - done) + $(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/libXinerama-1.1/man/Xinerama.man new/libXinerama-1.1.1/man/Xinerama.man --- old/libXinerama-1.1/man/Xinerama.man 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/man/Xinerama.man 2010-10-28 08:26:22.000000000 +0200 @@ -1,32 +1,24 @@ .\" -.\" -.\" Copyright © 2007 Sun Microsystems, Inc. All rights reserved. +.\" Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, provided that the above -.\" copyright notice(s) and this permission notice appear in all copies of -.\" the Software and that both the above copyright notice(s) and this -.\" permission notice appear in supporting documentation. -.\" -.\" 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 -.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -.\" INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -.\" FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -.\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.\" -.\" Except as contained in this notice, the name of a copyright holder -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" of the copyright holder. +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .de TQ .br 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/libXinerama-1.1/man/XineramaIsActive.man new/libXinerama-1.1.1/man/XineramaIsActive.man --- old/libXinerama-1.1/man/XineramaIsActive.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXinerama-1.1.1/man/XineramaIsActive.man 2010-09-04 01:16:24.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xinerama.__libmansuffix__ 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/libXinerama-1.1/man/XineramaQueryExtension.man new/libXinerama-1.1.1/man/XineramaQueryExtension.man --- old/libXinerama-1.1/man/XineramaQueryExtension.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXinerama-1.1.1/man/XineramaQueryExtension.man 2010-09-04 01:16:24.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xinerama.__libmansuffix__ 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/libXinerama-1.1/man/XineramaQueryScreens.man new/libXinerama-1.1.1/man/XineramaQueryScreens.man --- old/libXinerama-1.1/man/XineramaQueryScreens.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXinerama-1.1.1/man/XineramaQueryScreens.man 2010-09-04 01:16:24.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xinerama.__libmansuffix__ 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/libXinerama-1.1/man/XineramaQueryVersion.man new/libXinerama-1.1.1/man/XineramaQueryVersion.man --- old/libXinerama-1.1/man/XineramaQueryVersion.man 1970-01-01 01:00:00.000000000 +0100 +++ new/libXinerama-1.1.1/man/XineramaQueryVersion.man 2010-09-04 01:16:24.000000000 +0200 @@ -0,0 +1 @@ +.so man__libmansuffix__/Xinerama.__libmansuffix__ 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/libXinerama-1.1/src/Makefile.am new/libXinerama-1.1.1/src/Makefile.am --- old/libXinerama-1.1/src/Makefile.am 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/src/Makefile.am 2010-02-25 08:38:18.000000000 +0100 @@ -2,7 +2,9 @@ -I$(top_srcdir)/include/X11 \ -I$(top_srcdir)/include/X11/extensions \ $(XINERAMA_CFLAGS) \ - $(MALLOC_ZERO_CFLAGS) + $(MALLOC_ZERO_CFLAGS) \ + $(CWARNFLAGS) + lib_LTLIBRARIES = libXinerama.la libXinerama_la_SOURCES = \ 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/libXinerama-1.1/src/Xinerama.c new/libXinerama-1.1.1/src/Xinerama.c --- old/libXinerama-1.1/src/Xinerama.c 2009-03-10 02:06:17.000000000 +0100 +++ new/libXinerama-1.1.1/src/Xinerama.c 2010-10-07 06:13:01.000000000 +0200 @@ -1,4 +1,3 @@ -/* $Xorg: XPanoramiX.c,v 1.4 2000/08/17 19:45:51 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,10 +22,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */ -#define NEED_EVENTS -#define NEED_REPLIES #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <X11/extensions/Xext.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libXext for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package xorg-x11-libXext for openSUSE:Factory checked in at Thu Oct 28 16:34:50 CEST 2010. -------- --- xorg-x11-libXext/xorg-x11-libXext.changes 2010-09-04 20:21:23.000000000 +0200 +++ xorg-x11-libXext/xorg-x11-libXext.changes 2010-10-28 16:12:40.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 28 14:07:53 UTC 2010 - sndirsch(a)novell.com + +- libXext 1.2.0 + * This release of the catchall library for the X11 extensions + without their own libraries adds documentation for many more + of the extension API's, in the form of the documents formerly + delivered in xorg-docs, now moved here and translated from a + variety of formats to DocBook/XML. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libXext-1.1.2.tar.bz2 New: ---- libXext-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libXext.spec ++++++ --- /var/tmp/diff_new_pack.yCj9qp/_old 2010-10-28 16:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.yCj9qp/_new 2010-10-28 16:34:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-libXext (Version 7.5_1.1.2) +# spec file for package xorg-x11-libXext (Version 7.5_1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: xorg-x11-libXext -%define dirsuffix 1.1.2 +%define dirsuffix 1.2.0 BuildRequires: fdupes pkgconfig xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5_%{dirsuffix} @@ -147,5 +147,6 @@ %{_libdir}/*.a %{_libdir}/*.la %endif +%doc %{_datadir}/doc/libXext %changelog ++++++ libXext-1.1.2.tar.bz2 -> libXext-1.2.0.tar.bz2 ++++++ ++++ 16755 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-libSM for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package xorg-x11-libSM for openSUSE:Factory checked in at Thu Oct 28 16:33:53 CEST 2010. -------- --- xorg-x11-libSM/xorg-x11-libSM.changes 2010-04-02 17:53:31.000000000 +0200 +++ xorg-x11-libSM/xorg-x11-libSM.changes 2010-10-28 16:06:25.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 28 13:48:28 UTC 2010 - sndirsch(a)novell.com + +- libSM 1.2.0 + * This release fixes a couple of bugs and includes a lot of work + from multiple people on the documentation to convert the + ancient troff scrolls to DocBook/XML. It also includes the + usual recent rounds of build configuration improvements and + janitorial cleanups. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libSM-1.1.1.tar.bz2 New: ---- libSM-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libSM.spec ++++++ --- /var/tmp/diff_new_pack.HmAHFv/_old 2010-10-28 16:28:12.000000000 +0200 +++ /var/tmp/diff_new_pack.HmAHFv/_new 2010-10-28 16:28:12.000000000 +0200 @@ -19,11 +19,11 @@ Name: xorg-x11-libSM -%define dirsuffix 1.1.1 +%define dirsuffix 1.2.0 BuildRequires: libuuid-devel pkgconfig xorg-x11-libICE-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 1 +Release: 4 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -113,5 +113,6 @@ %{_libdir}/*.a %{_libdir}/*.la %endif +%doc %{_datadir}/doc/libSM/ %changelog ++++++ libSM-1.1.1.tar.bz2 -> libSM-1.2.0.tar.bz2 ++++++ ++++ 52910 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 MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at Thu Oct 28 15:51:58 CEST 2010. -------- --- MozillaThunderbird/MozillaThunderbird.changes 2010-10-20 00:17:35.000000000 +0200 +++ MozillaThunderbird/MozillaThunderbird.changes 2010-10-28 10:21:12.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 27 10:55:39 CEST 2010 - wr(a)rosenauer.org + +- security update to version 3.1.6 (bnc#649492) + * MFSA 2010-73/CVE-2010-3765 (bmo#607222) + Heap buffer overflow mixing document.write and DOM insertion + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-3.1.5.tar.bz2 thunderbird-3.1.5-source.tar.bz2 New: ---- l10n-3.1.6.tar.bz2 thunderbird-3.1.6-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.EXGLSx/_old 2010-10-28 15:51:41.000000000 +0200 +++ /var/tmp/diff_new_pack.EXGLSx/_new 2010-10-28 15:51:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.1.5) +# spec file for package MozillaThunderbird (Version 3.1.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer <wr(a)rosenauer.org> @@ -26,10 +26,10 @@ BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -%define mainversion 3.1.5 +%define mainversion 3.1.6 Version: %{mainversion} Release: 1 -%define releasedate 2010101300 +%define releasedate 2010102600 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -133,7 +133,7 @@ %package -n enigmail Version: 1.1.2 -Release: 5 +Release: 6 License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.EXGLSx/_old 2010-10-28 15:51:41.000000000 +0200 +++ /var/tmp/diff_new_pack.EXGLSx/_new 2010-10-28 15:51:41.000000000 +0200 @@ -2,8 +2,8 @@ BRANCH="releases/comm-1.9.2" # comm-central -RELEASE_TAG="THUNDERBIRD_3_1_5_RELEASE" -VERSION="3.1.5" +RELEASE_TAG="THUNDERBIRD_3_1_6_RELEASE" +VERSION="3.1.6" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-3.1.5.tar.bz2 -> l10n-3.1.6.tar.bz2 ++++++ MozillaThunderbird/l10n-3.1.5.tar.bz2 MozillaThunderbird/l10n-3.1.6.tar.bz2 differ: char 11, line 1 ++++++ thunderbird-3.1.5-source.tar.bz2 -> thunderbird-3.1.6-source.tar.bz2 ++++++ MozillaThunderbird/thunderbird-3.1.5-source.tar.bz2 MozillaThunderbird/thunderbird-3.1.6-source.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gfxboot for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at Thu Oct 28 15:48:12 CEST 2010. -------- --- gfxboot/gfxboot.changes 2010-10-04 17:49:40.000000000 +0200 +++ gfxboot/gfxboot.changes 2010-10-27 14:06:07.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Oct 27 14:05:55 CEST 2010 - snwint(a)suse.de + +- avoid dialogs wider than screen + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gfxboot-4.3.4.tar.bz2 New: ---- gfxboot-4.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.vyJLsI/_old 2010-10-28 15:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.vyJLsI/_new 2010-10-28 15:47:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 4.3.4) +# spec file for package gfxboot (Version 4.3.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,10 +27,10 @@ Requires: coreutils cpio mktemp perl master-boot-code dosfstools mtools perl-HTML-Parser AutoReqProv: on Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX -Version: 4.3.4 +Version: 4.3.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-4.3.4.tar.bz2 +Source: gfxboot-4.3.5.tar.bz2 Source1: openSUSE.tar.bz2 Source2: SLED.tar.bz2 Source3: SLES.tar.bz2 ++++++ SLED.tar.bz2 ++++++ ++++++ SLES.tar.bz2 ++++++ ++++++ gfxboot-4.3.4.tar.bz2 -> gfxboot-4.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.3.4/VERSION new/gfxboot-4.3.5/VERSION --- old/gfxboot-4.3.4/VERSION 2010-10-04 17:49:09.000000000 +0200 +++ new/gfxboot-4.3.5/VERSION 2010-10-27 14:05:46.000000000 +0200 @@ -1 +1 @@ -4.3.4 +4.3.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.3.4/changelog new/gfxboot-4.3.5/changelog --- old/gfxboot-4.3.4/changelog 2010-10-04 17:49:10.000000000 +0200 +++ new/gfxboot-4.3.5/changelog 2010-10-27 14:05:47.000000000 +0200 @@ -1,4 +1,7 @@ -2010-10-04: HEAD +2010-10-27: HEAD + - avoid dialogs wider than screen + +2010-10-04: 4.3.4 - remove VERSION - create VERSION and changelog from git repo ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/window.inc new/themes/openSUSE/src/window.inc --- old/themes/openSUSE/src/window.inc 2010-10-04 14:50:42.000000000 +0200 +++ new/themes/openSUSE/src/window.inc 2010-10-27 14:03:54.000000000 +0200 @@ -527,6 +527,9 @@ dialog.width max /dialog.width exch def } if } if + % fit to screen size + /dialog.width screen.size pop 10 sub dialog.width min def + % adjust to window size dialog.tmp .ed.width get .undef ne { dialog.tmp .ed.width over over get dialog.width 30 sub max put ++++++ upstream.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Thu Oct 28 15:47:22 CEST 2010. -------- --- linuxrc/linuxrc.changes 2010-10-20 15:58:39.000000000 +0200 +++ linuxrc/linuxrc.changes 2010-10-28 14:04:38.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 28 14:04:30 CEST 2010 - snwint(a)suse.de + +- increase TTL for SLP (bnc #649854) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.5.4.tar.bz2 New: ---- linuxrc-3.5.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.9iJNsv/_old 2010-10-28 15:47:03.000000000 +0200 +++ /var/tmp/diff_new_pack.9iJNsv/_new 2010-10-28 15:47:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.5.4) +# spec file for package linuxrc (Version 3.5.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.5.4 +Version: 3.5.5 Release: 1 -Source: linuxrc-3.5.4.tar.bz2 +Source: linuxrc-3.5.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.5.4.tar.bz2 -> linuxrc-3.5.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.4/VERSION new/linuxrc-3.5.5/VERSION --- old/linuxrc-3.5.4/VERSION 2010-10-20 15:58:21.000000000 +0200 +++ new/linuxrc-3.5.5/VERSION 2010-10-28 14:04:24.000000000 +0200 @@ -1 +1 @@ -3.5.4 +3.5.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.4/changelog new/linuxrc-3.5.5/changelog --- old/linuxrc-3.5.4/changelog 2010-10-20 15:58:22.000000000 +0200 +++ new/linuxrc-3.5.5/changelog 2010-10-28 14:04:25.000000000 +0200 @@ -1,4 +1,7 @@ -2010-10-20: HEAD +2010-10-28: HEAD + - increase TTL for SLP (bnc #649854) + +2010-10-20: 3.5.4 - really accept static ipv6 addresses (bnc #633519) 2010-09-28: 3.5.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.4/slp.c new/linuxrc-3.5.5/slp.c --- old/linuxrc-3.5.4/slp.c 2010-09-28 14:21:31.000000000 +0200 +++ new/linuxrc-3.5.5/slp.c 2010-10-28 14:04:17.000000000 +0200 @@ -281,6 +281,11 @@ close(s); return NULL; } + i = 8; /* like openslp */ + if (setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, &i, sizeof(i))); + { + perror("setsockopt IP_MULTICAST_TTL"); + } for (tries = 0; tries < 3; tries++) { if (slpsend(s, sendbuf, l, &mcsa, 0)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Oct '10

28 Oct '10

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Thu Oct 28 15:46:49 CEST 2010. -------- --- php5/php5.changes 2010-04-16 17:53:02.000000000 +0200 +++ php5/php5.changes 2010-10-28 00:12:25.000000000 +0200 @@ -1,0 +2,49 @@ +Wed Oct 27 22:09:03 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update to 5.3.3_svn20101027xx +- Fix init script again. + +------------------------------------------------------------------- +Thu Oct 14 03:36:44 UTC 2010 - crrodriguez(a)opensuse.org + +- update to 5.3.3_svn201010140300 +- Fix php-fpm init script. + +------------------------------------------------------------------- +Sat Oct 9 16:20:10 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update to an slightly newer PHP 5.3.3.x snap, fixes + around 100 bugs including open_basedir problems. +- add the fpm sapi to the package. + +------------------------------------------------------------------- +Tue Aug 3 04:36:49 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Clarify changelog this update fixed: + * VUL-0: php5 new unserialize() flaw CVE-2010-2225 [bnc#616232] + * VUL-0: php5: MOPS-2010-021: fnmatch() Stack Exhaustion Vulnerability [bnc#605097] + * VUL-0: php5: MOPS-2010-017: preg_quote() Interruption Information Leak [bnc#605100] + * VUL-0: php5: MOPS-2010-022 use after free [bnc#609763] + * VUL-0: php5-phar: MOPS-2010-0{24,25,26,27,28} format string bugs [bnc#609766] + * VUL-0: php5: MOPS-2010-0{32,33,34} use space interruption in iconv functions [bnc#609768] + * VUL-0: php5: MOPS-2010-0{36,37,38,39,40} userspace interruptions [bnc#609769] + * VUL-0: php5: MOPS-2010-0{36..46} userspace interruptions [bnc#609769] + * VUL-0: php5: MOPS-2010-047/048 information leak [bnc#612555] + * VUL-0: php5: MOPS-2010-049/50/51/52/53/54/55 memory corruption and/or info leak [bnc#612556] + * VUL-0: PHP5: Session Data Injection Vulnerability [bnc#619483] + * VUL-0: PHP5: multiple heap based buffer overflows [bnc#619486] + * bugzilla numbers 619487,619489,619469,609766.. + +------------------------------------------------------------------- +Tue Jul 20 03:15:19 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update to PHP 5.3.3 RC3 +- Massive lot of security fixes see list + here http://www.php-security.org/category/vulnerabilities/index.html + +------------------------------------------------------------------- +Tue Jun 1 16:32:20 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- possible fix for [bnc#610633] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Registry.php php-5.3.2.tar.bz2 suhosin-0.9.31.tgz suhosin-patch-5.3.2-0.9.9.1.patch.gz New: ---- install-pear-nozlib.phar php-5.3.3_svn201010272135.tar.xz php-fpm.init suhosin-0.9.32.1.tar.gz suhosin-patch-5.3.3-0.9.10.patch.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package php5 (Version 5.3.2) +# spec file for package php5 (Version 5.3.3_svn201010272135) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,17 +21,17 @@ Name: php5 %global apiver 20090626 %global zendver 20090626 -%define suhosin_version 0.9.31 -%define suhosin_patch_version 0.9.9.1 +%define suhosin_version 0.9.32.1 +%define suhosin_patch_version 0.9.10 %define with_suhosin_patch 0 %define pkg_name php5 %define with_spell 1 -BuildRequires: apache2-devel curl-devel freetype2-devel gcc-c++ libpng-devel xorg-x11-devel +BuildRequires: apache2-devel bison curl-devel freetype2-devel gcc-c++ libpng-devel xorg-x11-devel BuildRequires: db-devel enchant-devel gmp-devel imap-devel libicu-devel libtidy-devel BuildRequires: libtiff-devel libxslt-devel mm-devel mysql-devel net-snmp-devel openldap2-devel BuildRequires: pam-devel pkgconfig postfix postgresql-devel unixODBC-devel update-alternatives -BuildRequires: krb5-devel libmcrypt-devel +BuildRequires: krb5-devel libevent-devel libmcrypt-devel %if %{with_spell} BuildRequires: aspell-devel @@ -58,6 +58,7 @@ #10.3 does not install sendmail binary with the minimal system Requires: smtp_daemon %endif +BuildRequires: xz %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR %define php_sysconf %{_sysconfdir}/%{pkg_name} @@ -76,7 +77,7 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.2 +Version: 5.3.3_svn201010272135 Release: 1 License: The PHP License, version 3.01 Group: Development/Languages/Other @@ -87,21 +88,20 @@ PreReq: update-alternatives #extensions that are no longer here Obsoletes: php5-dbx php5-dio php5-fam php5-filepro php5-yp php5-dbase php5-ncurses -Source0: php-%{version}.tar.bz2 +Source0: php-%{version}.tar.xz Source1: php-suse-addons.tar.bz2 -Source2: suhosin-%{suhosin_version}.tgz +Source2: suhosin-%{suhosin_version}.tar.gz Source4: README.SUSE-pear -#until it gets fixed in upstream... -Source5: Registry.php Source6: macros.php +Source7: install-pear-nozlib.phar +Source8: php-fpm.init #SUSE specific stuff Patch2: php5-phpize.patch Patch3: php5-apache_sapi_install.patch Patch4: php5-php-config.patch -#home made hack to really build against libedit -#Patch5: php5-really-with-libedit.patch +#currently disabled, on purpose ! %if %{with_suhosin_patch} -Patch6: suhosin-patch-%{version}-%{suhosin_patch_version}.patch.gz +Patch6: suhosin-patch-5.3.3-%{suhosin_patch_version}.patch.gz %endif Patch7: php-5.3.1-systzdata-v7.patch #bugs @@ -222,7 +222,7 @@ Group: Development/Libraries/PHP Requires: %{name} = %{version} PreReq: update-alternatives -Provides: php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter +Provides: php-xml php-fastcgi php-cgi php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter %description fastcgi PHP is a server-side, cross-platform HTML embedded scripting language. @@ -241,6 +241,31 @@ The PHP Group See http://www.php.net/credits.php for more details +%package fpm +License: The PHP License, version 3.01 +Summary: FastCGI Process Manager PHP5 Module +Group: Development/Libraries/PHP +Requires: %{name} = %{version} +PreReq: update-alternatives %insserv_prereq +Provides: php-fpm php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter + +%description fpm + PHP is a server-side, cross-platform HTML embedded scripting language. + If you are completely new to PHP and want to get some idea of how it + works, have a look at the Introductory tutorial. Once you get beyond + that have a look at the example archive sites and some of the other + resources available in the links section. + + Please refer to /usr/share/doc/packages/php5/README.FastCGI for + information on how to use this module. + + +{> +(>Authors: + -------- + The PHP Group + See http://www.php.net/credits.php for more details + %package bcmath License: The PHP License, version 3.01 Provides: php-bcmath @@ -1172,12 +1197,13 @@ %{__tar} xf %{S:2} -C ext %{__mv} ext/suhosin-%{suhosin_version} ext/suhosin %{__cp} %{S:4} pear/README.SUSE +%{__cp} %{S:7} pear/ #patch0 -p1 %patch2 %patch3 %patch4 %if %{with_suhosin_patch} -%patch6 -p1 +%patch6 %endif %patch7 %if %{need_libxml2_hack} @@ -1193,11 +1219,12 @@ %patch22 %patch23 %patch24 -%patch25 -p1 +%patch25 # we build three SAPI -%{__mkdir_p} build-apache2 +%{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi %{__mkdir_p} build-cli/ext/sqlite/libsqlite/src/ + # THis happends only with bison 1.875 %if 0%{?suse_version} < 1010 # our bison seems to generate wrong parser, so use the pregenerated ones... @@ -1233,7 +1260,6 @@ fi %build -#find %{_libdir} -name "*.la" | xargs grep 'dependency_libs=''' # Force use of system libtool(when newer than the included) #get rid of bundled libraries which are not used in 10.2 and later %if 0%{?suse_version} > 1010 @@ -1241,11 +1267,11 @@ %endif # regenerate configure etc. # workaround: suhosin-patch updates timestamp of configure, confusing buildconf -%{__rm} configure +%{__rm} -f configure ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -pipe" +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" +CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing -pipe" %if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" CXXFLAGS="$CXXFLAGS -fstack-protector" @@ -1322,6 +1348,14 @@ --bindir=%{_bindir} \ --disable-cli \ --disable-all \ + +Build fpm \ + --with-mm \ + --enable-fpm \ + --bindir=%{_bindir} \ + --disable-cli \ + --disable-all\ + # cli sapi with all shared modules # Hack the built configure to also link ncurses together with libedit. # this is reported upstream bug http://bugs.php.net/bug.php?id=21153 @@ -1457,11 +1491,13 @@ %{__mv} %{buildroot}%{apache2_libexecdir}/libphp5.so %{buildroot}%{apache2_libexecdir}/mod_php5.so Install fastcgi Install cli +Install fpm # generate php.ini from php.ini-production: %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/conf.d %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/apache2 %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/cli %{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fastcgi +%{__install} -d -m 755 %{buildroot}/%{php_sysconf}/fpm %{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \ > %{buildroot}/%{php_sysconf}/apache2/php.ini %{__sed} "s=@extdir@=%{extension_dir}=" php.ini-production \ @@ -1508,10 +1544,6 @@ %{__mv} sapi/cgi/README.FastCGI README.FastCGI %{__rm} -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} %{__install} -d -m 0755 %{buildroot}/%{peardir}/test -# fix deadlock -%{__cp} %{S:5} %{buildroot}/%{peardir}/PEAR -# reminder: Will be removed when upstream fixes deadlock in pear -test %version = 5.3.2 # for pear XML files %{__install} -d -m 0755 %{buildroot}/var/lib/pear # provide compat symlink @@ -1528,6 +1560,10 @@ install -m 644 -c macros.php \ $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php +#install fpm init script. +install -d %{buildroot}%{_sysconfdir}/init.d +install -m 755 -c %{S:8} %{buildroot}%{_sysconfdir}/init.d/php-fpm + %post update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ --slave %{_mandir}/man1/php.1.gz php.1 %{_mandir}/man1/php5.1.gz @@ -1600,6 +1636,16 @@ %postun -n apache2-mod_php5 %restart_on_update apache2 +%postun fpm +%restart_on_update php-fpm +%insserv_cleanup + +%preun fpm +%stop_on_removal php-fpm + +%post fpm +%{fillup_and_insserv -f php-fpm} + %clean rm -rf %{buildroot} @@ -1642,6 +1688,14 @@ %dir %{php_sysconf}/fastcgi %config(noreplace) %{php_sysconf}/fastcgi/php.ini +%files fpm +%defattr(-, root, root) +%{_sbindir}/php-fpm5 +%dir %{php_sysconf}/fpm +%config %{php_sysconf}/fpm/php-fpm.conf.default +%{_mandir}/man8/php-fpm5.8.gz +%config /etc/init.d/php-fpm + %files -n apache2-mod_php5 %defattr(644,root,root,755) %{apache2_libexecdir}/mod_php5.so ++++++ php-5.3-session.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/session/config.m4 =================================================================== --- ext/session/config.m4.orig 2009-07-28 10:59:08.000000000 +0200 -+++ ext/session/config.m4 2010-04-02 00:00:18.106149000 +0200 ++++ ext/session/config.m4 2010-08-03 06:31:20.968355000 +0200 @@ -12,7 +12,7 @@ if test "$PHP_SESSION" != "no"; then PHP_PWRITE_TEST PHP_PREAD_TEST ++++++ php-5.3.0-bnc513080.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/exif/exif.c =================================================================== --- ext/exif/exif.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/exif/exif.c 2010-04-02 00:00:17.386249000 +0200 ++++ ext/exif/exif.c 2010-08-03 06:31:20.024482000 +0200 @@ -66,7 +66,7 @@ #include "ext/standard/php_image.h" #include "ext/standard/info.h" ++++++ php-5.3.0-fix-rpmlint-errors.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/intl/locale/locale_methods.c =================================================================== ---- ext/intl/locale/locale_methods.c.orig 2010-01-25 14:59:35.000000000 +0100 -+++ ext/intl/locale/locale_methods.c 2010-04-02 00:00:17.182233000 +0200 +--- ext/intl/locale/locale_methods.c.orig 2009-12-23 22:41:05.000000000 +0100 ++++ ext/intl/locale/locale_methods.c 2010-08-03 06:31:19.713445000 +0200 @@ -264,7 +264,7 @@ static char* get_icu_value_internal( cha UErrorCode status = U_ZERO_ERROR; ++++++ php-5.3.0-ldap-checks.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: ext/ldap/config.m4 =================================================================== --- ext/ldap/config.m4.orig 2007-09-26 17:44:16.000000000 +0200 -+++ ext/ldap/config.m4 2010-04-02 00:00:16.872236000 +0200 ++++ ext/ldap/config.m4 2010-08-03 06:31:19.419556000 +0200 @@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [ SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2" fi ++++++ php-5.3.1-systzdata-v7.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -18,7 +18,7 @@ Index: ext/date/lib/parse_tz.c =================================================================== --- ext/date/lib/parse_tz.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/date/lib/parse_tz.c 2010-04-02 00:00:16.631318000 +0200 ++++ ext/date/lib/parse_tz.c 2010-08-03 06:31:19.092553000 +0200 @@ -20,6 +20,16 @@ #include "timelib.h" @@ -598,7 +598,7 @@ Index: ext/date/lib/timelib.m4 =================================================================== --- ext/date/lib/timelib.m4.orig 2007-09-26 17:44:16.000000000 +0200 -+++ ext/date/lib/timelib.m4 2010-04-02 00:00:16.634331000 +0200 ++++ ext/date/lib/timelib.m4 2010-08-03 06:31:19.100527000 +0200 @@ -78,3 +78,17 @@ stdlib.h dnl Check for strtoll, atoll ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,12 +1,36 @@ - -Fix use of divert() to work with autoconf 2.6x. - -Index: configure.in -=================================================================== ---- configure.in.orig 2010-03-03 17:36:07.000000000 +0100 -+++ configure.in 2010-04-02 00:00:17.863156000 +0200 +--- scripts/phpize.m4.orig ++++ scripts/phpize.m4 +@@ -1,6 +1,6 @@ + dnl This file becomes configure.in for self-contained extensions. + +-divert(1) ++divert(1001) + + AC_PREREQ(2.13) + AC_INIT(config.m4) +--- ext/standard/config.m4.orig ++++ ext/standard/config.m4 +@@ -1,6 +1,6 @@ + dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -342,7 +342,7 @@ dnl + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) + AC_FUNC_FNMATCH + +-divert(5)dnl ++divert(1005)dnl + + dnl + dnl Check if there is a support means of creating a new process +--- configure.in.orig ++++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 295792 2010-03-03 16:36:07Z johannes $ -*- autoconf -*- + ## $Id: configure.in 304088 2010-10-05 13:43:35Z tony2001 $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -50,36 +74,3 @@ dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. -Index: ext/standard/config.m4 -=================================================================== ---- ext/standard/config.m4.orig 2010-02-22 01:34:22.000000000 +0100 -+++ ext/standard/config.m4 2010-04-02 00:00:17.880144000 +0200 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4 295350 2010-02-22 00:34:22Z pajoye $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -333,7 +333,7 @@ dnl - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check if there is a support means of creating a new process -Index: scripts/phpize.m4 -=================================================================== ---- scripts/phpize.m4.orig 2009-12-02 18:42:58.000000000 +0100 -+++ scripts/phpize.m4 2010-04-02 00:00:17.886143000 +0200 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) ++++++ php-5.3.2-ini.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,7 +1,7 @@ Index: php.ini-production =================================================================== ---- php.ini-production.orig 2009-11-05 14:29:34.000000000 +0100 -+++ php.ini-production 2010-04-02 00:00:17.674182000 +0200 +--- php.ini-production.orig 2010-06-24 02:15:12.000000000 +0200 ++++ php.ini-production 2010-08-03 06:31:20.319461000 +0200 @@ -781,7 +781,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,22 +38,25 @@ ; Whether to use cookies. ; http://php.net/session.use-cookies -@@ -1594,11 +1594,10 @@ session.entropy_length = 0 +@@ -1590,14 +1590,14 @@ session.referer_check = + + ; How many bytes to read from the file. + ; http://php.net/session.entropy-length +-session.entropy_length = 0 ++session.entropy_length = 32 ; Specified here to create the session id. ; http://php.net/session.entropy-file + ; On systems that don't have /dev/urandom /dev/arandom can be used + ; On windows, setting the entropy_length setting will activate the + ; Windows random source (using the CryptoAPI) -;session.entropy_file = /dev/urandom --session.entropy_file = +session.entropy_file = /dev/urandom - ; http://php.net/session.entropy-length --;session.entropy_length = 16 -+session.entropy_length = 16 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. -@@ -1629,7 +1628,7 @@ session.use_trans_sid = 0 - ; the hash extension. A list of available hashes is returned by the hash_alogs() +@@ -1628,7 +1628,7 @@ session.use_trans_sid = 0 + ; the hash extension. A list of available hashes is returned by the hash_algos() ; function. ; http://php.net/session.hash-function -session.hash_function = 0 ++++++ php-5.3.2-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,8 +1,6 @@ -Index: sapi/cgi/cgi_main.c -=================================================================== ---- sapi/cgi/cgi_main.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ sapi/cgi/cgi_main.c 2010-04-03 14:42:45.404083000 +0200 -@@ -1926,7 +1926,7 @@ consult the installation file that came +--- sapi/cgi/cgi_main.c.orig ++++ sapi/cgi/cgi_main.c +@@ -1932,7 +1932,7 @@ consult the installation file that came #if ZEND_DEBUG php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #else @@ -10,11 +8,9 @@ + php_printf("PHP %s (%s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); #endif php_request_shutdown((void *) 0); - exit_status = 0; -Index: sapi/cli/php_cli.c -=================================================================== ---- sapi/cli/php_cli.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ sapi/cli/php_cli.c 2010-04-03 14:42:45.410100000 +0200 + fcgi_shutdown(); +--- sapi/cli/php_cli.c.orig ++++ sapi/cli/php_cli.c @@ -831,8 +831,8 @@ int main(int argc, char *argv[]) } @@ -26,11 +22,9 @@ #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", #elif ZEND_DEBUG -Index: ext/standard/info.c -=================================================================== ---- ext/standard/info.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ ext/standard/info.c 2010-04-03 14:44:31.369445000 +0200 -@@ -686,7 +686,7 @@ PHPAPI void php_print_info(int flag TSRM +--- ext/standard/info.c.orig ++++ ext/standard/info.c +@@ -697,7 +697,7 @@ PHPAPI void php_print_info(int flag TSRM php_info_print_box_end(); php_info_print_table_start(); php_info_print_table_row(2, "System", php_uname ); @@ -39,7 +33,7 @@ #ifdef COMPILER php_info_print_table_row(2, "Compiler", COMPILER); #endif -@@ -694,7 +694,7 @@ PHPAPI void php_print_info(int flag TSRM +@@ -705,7 +705,7 @@ PHPAPI void php_print_info(int flag TSRM php_info_print_table_row(2, "Architecture", ARCHITECTURE); #endif #ifdef CONFIGURE_COMMAND @@ -48,3 +42,14 @@ #endif if (sapi_module.pretty_name) { +--- sapi/fpm/fpm/fpm_main.c.orig ++++ sapi/fpm/fpm/fpm_main.c +@@ -1684,7 +1684,7 @@ int main(int argc, char *argv[]) + #if ZEND_DEBUG + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); + #else +- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); ++ php_printf("PHP %s (%s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version()); + #endif + php_request_shutdown((void *) 0); + fcgi_shutdown(); ++++++ php-cloexec.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/ext/standard/exec.c b/ext/standard/exec.c -index 5850026..efc1aa3 100644 ---- a/ext/standard/exec.c -+++ b/ext/standard/exec.c -@@ -107,8 +107,12 @@ PHPAPI int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_ +Index: ext/standard/exec.c +=================================================================== +--- ext/standard/exec.c.orig 2010-03-12 11:28:59.000000000 +0100 ++++ ext/standard/exec.c 2010-08-03 06:31:21.692327000 +0200 +@@ -107,8 +107,12 @@ PHPAPI int php_exec(int type, char *cmd, #ifdef PHP_WIN32 fp = VCWD_POPEN(cmd_p, "rb"); #else @@ -15,10 +15,10 @@ if (!fp) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to fork [%s]", cmd); goto err; -diff --git a/ext/standard/file.c b/ext/standard/file.c -index 704ef12..e03a661 100644 ---- a/ext/standard/file.c -+++ b/ext/standard/file.c +Index: ext/standard/file.c +=================================================================== +--- ext/standard/file.c.orig 2010-05-02 22:11:22.000000000 +0200 ++++ ext/standard/file.c 2010-08-03 06:31:21.701320000 +0200 @@ -957,6 +957,13 @@ PHP_FUNCTION(popen) } } @@ -33,11 +33,11 @@ if (PG(safe_mode)){ b = strchr(command, ' '); if (!b) { -diff --git a/ext/standard/mail.c b/ext/standard/mail.c -index ab65f16..ed421e0 100644 ---- a/ext/standard/mail.c -+++ b/ext/standard/mail.c -@@ -288,8 +288,12 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char +Index: ext/standard/mail.c +=================================================================== +--- ext/standard/mail.c.orig 2010-07-19 15:38:53.000000000 +0200 ++++ ext/standard/mail.c 2010-08-03 06:31:21.709286000 +0200 +@@ -294,8 +294,12 @@ PHPAPI int php_mail(char *to, char *subj * (e.g. the shell can't be executed) we explicitely set it to 0 to be * sure we don't catch any older errno value. */ errno = 0; ++++++ php-fpm.init ++++++ #!/bin/sh # # Template SUSE system startup script for example service/daemon php-fpm # Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. # # This library is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2.1 of the License, or (at # your option) any later version. # # This library is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, # USA. # # /etc/init.d/php-fpm # and its symbolic link # /(usr/)sbin/rcphp-fpm # # Template system startup script for some example service/daemon php-fpm # # LSB compatible service control script; see http://www.linuxbase.org/spec/ # # Note: This template uses functions rc_XXX defined in /etc/rc.status on # UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your # script on this template and ensure that it works on non UL based LSB # compliant Linux distributions, you either have to provide the rc.status # functions from UL or change the script to work without them. # See skeleton.compat for a template that works with other distros as well. # ### BEGIN INIT INFO # Provides: php-fpm # Required-Start: $remote_fs $network # Should-Start: nginx lighttpd httpd # Required-Stop: $network $remote_fs # Should-Stop: nginx lighttpd httpd # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: php-fpm daemon # Description: Start php-fpm to # continued on second line by '#<TAB>' # should contain enough info for the runlevel editor # to give admin some idea what this service does and # what it's needed for ... # (The Short-Description should already be a good hint.) ### END INIT INFO # # Any extensions to the keywords given above should be preceeded by # X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. # # Notes on Required-Start/Should-Start: # * There are two different issues that are solved by Required-Start # and Should-Start # (a) Hard dependencies: This is used by the runlevel editor to determine # which services absolutely need to be started to make the start of # this service make sense. Example: nfsserver should have # Required-Start: $portmap # Also, required services are started before the dependent ones. # The runlevel editor will warn about such missing hard dependencies # and suggest enabling. During system startup, you may expect an error, # if the dependency is not fulfilled. # (b) Specifying the init script ordering, not real (hard) dependencies. # This is needed by insserv to determine which service should be # started first (and at a later stage what services can be started # in parallel). The tag Should-Start: is used for this. # It tells, that if a service is available, it should be started # before. If not, never mind. # * When specifying hard dependencies or ordering requirements, you can # use names of services (contents of their Provides: section) # or pseudo names starting with a $. The following ones are available # according to LSB (1.1): # $local_fs all local file systems are mounted # (most services should need this!) # $remote_fs all remote file systems are mounted # (note that /usr may be remote, so # many services should Require this!) # $syslog system logging facility up # $network low level networking (eth card, ...) # $named hostname resolution available # $netdaemons all network daemons are running # The $netdaemons pseudo service has been removed in LSB 1.2. # For now, we still offer it for backward compatibility. # These are new (LSB 1.2): # $time the system time has been set correctly # $portmap SunRPC portmapping service available # UnitedLinux extensions: # $ALL indicates that a script should be inserted # at the end # * The services specified in the stop tags # (Required-Stop/Should-Stop) # specify which services need to be still running when this service # is shut down. Often the entries there are just copies or a subset # from the respective start tag. # * Should-Start/Stop are now part of LSB as of 2.0, # formerly SUSE/Unitedlinux used X-UnitedLinux-Should-Start/-Stop. # insserv does support both variants. # * X-UnitedLinux-Default-Enabled: yes/no is used at installation time # (%fillup_and_insserv macro in %post of many RPMs) to specify whether # a startup script should default to be enabled after installation. # It's not used by insserv. # # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Note on script names: # http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html # A registry has been set up to manage the init script namespace. # http://www.lanana.org/ # Please use the names already registered or register one or use a # vendor prefix. # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance PHPFPM_BIN=/usr/sbin/php-fpm5 test -x $PHPFPM_BIN || { echo "$PHPFPM_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } FPM_CONFIG="--fpm-config /etc/php5/fpm/php-fpm.conf" # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting php-fpm" ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. /sbin/startproc $PHPFPM_BIN $FPM_CONFIG # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down php-fpm " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. /sbin/killproc -QUIT $PHPFPM_BIN # Remember status and be verbose rc_status -v ;; try-restart|condrestart) ## Do a restart only if the service was active before. ## Note: try-restart is now part of LSB (as of 1.9). ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart the service if it ## is running. echo -n "Reload service php-fpm" ## if it supports it: /sbin/killproc -USR2 $PHPFPM_BIN rc_status -v ## Otherwise: #$0 try-restart #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signaling, do nothing (!) # If it supports signaling: echo -n "Reload service php-fpm " /sbin/killproc -USR2 $PHPFPM_BIN rc_status -v ## Otherwise if it does not support reload: #rc_failed 3 #rc_status -v ;; status) echo -n "Checking for service php-fpm " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. /sbin/checkproc $PHPFPM_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" exit 1 ;; esac rc_exit ++++++ php5-apache_sapi_install.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -7,7 +7,7 @@ Index: sapi/apache2handler/config.m4 =================================================================== --- sapi/apache2handler/config.m4.orig 2008-03-11 23:47:39.000000000 +0100 -+++ sapi/apache2handler/config.m4 2010-04-02 00:00:15.311457000 +0200 ++++ sapi/apache2handler/config.m4 2010-08-03 06:31:18.512616000 +0200 @@ -68,18 +68,9 @@ if test "$PHP_APXS2" != "no"; then fi ++++++ php5-php-config.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -5,7 +5,7 @@ Index: scripts/php-config.in =================================================================== --- scripts/php-config.in.orig 2007-08-24 13:44:10.000000000 +0200 -+++ scripts/php-config.in 2010-04-02 00:00:16.440342000 +0200 ++++ scripts/php-config.in 2010-08-03 06:31:18.786529000 +0200 @@ -5,7 +5,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" version="@PHP_VERSION@" ++++++ php5-phpize.patch ++++++ --- /var/tmp/diff_new_pack.B0zkIk/_old 2010-10-28 15:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.B0zkIk/_new 2010-10-28 15:43:00.000000000 +0200 @@ -5,8 +5,8 @@ Index: scripts/Makefile.frag =================================================================== ---- scripts/Makefile.frag.orig 2005-11-22 00:08:02.000000000 +0100 -+++ scripts/Makefile.frag 2010-04-02 00:00:15.074448000 +0200 +--- scripts/Makefile.frag.orig 2010-07-13 19:24:13.000000000 +0200 ++++ scripts/Makefile.frag 2010-08-03 06:31:18.109614000 +0200 @@ -3,8 +3,8 @@ # Build environment install # @@ -21,7 +21,7 @@ Index: scripts/phpize.in =================================================================== --- scripts/phpize.in.orig 2009-06-24 09:42:33.000000000 +0200 -+++ scripts/phpize.in 2010-04-02 00:00:15.080427000 +0200 ++++ scripts/phpize.in 2010-08-03 06:31:18.115618000 +0200 @@ -3,8 +3,8 @@ # Variable declaration prefix='@prefix@' ++++++ suhosin-patch-5.3.2-0.9.9.1.patch.gz -> suhosin-patch-5.3.3-0.9.10.patch.gz ++++++ Files php5/suhosin-patch-5.3.2-0.9.9.1.patch.gz and php5/suhosin-patch-5.3.3-0.9.10.patch.gz differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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