October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit xkeyboard-config for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at 2014-10-05 20:29:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old) and /work/SRC/openSUSE:Factory/.xkeyboard-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xkeyboard-config" Changes: -------- --- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes 2014-06-18 10:59:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xkeyboard-config.new/xkeyboard-config.changes 2014-10-05 20:29:19.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 15:37:45 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 2.13: + Code cleanup, small changes and translation updates + +------------------------------------------------------------------- Old: ---- xkeyboard-config-2.12.tar.bz2 New: ---- xkeyboard-config-2.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.E0An4C/_old 2014-10-05 20:29:19.000000000 +0200 +++ /var/tmp/diff_new_pack.E0An4C/_new 2014-10-05 20:29:19.000000000 +0200 @@ -28,7 +28,7 @@ Provides: XFree86:/etc/X11/xkb/symbols/us Provides: xorg-x11:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm -Version: 2.12 +Version: 2.13 Release: 0 Summary: The X Keyboard Extension License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 ++++++ xkeyboard-config-2.12.tar.bz2 -> xkeyboard-config-2.13.tar.bz2 ++++++ ++++ 57798 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation-control for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package yast2-installation-control for openSUSE:Factory checked in at 2014-10-05 20:29:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old) and /work/SRC/openSUSE:Factory/.yast2-installation-control.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation-control" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes 2014-08-29 17:42:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation-control.new/yast2-installation-control.changes 2014-10-05 20:29:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 14:14:06 UTC 2014 - ancor(a)suse.com + +- Added globals->dhclient_set_hostname (bnc#870896) +- 3.1.11 + +------------------------------------------------------------------- Old: ---- yast2-installation-control-3.1.10.tar.bz2 New: ---- yast2-installation-control-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation-control.spec ++++++ --- /var/tmp/diff_new_pack.CT651i/_old 2014-10-05 20:29:18.000000000 +0200 +++ /var/tmp/diff_new_pack.CT651i/_new 2014-10-05 20:29:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-control-3.1.10.tar.bz2 -> yast2-installation-control-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.10/MAINTAINER new/yast2-installation-control-3.1.11/MAINTAINER --- old/yast2-installation-control-3.1.10/MAINTAINER 2014-08-28 09:52:06.000000000 +0200 +++ new/yast2-installation-control-3.1.11/MAINTAINER 2014-10-01 17:01:11.000000000 +0200 @@ -1 +1 @@ -Ladislav Slezák <lslezak(a)suse.cz> +Deprecated file. Use `osc maintainer yast2-installation-control` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.10/control/control.rnc new/yast2-installation-control-3.1.11/control/control.rnc --- old/yast2-installation-control-3.1.10/control/control.rnc 2014-08-28 09:52:06.000000000 +0200 +++ new/yast2-installation-control-3.1.11/control/control.rnc 2014-10-01 17:01:11.000000000 +0200 @@ -60,6 +60,7 @@ | firewall_enable_ssh | enable_sshd | write_hostname_to_hosts + | dhclient_set_hostname | run_init_scripts_in_parallel | inform_about_suboptimal_distribution | skip_language_dialog @@ -138,6 +139,8 @@ enable_sshd = element enable_sshd { BOOLEAN } ## Default value whether to write a system hostname to /etc/hosts write_hostname_to_hosts = element write_hostname_to_hosts { BOOLEAN } +## Default value whether to change hostname via DHCP +dhclient_set_hostname = element dhclient_set_hostname { BOOLEAN } ## Defines whether startup scripts should run in a parallel mode. ## This speeds the starting up but it is worse for debugging. run_init_scripts_in_parallel = element run_init_scripts_in_parallel { BOOLEAN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.10/control/control.rng new/yast2-installation-control-3.1.11/control/control.rng --- old/yast2-installation-control-3.1.10/control/control.rng 2014-08-28 09:52:06.000000000 +0200 +++ new/yast2-installation-control-3.1.11/control/control.rng 2014-10-01 17:01:11.000000000 +0200 @@ -69,6 +69,7 @@ <ref name="firewall_enable_ssh"/> <ref name="enable_sshd"/> <ref name="write_hostname_to_hosts"/> + <ref name="dhclient_set_hostname"/> <ref name="run_init_scripts_in_parallel"/> <ref name="inform_about_suboptimal_distribution"/> <ref name="skip_language_dialog"/> @@ -214,6 +215,12 @@ <ref name="BOOLEAN"/> </element> </define> + <define name="dhclient_set_hostname"> + <a:documentation>Default value whether to change hostname via DHCP</a:documentation> + <element name="dhclient_set_hostname"> + <ref name="BOOLEAN"/> + </element> + </define> <define name="run_init_scripts_in_parallel"> <a:documentation>Defines whether startup scripts should run in a parallel mode. This speeds the starting up but it is worse for debugging.</a:documentation> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.10/package/yast2-installation-control.changes new/yast2-installation-control-3.1.11/package/yast2-installation-control.changes --- old/yast2-installation-control-3.1.10/package/yast2-installation-control.changes 2014-08-28 09:52:06.000000000 +0200 +++ new/yast2-installation-control-3.1.11/package/yast2-installation-control.changes 2014-10-01 17:01:11.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 1 14:14:06 UTC 2014 - ancor(a)suse.com + +- Added globals->dhclient_set_hostname (bnc#870896) +- 3.1.11 + +------------------------------------------------------------------- Thu Aug 28 09:45:07 CEST 2014 - locilka(a)suse.com - Element 'packages' in 'one_supported_desktop' has been made diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-control-3.1.10/package/yast2-installation-control.spec new/yast2-installation-control-3.1.11/package/yast2-installation-control.spec --- old/yast2-installation-control-3.1.10/package/yast2-installation-control.spec 2014-08-28 09:52:06.000000000 +0200 +++ new/yast2-installation-control-3.1.11/package/yast2-installation-control.spec 2014-10-01 17:01:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation-control -Version: 3.1.10 +Version: 3.1.11 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-10-05 20:29:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-10-01 07:40:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-10-05 20:29:16.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 1 16:00:22 CEST 2014 - snwint(a)suse.de + +- get server rescue image working +- 14.144 + +------------------------------------------------------------------- Old: ---- installation-images-14.143.tar.xz New: ---- installation-images-14.144.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.eiXLhY/_old 2014-10-05 20:29:17.000000000 +0200 +++ /var/tmp/diff_new_pack.eiXLhY/_new 2014-10-05 20:29:17.000000000 +0200 @@ -358,10 +358,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.143 +Version: 14.144 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.143.tar.xz +Source: installation-images-14.144.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.143.tar.xz -> installation-images-14.144.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/VERSION new/installation-images-14.144/VERSION --- old/installation-images-14.143/VERSION 2014-09-29 15:23:01.000000000 +0200 +++ new/installation-images-14.144/VERSION 2014-10-01 16:00:14.000000000 +0200 @@ -1 +1 @@ -14.143 +14.144 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/changelog new/installation-images-14.144/changelog --- old/installation-images-14.143/changelog 2014-09-29 15:23:43.000000000 +0200 +++ new/installation-images-14.144/changelog 2014-10-01 16:00:21.000000000 +0200 @@ -1,3 +1,6 @@ +2014-10-01: 14.144 + - get server rescue image working + 2014-09-29: 14.143 - start wpa_supplicant for wicked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/boot/syslinux-rescue.cfg new/installation-images-14.144/data/boot/syslinux-rescue.cfg --- old/installation-images-14.143/data/boot/syslinux-rescue.cfg 2014-01-29 15:46:04.000000000 +0100 +++ new/installation-images-14.144/data/boot/syslinux-rescue.cfg 2014-10-01 13:54:16.000000000 +0200 @@ -3,7 +3,7 @@ # rescue label rescue kernel linux - append initrd=initrd splash=silent rescue=1 showopts + append initrd=initrd splash=silent rescue=1 netsetup=1 showopts ui gfxboot bootlogo message implicit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/rescue/etc/exports new/installation-images-14.144/data/rescue/etc/exports --- old/installation-images-14.143/data/rescue/etc/exports 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.144/data/rescue/etc/exports 2014-10-01 12:37:19.000000000 +0200 @@ -0,0 +1,7 @@ +# See the exports(5) manpage for a description of the syntax of this file. +# This file contains a list of all directories that are to be exported to +# other computers via NFS (Network File System). +# This file used by rpc.nfsd and rpc.mountd. See their manpages for details +# on how make changes in this file effective. + +/media/repo *(ro,insecure,all_squash,crossmnt,no_subtree_check) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/rescue/etc/motd new/installation-images-14.144/data/rescue/etc/motd --- old/installation-images-14.143/data/rescue/etc/motd 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.144/data/rescue/etc/motd 2014-10-01 13:45:45.000000000 +0200 @@ -0,0 +1,10 @@ + +To export the installation repository, mount the DVD to /media/repo. +For example: 'mount /dev/sr0 /media/repo'. + +The repository will be accessible via ftp, nfs, and smb/cifs: + +install=ftp://<this_host> +install=nfs://<this_host>/media/repo +install=smb://<this_host>/repo + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/rescue/etc/smb.conf new/installation-images-14.144/data/rescue/etc/smb.conf --- old/installation-images-14.143/data/rescue/etc/smb.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-14.144/data/rescue/etc/smb.conf 2014-10-01 13:14:39.000000000 +0200 @@ -0,0 +1,8 @@ +[repo] + comment = repo + path = /media/repo + writable = no + browsable = yes + guest ok = yes + create mode = 0777 + directory mode = 0777 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/rescue/rescue-server.file_list new/installation-images-14.144/data/rescue/rescue-server.file_list --- old/installation-images-14.143/data/rescue/rescue-server.file_list 2014-08-27 15:35:43.000000000 +0200 +++ new/installation-images-14.144/data/rescue/rescue-server.file_list 2014-10-01 13:30:21.000000000 +0200 @@ -3,9 +3,38 @@ # add other packages here vsftpd: + / + E prein + +ftp: nfs-kernel-server: samba: +: + +# mount point for install repo +r media/* +d media/repo + # remove unnecessary files r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates +# enable services +s ../vsftpd.service usr/lib/systemd/system/multi-user.target.wants +s ../smb.service usr/lib/systemd/system/multi-user.target.wants +s ../nmb.service usr/lib/systemd/system/multi-user.target.wants +s ../rpcbind.service usr/lib/systemd/system/multi-user.target.wants +E chkconfig nfsserver on + +# add motd +x /etc/motd /etc/motd + +# set ftpd working dir +R s#:/srv/ftp:#:/media/repo:# etc/passwd + +# add samba server config +A /etc/smb.conf /etc/samba/smb.conf + +# add nfs server config +x /etc/exports /etc/exports + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/data/rescue/rescue.file_list new/installation-images-14.144/data/rescue/rescue.file_list --- old/installation-images-14.143/data/rescue/rescue.file_list 2014-09-29 12:17:12.000000000 +0200 +++ new/installation-images-14.144/data/rescue/rescue.file_list 2014-10-01 15:58:06.000000000 +0200 @@ -21,7 +21,12 @@ r /usr/bin/ld s ld.bfd /usr/bin/ld -TEMPLATE lvm2|device-mapper|rpcbind|rsync|syslog-service|syslogd|util-linux|wicked|dmraid|mdadm|multipath-tools: +TEMPLATE nfs-client|device-mapper|rpcbind|rsync|syslogd|dmraid|multipath-tools: + / + E prein + E postin + +TEMPLATE wicked|lvm2|syslog-service|util-linux|mdadm: / E postin @@ -123,7 +128,6 @@ ncurses-utils: net-tools: netcat-openbsd: -nfs-client: nfsidmap: nscd: ntfsprogs: @@ -177,9 +181,12 @@ openSUSE-release-mini: endif -samba-libs: nodeps - /usr/lib*/samba/libreplace.so - /usr/lib*/samba/libwinbind-client.so +# we have full samba in rescue-server +if filelist ne 'rescue-server' + samba-libs: nodeps + /usr/lib*/samba/libreplace.so + /usr/lib*/samba/libwinbind-client.so +endif rpm: /bin @@ -301,6 +308,7 @@ dmraid: mdadm: multipath-tools: +nfs-client: openssh: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/etc/module.config new/installation-images-14.144/etc/module.config --- old/installation-images-14.143/etc/module.config 2014-08-04 15:30:15.000000000 +0200 +++ new/installation-images-14.144/etc/module.config 2014-10-01 12:38:03.000000000 +0200 @@ -145,6 +145,7 @@ rapidio ntb ntb_netdev +nfsd mlx4_en inet_lro diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.143/etc/module.list new/installation-images-14.144/etc/module.list --- old/installation-images-14.143/etc/module.list 2014-08-04 15:29:49.000000000 +0200 +++ new/installation-images-14.144/etc/module.list 2014-10-01 12:39:40.000000000 +0200 @@ -92,6 +92,7 @@ kernel/fs/binfmt_misc.ko kernel/fs/nfs/ kernel/fs/nfs_common/ +kernel/fs/nfsd/ kernel/fs/lockd/ kernel/fs/mbcache.ko kernel/fs/configfs/ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2014-10-05 20:29:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-09-28 19:53:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2014-10-05 20:29:14.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 24 12:54:56 UTC 2014 - michal.hrusecky(a)opensuse.org + +- some CentOS/Fedora compatibility + +------------------------------------------------------------------- +Wed Sep 24 08:08:36 UTC 2014 - michal.hrusecky(a)opensuse.org + +- systemd not depending on SUSE version anymore +- fixing build on distributions with %docdir != %datadir/doc/%name + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.7kiCSE/_old 2014-10-05 20:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7kiCSE/_new 2014-10-05 20:29:16.000000000 +0200 @@ -100,7 +100,11 @@ # required by rcmysql Requires: %{name}-client Requires: %{name}-errormessages = %version +%if 0%{?suse_version} Requires: perl-base +%else +Requires: perl +%endif # systemd requirements for openSUSE >= 12.1 %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(systemd) @@ -121,6 +125,11 @@ Obsoletes: mysql-Max < %{srv_vers} %endif Conflicts: otherproviders(mysql) +# Compatibility with Fedora/CentOS +Provides: mysql-server = %{srv_vers} +Provides: mariadb-server = %{srv_vers} +Conflicts: otherproviders(mysql-server) +Conflicts: otherproviders(mariadb-server) %description MariaDB is a backward compatible, drop-in replacement branch of the MySQL @@ -541,7 +550,7 @@ %if %have_info %doc %{_infodir}/mysql.info.* %endif -%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 +%if 0%{?use_systemd} > 0 %dir /usr/lib/mysql /usr/lib/mysql/rcmysql /usr/lib/systemd/system/mysql.service ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.7kiCSE/_old 2014-10-05 20:29:16.000000000 +0200 +++ /var/tmp/diff_new_pack.7kiCSE/_new 2014-10-05 20:29:16.000000000 +0200 @@ -86,7 +86,7 @@ for i in "${DOCS[@]}"; do install -m 644 "${i}" "${DOCDIR}" || true done -%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 +%if 0%{?use_systemd} > 0 install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql ln -sf service '%buildroot'/usr/sbin/rcmysql @@ -163,6 +163,14 @@ echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files fi +if [ %{_defaultdocdir} \!= /usr/share/doc ]; then rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}* +fi +if [ %{name} \!= mysql ]; then +rm -rf '%buildroot'/usr/share/doc/mysql +fi +if [ %{name} \!= mariadb ]; then +rm -rf '%buildroot'/usr/share/doc/mariadb +fi rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gupnp-igd for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gupnp-igd for openSUSE:Factory checked in at 2014-10-05 20:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gupnp-igd (Old) and /work/SRC/openSUSE:Factory/.gupnp-igd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gupnp-igd" Changes: -------- --- /work/SRC/openSUSE:Factory/gupnp-igd/gupnp-igd.changes 2014-02-11 10:27:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gupnp-igd.new/gupnp-igd.changes 2014-10-05 20:29:13.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 1 09:14:42 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.2.4: + + Add API to delete mapping by internal IP/port instead of the + external one. + +------------------------------------------------------------------- Old: ---- gupnp-igd-0.2.3.tar.xz New: ---- gupnp-igd-0.2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gupnp-igd.spec ++++++ --- /var/tmp/diff_new_pack.bxrEad/_old 2014-10-05 20:29:13.000000000 +0200 +++ /var/tmp/diff_new_pack.bxrEad/_new 2014-10-05 20:29:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: gupnp-igd -Version: 0.2.3 +Version: 0.2.4 Release: 0 Summary: Library to handle UPnP IGD port mapping License: LGPL-2.1+ ++++++ gupnp-igd-0.2.3.tar.xz -> gupnp-igd-0.2.4.tar.xz ++++++ ++++ 3428 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-10-05 20:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-09-26 10:51:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-10-05 20:29:11.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 01 13:56:52 CEST 2014 - aschnell(a)suse.de + +- removed some code only used by dropped yast2-repair +- version 3.1.46 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.45.tar.bz2 New: ---- yast2-storage-3.1.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.AJTtgs/_old 2014-10-05 20:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AJTtgs/_new 2014-10-05 20:29:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.45 +Version: 3.1.46 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.45.tar.bz2 -> yast2-storage-3.1.46.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/package/yast2-storage.changes new/yast2-storage-3.1.46/package/yast2-storage.changes --- old/yast2-storage-3.1.45/package/yast2-storage.changes 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/package/yast2-storage.changes 2014-10-01 14:08:14.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 01 13:56:52 CEST 2014 - aschnell(a)suse.de + +- removed some code only used by dropped yast2-repair +- version 3.1.46 + +------------------------------------------------------------------- Thu Sep 18 16:34:43 CEST 2014 - aschnell(a)suse.de - fixed btrfs subvolume handling for non-root devices (bnc#895075) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/package/yast2-storage.spec new/yast2-storage-3.1.46/package/yast2-storage.spec --- old/yast2-storage-3.1.45/package/yast2-storage.spec 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/package/yast2-storage.spec 2014-10-01 14:08:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.45 +Version: 3.1.46 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/clients/inst_disk.rb new/yast2-storage-3.1.46/src/clients/inst_disk.rb --- old/yast2-storage-3.1.45/src/clients/inst_disk.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/clients/inst_disk.rb 2014-10-01 14:08:14.000000000 +0200 @@ -68,7 +68,7 @@ Storage.CreateTargetBackup("disk") if !Storage.CheckBackupState("disk") - @handle_dialog = Mode.normal || Mode.repair + @handle_dialog = Mode.normal if @handle_dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/include/partitioning/custom_part_dialogs.rb new/yast2-storage-3.1.46/src/include/partitioning/custom_part_dialogs.rb --- old/yast2-storage-3.1.45/src/include/partitioning/custom_part_dialogs.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/include/partitioning/custom_part_dialogs.rb 2014-10-01 14:08:14.000000000 +0200 @@ -1397,60 +1397,6 @@ end - #FIXME: y2-repair uses this, need to find - #a better place for it - def ReallyInstPrepdisk - ret = :none - - doto = Storage.ChangeText - Builtins.y2milestone("ReallyInstPrepdisk doto:%1", doto) - - if Builtins.size(doto) == 0 - # popup text - Popup.Message(_("No unsaved changes exist.")) - ret = :back - else - dlg = VBox( - VSpacing(1), - HSpacing(60), - # label text - Left(Heading(_("Changes:"))), - RichText(doto) - ) - - UI.OpenDialog( - Opt(:decorated, :warncolor), - HBox( - HSpacing(1), - VBox( - dlg, - VSpacing(1), - # popup text - Heading(_(" Do you really want to execute these changes?")), - VSpacing(1), - HBox( - PushButton(Id(:back), Label.CancelButton), - HStretch(), - # button text - PushButton(Id(:apply), _("&Apply")), - PushButton(Id(:finish), Label.FinishButton) - ), - VSpacing(0.2) - ), - HSpacing(1) - ) - ) - - ret = Convert.to_symbol(UI.UserInput) - UI.CloseDialog - end - - Builtins.y2milestone("ReallyInstPrepdisk ret=%1", ret) - - ret - end - - # Delete all partition in targetMap from the device "del_dev" and return # a new targetMap. # Check if LVM partition exists on the device. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/include/partitioning/custom_part_lib.rb new/yast2-storage-3.1.46/src/include/partitioning/custom_part_lib.rb --- old/yast2-storage-3.1.45/src/include/partitioning/custom_part_lib.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/include/partitioning/custom_part_lib.rb 2014-10-01 14:08:14.000000000 +0200 @@ -929,13 +929,7 @@ FileSystemOptions(Ops.get_map(new, "fs_options", {}), selected_fs) ) end - if Mode.repair - UI.ChangeWidget(Id(:do_mount), :Enabled, false) - UI.ChangeWidget(Id(:do_not_mount), :Enabled, false) - UI.ChangeWidget(Id(:do_mount_attachment), :Enabled, false) - UI.ChangeWidget(Id(:fstab_options), :Enabled, false) - UI.ChangeWidget(Id(:crypt_fs), :Enabled, false) - end + Builtins.y2milestone("HandlePartWidgetChanges old:%1", old) Builtins.y2milestone("HandlePartWidgetChanges new:%1", new) deep_copy(new) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/include/partitioning/ep-main.rb new/yast2-storage-3.1.46/src/include/partitioning/ep-main.rb --- old/yast2-storage-3.1.45/src/include/partitioning/ep-main.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/include/partitioning/ep-main.rb 2014-10-01 14:08:14.000000000 +0200 @@ -706,7 +706,7 @@ StorageSettings.GetModified if !check_created_partition_table( Storage.GetTargetMap, - Stage.initial && !Mode.repair + Stage.initial ) widget = :again else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/modules/Storage.rb new/yast2-storage-3.1.46/src/modules/Storage.rb --- old/yast2-storage-3.1.45/src/modules/Storage.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/modules/Storage.rb 2014-10-01 14:08:14.000000000 +0200 @@ -4532,7 +4532,7 @@ tmp = AddSwapMp(tmp) end CreateTargetBackup("initial") - if (Stage.initial || Mode.repair) && !Mode.autoinst + if Stage.initial && !Mode.autoinst AddMountPointsForWin(tmp) end Ops.set(@StorageMap, @targets_key, GetTargetMap()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/modules/StorageDevices.rb new/yast2-storage-3.1.46/src/modules/StorageDevices.rb --- old/yast2-storage-3.1.45/src/modules/StorageDevices.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/modules/StorageDevices.rb 2014-10-01 14:08:14.000000000 +0200 @@ -280,21 +280,6 @@ Ops.greater_than(Builtins.size(@cd_drives), 0) end - def cddrives - ProbeCDROMs() if @cd_drives == nil - deep_copy(@cd_drives) - end - - def GetCdromEntry(device) - ret = {} - Builtins.y2milestone("GetCdromEntry device %1", device) - ret = Builtins.find(@cd_drives) do |e| - Ops.get_string(e, "dev_orig", Ops.get_string(e, "dev_name", "")) == device - end - ret = {} if ret == nil - Builtins.y2milestone("GetCdromEntry ret %1", ret) - deep_copy(ret) - end # FloppyReady () # @return floppy media status @@ -664,10 +649,7 @@ nil end - publish :function => :cddrives, :type => "list <map> ()" - publish :function => :GetCdromEntry, :type => "map (string)" publish :function => :FloppyReady, :type => "boolean ()" - publish :function => :ZipDrives, :type => "map <string, map> ()" publish :function => :FloppyPresent, :type => "boolean ()" publish :function => :FloppyDevice, :type => "string ()" publish :function => :FloppyDrives, :type => "list <map> ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.45/src/modules/StorageInit.rb new/yast2-storage-3.1.46/src/modules/StorageInit.rb --- old/yast2-storage-3.1.45/src/modules/StorageInit.rb 2014-09-24 17:00:23.000000000 +0200 +++ new/yast2-storage-3.1.46/src/modules/StorageInit.rb 2014-10-01 14:08:14.000000000 +0200 @@ -66,7 +66,7 @@ env.instsys ) env.testmode = Mode.test; env.autodetect = !Mode.test; - env.instsys = Stage.initial || Mode.repair; + env.instsys = Stage.initial Builtins.y2milestone("ro:%1 test:%2 auto:%3 instsys:%4", env.readonly, env.testmode, env.autodetect, env.instsys ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-10-05 20:28:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-09-28 19:56:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-10-05 20:28:17.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Sep 28 13:21:43 UTC 2014 - ftake(a)geeko.jp + +- Fix bnc#768896 + * Allow to revert fontconfig settings to the distribution default + * Prevent kcm_fonts from saving inappropriate values + when kcm_fonts is opened + * Add kcm-fix-105797-fontconfig.patch + +------------------------------------------------------------------- New: ---- kcm-fix-105797-fontconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.UL7UHM/_old 2014-10-05 20:28:18.000000000 +0200 +++ /var/tmp/diff_new_pack.UL7UHM/_new 2014-10-05 20:28:18.000000000 +0200 @@ -142,6 +142,8 @@ Patch67: remove_strigi.patch # Taken from fedora, additional changes resubmitted to fedora Patch71: kde-workspace-4.11.0-kdm-logind-multiseat.patch +# PATCH-FIX-UPSTREAM ftake(a)geeko.jp reset fontconfig settings bnc#768896, kde#105797 +Patch72: kcm-fix-105797-fontconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-branding = %{_kde_branding_version} Requires: %{name}-ksysguardd = %{version} @@ -390,6 +392,7 @@ %if %{with_multiseat} %patch71 -p1 %endif +%patch72 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png ++++++ kcm-fix-105797-fontconfig.patch ++++++ diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 67eccd4..5da6722 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -131,7 +131,7 @@ static const char * const aa_vbgr_xpm[]={ "aaaaaaaaaaaa", "aaaaaaaaaaaa"}; -static const char* const * const aaPixmaps[]={ aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm }; +static const char* const * const aaPixmaps[]={ 0, 0, aa_rgb_xpm, aa_bgr_xpm, aa_vrgb_xpm, aa_vbgr_xpm }; /**** DLL Interface ****/ K_PLUGIN_FACTORY(FontFactory, registerPlugin<KFonts>(); ) @@ -258,23 +258,23 @@ FontAASettings::FontAASettings(QWidget *parent) " have a linear ordering of RGB sub-pixel, some have BGR.<br />" " This feature does not work with CRT monitors.</p>" ); - useSubPixel=new QCheckBox(i18n("&Use sub-pixel rendering:"), mw); - useSubPixel->setWhatsThis( subPixelWhatsThis ); + subPixelLabel=new QLabel(i18n("Sub-pixel rendering type: "), mw); + subPixelLabel->setWhatsThis( subPixelWhatsThis ); subPixelType=new QComboBox(mw); - layout->addRow(useSubPixel, subPixelType); + layout->addRow(subPixelLabel, subPixelType); subPixelType->setEditable(false); subPixelType->setWhatsThis( subPixelWhatsThis ); - for(int t=KXftConfig::SubPixel::None+1; t<=KXftConfig::SubPixel::Vbgr; ++t) - subPixelType->addItem(QPixmap(aaPixmaps[t-1]), i18n(KXftConfig::description((KXftConfig::SubPixel::Type)t).toUtf8())); + for(int t=KXftConfig::SubPixel::NotSet; t<=KXftConfig::SubPixel::Vbgr; ++t) + subPixelType->addItem(QPixmap(aaPixmaps[t]), i18n(KXftConfig::description((KXftConfig::SubPixel::Type)t).toUtf8())); QLabel *hintingLabel=new QLabel(i18n("Hinting style: "), mw); hintingStyle=new QComboBox(mw); hintingStyle->setEditable(false); layout->addRow(hintingLabel, hintingStyle); - for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s) + for(int s=KXftConfig::Hint::NotSet; s<=KXftConfig::Hint::Full; ++s) hintingStyle->addItem(i18n(KXftConfig::description((KXftConfig::Hint::Style)s).toUtf8())); QString hintingText(i18n("Hinting is a process used to enhance the quality of fonts at small sizes.")); @@ -285,7 +285,6 @@ FontAASettings::FontAASettings(QWidget *parent) setMainWidget(mw); connect(excludeRange, SIGNAL(toggled(bool)), SLOT(changed())); - connect(useSubPixel, SIGNAL(toggled(bool)), SLOT(changed())); connect(excludeFrom, SIGNAL(valueChanged(double)), SLOT(changed())); connect(excludeTo, SIGNAL(valueChanged(double)), SLOT(changed())); connect(subPixelType, SIGNAL(activated(QString)), SLOT(changed())); @@ -311,20 +310,10 @@ bool FontAASettings::load() KXftConfig::SubPixel::Type spType; - if(!xft.getSubPixelType(spType) || KXftConfig::SubPixel::None==spType) - useSubPixel->setChecked(false); - else - { - int idx=getIndex(spType); + xft.getSubPixelType(spType); + int idx=getIndex(spType); - if(idx>-1) - { - useSubPixel->setChecked(true); - subPixelType->setCurrentIndex(idx); - } - else - useSubPixel->setChecked(false); - } + subPixelType->setCurrentIndex(idx); KXftConfig::Hint::Style hStyle; @@ -332,9 +321,8 @@ bool FontAASettings::load() { KConfig kglobals("kdeglobals", KConfig::NoGlobals); - hStyle=KXftConfig::Hint::Medium; + hStyle=KXftConfig::Hint::NotSet; xft.setHintStyle(hStyle); - xft.apply(); // Save this setting KConfigGroup(&kglobals, "General").writeEntry("XftHintStyle", KXftConfig::toStr(hStyle)); kglobals.sync(); runRdb(KRdbExportXftSettings | KRdbExportGtkTheme); @@ -344,29 +332,33 @@ bool FontAASettings::load() enableWidgets(); - return xft.getAntiAliasing(); + return xft.aliasingEnabled(); } -bool FontAASettings::save( bool useAA ) +bool FontAASettings::save(KXftConfig::AntiAliasing::State aaState) { KXftConfig xft; KConfig kglobals("kdeglobals", KConfig::NoGlobals); KConfigGroup grp(&kglobals, "General"); - xft.setAntiAliasing( useAA ); + xft.setAntiAliasing(aaState); if(excludeRange->isChecked()) xft.setExcludeRange(excludeFrom->value(), excludeTo->value()); else xft.setExcludeRange(0, 0); - KXftConfig::SubPixel::Type spType(useSubPixel->isChecked() - ? getSubPixelType() - : KXftConfig::SubPixel::None); + KXftConfig::SubPixel::Type spType(getSubPixelType()); xft.setSubPixelType(spType); grp.writeEntry("XftSubPixel", KXftConfig::toStr(spType)); - grp.writeEntry("XftAntialias", useAA); + if (KXftConfig::AntiAliasing::NotSet == aaState) { + grp.revertToDefault("XftAntialias"); + } + else + { + grp.writeEntry("XftAntialias", aaState == KXftConfig::AntiAliasing::Enabled); + } bool mod=false; KXftConfig::Hint::Style hStyle(getHintStyle()); @@ -374,12 +366,17 @@ bool FontAASettings::save( bool useAA ) xft.setHintStyle(hStyle); QString hs(KXftConfig::toStr(hStyle)); - - if(!hs.isEmpty() && hs!=grp.readEntry("XftHintStyle")) - { - grp.writeEntry("XftHintStyle", hs); - mod=true; + if (hs != grp.readEntry("XftHintStyle")) { + if (KXftConfig::Hint::NotSet == hStyle) + { + grp.revertToDefault("XftHintStyle"); + } + else + { + grp.writeEntry("XftHintStyle", hs); + } } + mod=true; kglobals.sync(); if(!mod) @@ -395,8 +392,8 @@ void FontAASettings::defaults() excludeRange->setChecked(false); excludeFrom->setValue(8.0); excludeTo->setValue(15.0); - useSubPixel->setChecked(false); - hintingStyle->setCurrentIndex(getIndex(KXftConfig::Hint::Medium)); + subPixelType->setCurrentIndex(getIndex(KXftConfig::SubPixel::NotSet)); + hintingStyle->setCurrentIndex(getIndex(KXftConfig::Hint::NotSet)); enableWidgets(); } @@ -419,11 +416,11 @@ KXftConfig::SubPixel::Type FontAASettings::getSubPixelType() { int t; - for(t=KXftConfig::SubPixel::None; t<=KXftConfig::SubPixel::Vbgr; ++t) + for(t=KXftConfig::SubPixel::NotSet; t<=KXftConfig::SubPixel::Vbgr; ++t) if(subPixelType->currentText()==i18n(KXftConfig::description((KXftConfig::SubPixel::Type)t).toUtf8())) return (KXftConfig::SubPixel::Type)t; - return KXftConfig::SubPixel::None; + return KXftConfig::SubPixel::NotSet; } int FontAASettings::getIndex(KXftConfig::Hint::Style hStyle) @@ -458,7 +455,6 @@ void FontAASettings::enableWidgets() excludeFrom->setEnabled(excludeRange->isChecked()); excludeTo->setEnabled(excludeRange->isChecked()); excludeToLabel->setEnabled(excludeRange->isChecked()); - subPixelType->setEnabled(useSubPixel->isChecked()); #ifdef FT_LCD_FILTER_H static int ft_has_subpixel = -1; if( ft_has_subpixel == -1 ) { @@ -469,7 +465,6 @@ void FontAASettings::enableWidgets() FT_Done_FreeType(ftLibrary); } } - useSubPixel->setEnabled(ft_has_subpixel); subPixelType->setEnabled(ft_has_subpixel); #endif } @@ -787,8 +782,21 @@ void KFonts::save() // TODO: With AASystem the changes already made by this module should be reverted somehow. #if defined(HAVE_FONTCONFIG) && defined (Q_WS_X11) bool aaSave = false; - if( cbAA->currentIndex() != AASystem ) - aaSave = aaSettings->save( useAA == AAEnabled ); + if (cbAA->currentIndex() == AAEnabled ) + { + aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled); + } + else if (cbAA->currentIndex() == AADisabled) + { + aaSave = aaSettings->save(KXftConfig::AntiAliasing::Disabled); + } + else + { + // If AASystem is selected, this removes all fontconfig settings made by + // this module. + aaSettings->defaults(); + aaSave = aaSettings->save(KXftConfig::AntiAliasing::NotSet); + } if( aaSave || (useAA != useAA_original) || dpi != dpi_original) { KMessageBox::information(this, diff --git a/kcontrol/fonts/fonts.h b/kcontrol/fonts/fonts.h index e98d060..95d70e0 100644 --- a/kcontrol/fonts/fonts.h +++ b/kcontrol/fonts/fonts.h @@ -57,13 +57,14 @@ public: #if defined(HAVE_FONTCONFIG) && defined (Q_WS_X11) FontAASettings(QWidget *parent); - bool save( bool useAA ); + bool save(KXftConfig::AntiAliasing::State aaState); bool load(); void defaults(); int getIndex(KXftConfig::SubPixel::Type spType); KXftConfig::SubPixel::Type getSubPixelType(); int getIndex(KXftConfig::Hint::Style hStyle); KXftConfig::Hint::Style getHintStyle(); + void setAntiAliasingState(KXftConfig::AntiAliasing::State aaState); void enableWidgets(); int exec(); #endif @@ -76,11 +77,11 @@ protected Q_SLOTS: private: QCheckBox *excludeRange; - QCheckBox *useSubPixel; KDoubleNumInput *excludeFrom; KDoubleNumInput *excludeTo; QComboBox *subPixelType; QComboBox *hintingStyle; + QLabel *subPixelLabel; QLabel *excludeToLabel; bool changesMade; #endif diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 410bf01..d5cd3a8 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -209,8 +209,10 @@ static KXftConfig::SubPixel::Type strToType(const char *str) return KXftConfig::SubPixel::Vrgb; else if(0==strcmp(str, "vbgr")) return KXftConfig::SubPixel::Vbgr; - else + else if(0==strcmp(str, "none")) return KXftConfig::SubPixel::None; + else + return KXftConfig::SubPixel::NotSet; } static KXftConfig::Hint::Style strToStyle(const char *str) @@ -230,7 +232,6 @@ KXftConfig::KXftConfig() , m_file(getConfigFile()) { kDebug(1208) << "Using fontconfig file:" << m_file; - m_antiAliasing = aliasingEnabled(); reset(); } @@ -248,6 +249,7 @@ bool KXftConfig::reset() m_excludeRange.reset(); m_excludePixelRange.reset(); m_subPixel.reset(); + m_antiAliasing.reset(); QFile f(m_file); @@ -282,7 +284,6 @@ bool KXftConfig::reset() m_excludePixelRange.from=pFrom; m_excludePixelRange.to=pTo; m_madeChanges=true; - apply(); } } else if(!equal(0, m_excludePixelRange.from) || !equal(0, m_excludePixelRange.to)) @@ -291,7 +292,6 @@ bool KXftConfig::reset() m_excludeRange.from=(int)pixel2Point(m_excludePixelRange.from); m_excludeRange.to=(int)pixel2Point(m_excludePixelRange.to); m_madeChanges=true; - apply(); } } @@ -314,7 +314,7 @@ bool KXftConfig::apply() newConfig.setExcludeRange(m_excludeRange.from, m_excludeRange.to); newConfig.setSubPixelType(m_subPixel.type); newConfig.setHintStyle(m_hint.style); - newConfig.setAntiAliasing(m_antiAliasing.set); + newConfig.setAntiAliasing(m_antiAliasing.state); ok=newConfig.changed() ? newConfig.apply() : true; if(ok) @@ -467,6 +467,8 @@ QString KXftConfig::description(SubPixel::Type t) switch(t) { default: + case SubPixel::NotSet: + return i18nc("use system subpixel setting", "System default"); case SubPixel::None: return i18nc("no subpixel rendering", "None"); case SubPixel::Rgb: @@ -503,10 +505,10 @@ QString KXftConfig::description(Hint::Style s) switch(s) { default: + case Hint::NotSet: + return i18nc("use system hinting settings", "System default"); case Hint::Medium: return i18nc("medium hinting", "Medium"); - case Hint::NotSet: - return ""; case Hint::None: return i18nc("no hinting", "None"); case Hint::Slight: @@ -521,10 +523,12 @@ const char * KXftConfig::toStr(Hint::Style s) switch(s) { default: - case Hint::Medium: - return "hintmedium"; + case Hint::NotSet: + return ""; case Hint::None: return "hintnone"; + case Hint::Medium: + return "hintmedium"; case Hint::Slight: return "hintslight"; case Hint::Full: @@ -577,7 +581,7 @@ void KXftConfig::readContents() "assign")).isNull()) { m_antiAliasing.node=n; - m_antiAliasing.set=str.toLower()!="false"; + m_antiAliasing.state = str.toLower() != "false" ? AntiAliasing::Enabled : AntiAliasing::Disabled; } } } @@ -665,35 +669,51 @@ void KXftConfig::readContents() void KXftConfig::applySubPixelType() { - QDomElement matchNode = m_doc.createElement("match"), - typeNode = m_doc.createElement("const"), - editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type)); - - matchNode.setAttribute("target", "font"); - editNode.setAttribute("mode", "assign"); - editNode.setAttribute("name", "rgba"); - editNode.appendChild(typeNode); - typeNode.appendChild(typeText); - matchNode.appendChild(editNode); - if(m_subPixel.node.isNull()) - m_doc.documentElement().appendChild(matchNode); + if(SubPixel::NotSet==m_subPixel.type) + { + if(!m_subPixel.node.isNull()) + { + m_doc.documentElement().removeChild(m_subPixel.node); + m_subPixel.node.clear(); + } + } else - m_doc.documentElement().replaceChild(matchNode, m_subPixel.node); - m_subPixel.node=matchNode; + { + QDomElement matchNode = m_doc.createElement("match"); + QDomElement typeNode = m_doc.createElement("const"); + QDomElement editNode = m_doc.createElement("edit"); + QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type)); + + matchNode.setAttribute("target", "font"); + editNode.setAttribute("mode", "assign"); + editNode.setAttribute("name", "rgba"); + editNode.appendChild(typeNode); + typeNode.appendChild(typeText); + matchNode.appendChild(editNode); + if(m_subPixel.node.isNull()) + m_doc.documentElement().appendChild(matchNode); + else + m_doc.documentElement().replaceChild(matchNode, m_subPixel.node); + m_subPixel.node=matchNode; + } } void KXftConfig::applyHintStyle() { applyHinting(); - if(Hint::NotSet==m_hint.style || m_hint.toBeRemoved) + if(Hint::NotSet==m_hint.style) { if(!m_hint.node.isNull()) { m_doc.documentElement().removeChild(m_hint.node); m_hint.node.clear(); } + if(!m_hinting.node.isNull()) + { + m_doc.documentElement().removeChild(m_hinting.node); + m_hinting.node.clear(); + } } else { @@ -793,37 +813,45 @@ void KXftConfig::applyExcludeRange(bool pixel) } } -bool KXftConfig::getAntiAliasing() const +KXftConfig::AntiAliasing::State KXftConfig::getAntiAliasing() const { - return m_antiAliasing.set; + return m_antiAliasing.state; } -void KXftConfig::setAntiAliasing( bool set ) +void KXftConfig::setAntiAliasing(AntiAliasing::State state) { - if(set!=m_antiAliasing.set) + if (state != m_antiAliasing.state) { - m_antiAliasing.set = set; + m_antiAliasing.state = state; m_madeChanges = true; } } void KXftConfig::applyAntiAliasing() { - QDomElement matchNode = m_doc.createElement("match"), - typeNode = m_doc.createElement("bool"), - editNode = m_doc.createElement("edit"); - QDomText typeText = m_doc.createTextNode(m_antiAliasing.set ? "true" : "false"); + if (AntiAliasing::NotSet == m_antiAliasing.state) { + if (!m_antiAliasing.node.isNull()) { + m_doc.documentElement().removeChild(m_antiAliasing.node); + m_antiAliasing.node.clear(); + } + } else { + QDomElement matchNode = m_doc.createElement("match"); + QDomElement typeNode = m_doc.createElement("bool"); + QDomElement editNode = m_doc.createElement("edit"); + QDomText typeText = m_doc.createTextNode(m_antiAliasing.state == AntiAliasing::Enabled ? + "true" : "false"); - matchNode.setAttribute("target", "font"); - editNode.setAttribute("mode", "assign"); - editNode.setAttribute("name", "antialias"); - editNode.appendChild(typeNode); - typeNode.appendChild(typeText); - matchNode.appendChild(editNode); - if(!m_antiAliasing.node.isNull()) - m_doc.documentElement().removeChild(m_antiAliasing.node); - m_doc.documentElement().appendChild(matchNode); - m_antiAliasing.node=matchNode; + matchNode.setAttribute("target", "font"); + editNode.setAttribute("mode", "assign"); + editNode.setAttribute("name", "antialias"); + editNode.appendChild(typeNode); + typeNode.appendChild(typeText); + matchNode.appendChild(editNode); + if(!m_antiAliasing.node.isNull()) + m_doc.documentElement().removeChild(m_antiAliasing.node); + m_doc.documentElement().appendChild(matchNode); + m_antiAliasing.node=matchNode; + } } // KXftConfig only parses one config file, user's .fonts.conf usually. diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h index 0df6164..9cba20b 100644 --- a/kcontrol/fonts/kxftconfig.h +++ b/kcontrol/fonts/kxftconfig.h @@ -50,6 +50,7 @@ class KXftConfig { enum Type { + NotSet, None, Rgb, Bgr, @@ -58,9 +59,9 @@ class KXftConfig }; SubPixel(Type t, QDomNode &n) : Item(n), type(t) {} - SubPixel(Type t=None) : type(t) {} + SubPixel(Type t=NotSet) : type(t) {} - void reset() { Item::reset(); type=None; } + void reset() { Item::reset(); type=NotSet; } Type type; }; @@ -107,12 +108,20 @@ class KXftConfig struct AntiAliasing : public Item { - AntiAliasing(bool s, QDomNode &n) : Item(n), set(s) {} - AntiAliasing(bool s=true) : set(s) {} + enum State + { + NotSet, + Enabled, + Disabled + }; - void reset() { Item::reset(); set=true; } + AntiAliasing(State s, QDomNode &n) : Item(n), state(s) {} + AntiAliasing(State s = NotSet) : state(s) {} + AntiAliasing(bool aaEnabled) : state(aaEnabled ? Enabled : Disabled) {} - bool set; + void reset() { Item::reset(); state = NotSet; } + + enum State state; }; public: @@ -129,13 +138,14 @@ class KXftConfig void setExcludeRange(double from, double to); // from:0, to:0 => turn off exclude range bool getHintStyle(Hint::Style &style); void setHintStyle(Hint::Style style); - void setAntiAliasing(bool set); - bool getAntiAliasing() const; + void setAntiAliasing(AntiAliasing::State state); + AntiAliasing::State getAntiAliasing() const; bool changed() { return m_madeChanges; } static QString description(SubPixel::Type t); static const char * toStr(SubPixel::Type t); static QString description(Hint::Style s); static const char * toStr(Hint::Style s); + bool aliasingEnabled(); private: @@ -146,7 +156,6 @@ class KXftConfig void setHinting(bool set); void applyHinting(); void applyExcludeRange(bool pixel); - bool aliasingEnabled(); private: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2014-10-05 20:28:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2014-09-23 10:42:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2014-10-05 20:28:13.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Sep 30 20:32:08 UTC 2014 - andreas.stieger(a)gmx.de + +- git 2.1.2: + * "git push" over HTTP transport had an artificial limit on + number of refs that can be pushed imposed by the command line + length. + * When receiving an invalid pack stream that records the same + object twice, multiple threads got confused due to a race. + * An attempt to remove the entire tree in the "git fast-import" + input stream caused it to misbehave. + * Reachability check (used in "git prune" and friends) did not + add a detached HEAD as a starting point to traverse + objects still in use. + * "git config --add section.var val" used to lose existing + section.var whose value was an empty string. + * "git fsck" failed to report that it found corrupt objects via + its exit status in some cases. + +------------------------------------------------------------------- Old: ---- git-2.1.1.tar.xz New: ---- git-2.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.lBOjXw/_old 2014-10-05 20:28:14.000000000 +0200 +++ /var/tmp/diff_new_pack.lBOjXw/_new 2014-10-05 20:28:14.000000000 +0200 @@ -20,7 +20,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ git-2.1.1.tar.xz -> git-2.1.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/Documentation/RelNotes/2.1.2.txt new/git-2.1.2/Documentation/RelNotes/2.1.2.txt --- old/git-2.1.1/Documentation/RelNotes/2.1.2.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.2/Documentation/RelNotes/2.1.2.txt 2014-09-30 21:00:40.000000000 +0200 @@ -0,0 +1,20 @@ +Git v2.1.2 Release Notes +======================== + + * "git push" over HTTP transport had an artificial limit on number of + refs that can be pushed imposed by the command line length. + + * When receiving an invalid pack stream that records the same object + twice, multiple threads got confused due to a race. + + * An attempt to remove the entire tree in the "git fast-import" input + stream caused it to misbehave. + + * Reachability check (used in "git prune" and friends) did not add a + detached HEAD as a starting point to traverse objects still in use. + + * "git config --add section.var val" used to lose existing + section.var whose value was an empty string. + + * "git fsck" failed to report that it found corrupt objects via its + exit status in some cases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/Documentation/git-rebase.txt new/git-2.1.2/Documentation/git-rebase.txt --- old/git-2.1.1/Documentation/git-rebase.txt 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/Documentation/git-rebase.txt 2014-09-30 21:00:40.000000000 +0200 @@ -9,7 +9,7 @@ -------- [verse] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] - [<upstream>] [<branch>] + [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' --continue | --skip | --abort | --edit-todo @@ -316,11 +316,8 @@ -f:: --force-rebase:: - Force the rebase even if the current branch is a descendant - of the commit you are rebasing onto. Normally non-interactive rebase will - exit with the message "Current branch is up to date" in such a - situation. - Incompatible with the --interactive option. + Force a rebase even if the current branch is up-to-date and + the command without `--force` would return without doing anything. + You may find this (or --no-ff with an interactive rebase) helpful after reverting a topic branch merge, as this option recreates the topic branch with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/Documentation/git-send-pack.txt new/git-2.1.2/Documentation/git-send-pack.txt --- old/git-2.1.1/Documentation/git-send-pack.txt 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/Documentation/git-send-pack.txt 2014-09-30 21:00:40.000000000 +0200 @@ -35,6 +35,16 @@ Instead of explicitly specifying which refs to update, update all heads that locally exist. +--stdin:: + Take the list of refs from stdin, one per line. If there + are refs specified on the command line in addition to this + option, then the refs from stdin are processed after those + on the command line. ++ +If '--stateless-rpc' is specified together with this option then +the list of refs must be in packet format (pkt-line). Each ref must +be in a separate packet, and the list must end with a flush packet. + --dry-run:: Do everything except actually send the updates. @@ -77,7 +87,8 @@ Without '--all' and without any '<ref>', the heads that exist both on the local side and on the remote side are updated. -When one or more '<ref>' are specified explicitly, it can be either a +When one or more '<ref>' are specified explicitly (whether on the +command line or via `--stdin`), it can be either a single pattern, or a pair of such pattern separated by a colon ":" (this means that a ref name cannot have a colon in it). A single pattern '<name>' is just a shorthand for '<name>:<name>'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/Documentation/git.txt new/git-2.1.2/Documentation/git.txt --- old/git-2.1.1/Documentation/git.txt 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/Documentation/git.txt 2014-09-30 21:00:40.000000000 +0200 @@ -43,9 +43,10 @@ branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.1.1/git.html[documentation for release 2.1.1] +* link:v2.1.2/git.html[documentation for release 2.1.2] * release notes for + link:RelNotes/2.1.2.txt[2.1.2], link:RelNotes/2.1.1.txt[2.1.1], link:RelNotes/2.1.0.txt[2.1]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/GIT-VERSION-GEN new/git-2.1.2/GIT-VERSION-GEN --- old/git-2.1.1/GIT-VERSION-GEN 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/GIT-VERSION-GEN 2014-09-30 21:00:40.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.1.1 +DEF_VER=v2.1.2 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/RelNotes new/git-2.1.2/RelNotes --- old/git-2.1.1/RelNotes 2014-10-05 20:28:16.000000000 +0200 +++ new/git-2.1.2/RelNotes 2014-10-05 20:28:16.000000000 +0200 @@ -1 +1 @@ -symbolic link to Documentation/RelNotes/2.1.1.txt +symbolic link to Documentation/RelNotes/2.1.2.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/builtin/config.c new/git-2.1.2/builtin/config.c --- old/git-2.1.1/builtin/config.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/builtin/config.c 2014-09-30 21:00:40.000000000 +0200 @@ -586,7 +586,8 @@ check_argc(argc, 2, 2); value = normalize_value(argv[0], argv[1]); return git_config_set_multivar_in_file(given_config_source.file, - argv[0], value, "^$", 0); + argv[0], value, + CONFIG_REGEX_NONE, 0); } else if (actions == ACTION_REPLACE_ALL) { check_write(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/builtin/fsck.c new/git-2.1.2/builtin/fsck.c --- old/git-2.1.1/builtin/fsck.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/builtin/fsck.c 2014-09-30 21:00:40.000000000 +0200 @@ -388,7 +388,8 @@ unsigned char *sha1 = entry->sha1; sha1_list.entry[i] = NULL; - fsck_sha1(sha1); + if (fsck_sha1(sha1)) + errors_found |= ERROR_OBJECT; free(entry); } sha1_list.nr = 0; @@ -488,6 +489,7 @@ obj = parse_object(sha1); if (!obj) { error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1)); + errors_found |= ERROR_REACHABLE; /* We'll continue with the rest despite the error.. */ return 0; } @@ -504,7 +506,7 @@ { if (head_points_at && !is_null_sha1(head_sha1)) fsck_handle_ref("HEAD", head_sha1, 0, NULL); - for_each_ref(fsck_handle_ref, NULL); + for_each_rawref(fsck_handle_ref, NULL); if (include_reflogs) for_each_reflog(fsck_handle_reflog, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/builtin/index-pack.c new/git-2.1.2/builtin/index-pack.c --- old/git-2.1.1/builtin/index-pack.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/builtin/index-pack.c 2014-09-30 21:00:40.000000000 +0200 @@ -112,6 +112,10 @@ #define deepest_delta_lock() lock_mutex(&deepest_delta_mutex) #define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex) +static pthread_mutex_t type_cas_mutex; +#define type_cas_lock() lock_mutex(&type_cas_mutex) +#define type_cas_unlock() unlock_mutex(&type_cas_mutex) + static pthread_key_t key; static inline void lock_mutex(pthread_mutex_t *mutex) @@ -135,6 +139,7 @@ init_recursive_mutex(&read_mutex); pthread_mutex_init(&counter_mutex, NULL); pthread_mutex_init(&work_mutex, NULL); + pthread_mutex_init(&type_cas_mutex, NULL); if (show_stat) pthread_mutex_init(&deepest_delta_mutex, NULL); pthread_key_create(&key, NULL); @@ -157,6 +162,7 @@ pthread_mutex_destroy(&read_mutex); pthread_mutex_destroy(&counter_mutex); pthread_mutex_destroy(&work_mutex); + pthread_mutex_destroy(&type_cas_mutex); if (show_stat) pthread_mutex_destroy(&deepest_delta_mutex); for (i = 0; i < nr_threads; i++) @@ -862,7 +868,6 @@ { void *base_data, *delta_data; - delta_obj->real_type = base->obj->real_type; if (show_stat) { delta_obj->delta_depth = base->obj->delta_depth + 1; deepest_delta_lock(); @@ -888,6 +893,26 @@ counter_unlock(); } +/* + * Standard boolean compare-and-swap: atomically check whether "*type" is + * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched + * and return false. + */ +static int compare_and_swap_type(enum object_type *type, + enum object_type want, + enum object_type set) +{ + enum object_type old; + + type_cas_lock(); + old = *type; + if (old == want) + *type = set; + type_cas_unlock(); + + return old == want; +} + static struct base_data *find_unresolved_deltas_1(struct base_data *base, struct base_data *prev_base) { @@ -915,7 +940,10 @@ struct object_entry *child = objects + deltas[base->ref_first].obj_no; struct base_data *result = alloc_base_data(); - assert(child->real_type == OBJ_REF_DELTA); + if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA, + base->obj->real_type)) + die("BUG: child->real_type != OBJ_REF_DELTA"); + resolve_delta(child, base, result); if (base->ref_first == base->ref_last && base->ofs_last == -1) free_base_data(base); @@ -929,6 +957,7 @@ struct base_data *result = alloc_base_data(); assert(child->real_type == OBJ_OFS_DELTA); + child->real_type = base->obj->real_type; resolve_delta(child, base, result); if (base->ofs_first == base->ofs_last) free_base_data(base); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/builtin/send-pack.c new/git-2.1.2/builtin/send-pack.c --- old/git-2.1.1/builtin/send-pack.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/builtin/send-pack.c 2014-09-30 21:00:40.000000000 +0200 @@ -110,6 +110,7 @@ int flags; unsigned int reject_reasons; int progress = -1; + int from_stdin = 0; struct push_cas_option cas = {0}; argv++; @@ -169,6 +170,10 @@ args.stateless_rpc = 1; continue; } + if (!strcmp(arg, "--stdin")) { + from_stdin = 1; + continue; + } if (!strcmp(arg, "--helper-status")) { helper_status = 1; continue; @@ -201,6 +206,28 @@ } if (!dest) usage(send_pack_usage); + + if (from_stdin) { + struct argv_array all_refspecs = ARGV_ARRAY_INIT; + + for (i = 0; i < nr_refspecs; i++) + argv_array_push(&all_refspecs, refspecs[i]); + + if (args.stateless_rpc) { + const char *buf; + while ((buf = packet_read_line(0, NULL))) + argv_array_push(&all_refspecs, buf); + } else { + struct strbuf line = STRBUF_INIT; + while (strbuf_getline(&line, stdin, '\n') != EOF) + argv_array_push(&all_refspecs, line.buf); + strbuf_release(&line); + } + + refspecs = all_refspecs.argv; + nr_refspecs = all_refspecs.argc; + } + /* * --all and --mirror are incompatible; neither makes sense * with any refspecs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/cache.h new/git-2.1.2/cache.h --- old/git-2.1.1/cache.h 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/cache.h 2014-09-30 21:00:40.000000000 +0200 @@ -1281,6 +1281,8 @@ #define CONFIG_INVALID_PATTERN 6 #define CONFIG_GENERIC_ERROR 7 +#define CONFIG_REGEX_NONE ((void *)1) + struct git_config_source { unsigned int use_stdin:1; const char *file; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/config.c new/git-2.1.2/config.c --- old/git-2.1.1/config.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/config.c 2014-09-30 21:00:40.000000000 +0200 @@ -1236,10 +1236,15 @@ static int matches(const char *key, const char *value) { - return !strcmp(key, store.key) && - (store.value_regex == NULL || - (store.do_not_match ^ - !regexec(store.value_regex, value, 0, NULL, 0))); + if (strcmp(key, store.key)) + return 0; /* not ours */ + if (!store.value_regex) + return 1; /* always matches */ + if (store.value_regex == CONFIG_REGEX_NONE) + return 0; /* never matches */ + + return store.do_not_match ^ + (value && !regexec(store.value_regex, value, 0, NULL, 0)); } static int store_aux(const char *key, const char *value, void *cb) @@ -1501,6 +1506,8 @@ /* * If value==NULL, unset in (remove from) config, * if value_regex!=NULL, disregard key/value pairs where value does not match. + * if value_regex==CONFIG_REGEX_NONE, do not match any existing values + * (only add a new one) * if multi_replace==0, nothing, or only one matching key/value is replaced, * else all matching key/values (regardless how many) are removed, * before the new pair is written. @@ -1584,6 +1591,8 @@ if (value_regex == NULL) store.value_regex = NULL; + else if (value_regex == CONFIG_REGEX_NONE) + store.value_regex = CONFIG_REGEX_NONE; else { if (value_regex[0] == '!') { store.do_not_match = 1; @@ -1615,7 +1624,8 @@ if (git_config_from_file(store_aux, config_filename, NULL)) { error("invalid config file %s", config_filename); free(store.key); - if (store.value_regex != NULL) { + if (store.value_regex != NULL && + store.value_regex != CONFIG_REGEX_NONE) { regfree(store.value_regex); free(store.value_regex); } @@ -1624,7 +1634,8 @@ } free(store.key); - if (store.value_regex != NULL) { + if (store.value_regex != NULL && + store.value_regex != CONFIG_REGEX_NONE) { regfree(store.value_regex); free(store.value_regex); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/configure new/git-2.1.2/configure --- old/git-2.1.1/configure 2014-09-19 23:45:28.000000000 +0200 +++ new/git-2.1.2/configure 2014-09-30 21:00:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for git 2.1.1. +# Generated by GNU Autoconf 2.69 for git 2.1.2. # # Report bugs to <git(a)vger.kernel.org>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='git' PACKAGE_TARNAME='git' -PACKAGE_VERSION='2.1.1' -PACKAGE_STRING='git 2.1.1' +PACKAGE_VERSION='2.1.2' +PACKAGE_STRING='git 2.1.2' PACKAGE_BUGREPORT='git(a)vger.kernel.org' PACKAGE_URL='' @@ -1251,7 +1251,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures git 2.1.1 to adapt to many kinds of systems. +\`configure' configures git 2.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1312,7 +1312,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of git 2.1.1:";; + short | recursive ) echo "Configuration of git 2.1.2:";; esac cat <<\_ACEOF @@ -1451,7 +1451,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -git configure 2.1.1 +git configure 2.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1931,7 +1931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by git $as_me 2.1.1, which was +It was created by git $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7734,7 +7734,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by git $as_me 2.1.1, which was +This file was extended by git $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7791,7 +7791,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -git config.status 2.1.1 +git config.status 2.1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/fast-import.c new/git-2.1.2/fast-import.c --- old/git-2.1.1/fast-import.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/fast-import.c 2014-09-30 21:00:40.000000000 +0200 @@ -1422,7 +1422,7 @@ static void store_tree(struct tree_entry *root) { - struct tree_content *t = root->tree; + struct tree_content *t; unsigned int i, j, del; struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 }; struct object_entry *le = NULL; @@ -1430,6 +1430,10 @@ if (!is_null_sha1(root->versions[1].sha1)) return; + if (!root->tree) + load_tree(root); + t = root->tree; + for (i = 0; i < t->entry_count; i++) { if (t->entries[i]->tree) store_tree(t->entries[i]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/git.spec new/git-2.1.2/git.spec --- old/git-2.1.1/git.spec 2014-09-19 23:45:28.000000000 +0200 +++ new/git-2.1.2/git.spec 2014-09-30 21:00:41.000000000 +0200 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Summary: Core git tools License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/po/TEAMS new/git-2.1.2/po/TEAMS --- old/git-2.1.1/po/TEAMS 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/po/TEAMS 2014-09-30 21:00:40.000000000 +0200 @@ -17,6 +17,7 @@ Christian Stimming <stimming(a)tuhh.de> Phillip Szelat <phillip.szelat(a)gmail.com> Matthias Rüster <matthias.ruester(a)gmail.com> + Magnus Görlitz <magnus.goerlitz(a)googlemail.com> Language: fr (French) Repository: https://github.com/jnavila/git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/po/de.po new/git-2.1.2/po/de.po --- old/git-2.1.1/po/de.po 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/po/de.po 2014-09-30 21:00:40.000000000 +0200 @@ -29,7 +29,7 @@ "'git commit -a'." msgstr "" "Korrigieren Sie dies im Arbeitsverzeichnis, und benutzen Sie\n" -"dann 'git add/rm <Datei>' um die Auflösung entsprechend zu markieren\n" +"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen, oder benutzen Sie 'git commit -a'." #: archive.c:10 @@ -619,7 +619,7 @@ #: merge-recursive.c:703 #, c-format msgid "Removing %s to make room for subdirectory\n" -msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n" +msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" #: merge-recursive.c:717 merge-recursive.c:738 msgid ": perhaps a D/F conflict?" @@ -1037,7 +1037,7 @@ #: remote.c:1960 msgid " (use \"git push\" to publish your local commits)\n" -msgstr " (benutzen Sie \"git push\" um lokale Commits zu publizieren)\n" +msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" #: remote.c:1963 #, c-format @@ -1052,7 +1052,7 @@ #: remote.c:1971 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -" (benutzen Sie \"git pull\" um Ihren lokalen Branch zu aktualisieren)\n" +" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" #: remote.c:1974 #, c-format @@ -1072,7 +1072,7 @@ #: remote.c:1984 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -" (benutzen Sie \"git pull\" um Ihren Branch mit dem Remote-Branch " +" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" #: run-command.c:80 @@ -1136,7 +1136,7 @@ #: sequencer.c:233 msgid "Commit your changes or stash them to proceed." msgstr "" -"Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\" um fortzufahren." +"Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\", um fortzufahren." #: sequencer.c:250 msgid "Failed to lock HEAD during fast_forward_to" @@ -1488,18 +1488,18 @@ #: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" #: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung entsprechend zu " +" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu " "markieren)" #: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" #: wt-status.c:198 msgid "Changes to be committed:" @@ -1512,20 +1512,20 @@ #: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -" (benutzen Sie \"git add <Datei>...\" um die Änderungen zum Commit " +" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" #: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (benutzen Sie \"git add/rm <Datei>...\" um die Änderungen zum Commit " +" (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" #: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -" (benutzen Sie \"git checkout -- <Datei>...\" um die Änderungen im " +" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" #: wt-status.c:225 @@ -1538,7 +1538,7 @@ #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -" (benutzen Sie \"git %s <Datei>...\" um die Änderungen zum Commit " +" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" #: wt-status.c:252 @@ -1653,7 +1653,7 @@ #: wt-status.c:945 msgid " (use \"git commit\" to conclude merge)" -msgstr " (benutzen Sie \"git commit\" um den Merge abzuschließen)" +msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" #: wt-status.c:955 msgid "You are in the middle of an am session." @@ -1670,12 +1670,12 @@ #: wt-status.c:964 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (benutzen Sie \"git am --skip\" um diesen Patch auszulassen)" +msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" #: wt-status.c:966 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -" (benutzen Sie \"git am --abort\" um den ursprünglichen Branch " +" (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" #: wt-status.c:1026 wt-status.c:1043 @@ -1695,12 +1695,12 @@ #: wt-status.c:1036 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (benutzen Sie \"git rebase --skip\" um diesen Patch auszulassen)" +msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" #: wt-status.c:1038 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -" (benutzen Sie \"git rebase --abort\" um den ursprünglichen Branch " +" (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" #: wt-status.c:1051 @@ -1739,7 +1739,7 @@ #: wt-status.c:1075 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -" (benutzen Sie \"git commit --amend\" um den aktuellen Commit nachzubessern)" +" (benutzen Sie \"git commit --amend\", um den aktuellen Commit nachzubessern)" #: wt-status.c:1077 msgid "" @@ -1767,7 +1767,7 @@ #: wt-status.c:1097 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (benutzen Sie \"git cherry-pick --abort\" um die Cherry-Pick-Operation " +" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" #: wt-status.c:1106 @@ -1788,7 +1788,7 @@ #: wt-status.c:1116 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -" (benutzen Sie \"git revert --abort\" um die Revert-Operation abzubrechen)" +" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" #: wt-status.c:1127 #, c-format @@ -1802,7 +1802,7 @@ #: wt-status.c:1134 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -" (benutzen Sie \"git bisect reset\" um zum ursprünglichen Branch " +" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" #: wt-status.c:1309 @@ -1855,7 +1855,7 @@ #: wt-status.c:1373 msgid " (use -u option to show untracked files)" -msgstr " (benutzen Sie die Option -u um unbeobachteten Dateien anzuzeigen)" +msgstr " (benutzen Sie die Option -u, um unbeobachteten Dateien anzuzeigen)" #: wt-status.c:1379 msgid "No changes" @@ -2235,7 +2235,7 @@ #: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Kontext reduziert zu (%ld/%ld) um Patch-Bereich bei %d anzuwenden" +msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" #: builtin/apply.c:2824 #, c-format @@ -2691,7 +2691,7 @@ #: builtin/blame.c:2514 msgid "Show author email instead of name (Default: off)" -msgstr "Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)" +msgstr "Zeigt anstatt des Namens die E-Mail-Adresse des Autors (Standard: aus)" #: builtin/blame.c:2515 msgid "Ignore whitespace differences" @@ -3085,7 +3085,7 @@ #: builtin/branch.c:952 msgid "too many branches to set new upstream" -msgstr "zu viele Branches angegeben um Upstream-Branch zu setzen" +msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen" #: builtin/branch.c:956 #, c-format @@ -3108,7 +3108,7 @@ #: builtin/branch.c:975 msgid "too many branches to unset upstream" msgstr "" -"zu viele Branches angegeben um Konfiguration zu Upstream-Branch zu entfernen" +"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen" #: builtin/branch.c:979 msgid "could not unset upstream of HEAD when it does not point to any branch." @@ -5071,7 +5071,7 @@ #: builtin/fast-export.c:718 msgid "Use the done feature to terminate the stream" -msgstr "Benutzt die \"done\"-Funktion um den Strom abzuschließen" +msgstr "Benutzt die \"done\"-Funktion, um den Strom abzuschließen" #: builtin/fast-export.c:719 msgid "Skip output of blob data" @@ -5268,7 +5268,7 @@ " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" -"'git remote prune %s' um jeden älteren, widersprüchlichen Branch zu löschen." +"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." #: builtin/fetch.c:759 #, c-format @@ -6535,7 +6535,7 @@ #: builtin/log.c:1217 msgid "Messaging" -msgstr "Email-Einstellungen" +msgstr "E-Mail-Einstellungen" #: builtin/log.c:1218 msgid "header" @@ -6543,11 +6543,11 @@ #: builtin/log.c:1219 msgid "add email header" -msgstr "fügt Email-Header hinzu" +msgstr "fügt E-Mail-Header hinzu" #: builtin/log.c:1220 builtin/log.c:1222 msgid "email" -msgstr "Email" +msgstr "E-Mail" #: builtin/log.c:1220 msgid "add To: header" @@ -6573,7 +6573,7 @@ #: builtin/log.c:1228 msgid "make first mail a reply to <message-id>" -msgstr "macht aus erster Email eine Antwort zu <message-id>" +msgstr "macht aus erster E-Mail eine Antwort zu <message-id>" #: builtin/log.c:1229 builtin/log.c:1232 msgid "boundary" @@ -6978,7 +6978,7 @@ #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -"Merge wurde nicht committet; benutzen Sie 'git commit' um den Merge " +"Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" #: builtin/merge.c:809 @@ -6990,7 +6990,7 @@ "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Bitte geben Sie eine Commit-Beschreibung ein um zu erklären, warum dieser\n" +"Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n" "Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n" "Upstream-Branch mit einem Thema-Branch zusammenführt.\n" "\n" @@ -7156,7 +7156,7 @@ #: builtin/merge.c:1539 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "Benutzen Sie \"%s\" um die Auflösung per Hand vorzubereiten.\n" +msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" #: builtin/merge.c:1551 #, c-format @@ -7299,7 +7299,7 @@ msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " "benutzen\n" -"Sie \"stash\" um fortzufahren." +"Sie \"stash\", um fortzufahren." #: builtin/mv.c:156 #, c-format @@ -7368,7 +7368,7 @@ #: builtin/name-rev.c:310 msgid "only use tags to name the commits" -msgstr "verwendet nur Tags um die Commits zu benennen" +msgstr "verwendet nur Tags, um die Commits zu benennen" #: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" @@ -7621,7 +7621,7 @@ "existing notes" msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " -"gefunden. Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." +"gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." #: builtin/notes.c:460 builtin/notes.c:537 #, c-format @@ -7649,7 +7649,7 @@ "existing notes" msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " -"Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." +"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." #: builtin/notes.c:543 #, c-format @@ -9359,7 +9359,7 @@ "(use -f to force removal)" msgstr "" "\n" -"(benutzen Sie -f um die Löschung zu erzwingen)" +"(benutzen Sie -f, um die Löschung zu erzwingen)" #: builtin/rm.c:240 msgid "the following file has changes staged in the index:" @@ -9373,7 +9373,7 @@ "(use --cached to keep the file, or -f to force removal)" msgstr "" "\n" -"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung " +"(benutzen Sie --cached, um die Datei zu behalten, oder -f, um die Entfernung " "zu erzwingen)" #: builtin/rm.c:252 @@ -9431,7 +9431,7 @@ #: builtin/shortlog.c:234 msgid "Show the email address of each author" -msgstr "Zeigt die Email-Adresse von jedem Autor" +msgstr "Zeigt die E-Mail-Adresse von jedem Autor" #: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" @@ -9751,7 +9751,7 @@ #: builtin/tag.c:605 msgid "use another key to sign the tag" -msgstr "verwendet einen anderen Schlüssel um das Tag zu signieren" +msgstr "verwendet einen anderen Schlüssel, um das Tag zu signieren" #: builtin/tag.c:606 msgid "replace the tag if exists" @@ -10046,7 +10046,7 @@ msgstr "" "'git help -a' und 'git help -g' listet verfügbare Unterkommandos und\n" "einige Anleitungen zu Git-Konzepten auf. Benutzen Sie 'git help <Kommando>'\n" -"oder 'git help <Konzept>' um mehr über ein spezifisches Kommando oder\n" +"oder 'git help <Konzept>', um mehr über ein spezifisches Kommando oder\n" "Konzept zu erfahren." #: parse-options.h:143 @@ -10200,7 +10200,7 @@ #: git-am.sh:141 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " "nachzustellen" #: git-am.sh:156 @@ -10257,7 +10257,7 @@ "Use \"git am --abort\" to remove it." msgstr "" "Stray $dotest Verzeichnis gefunden.\n" -"Benutzen Sie \"git am --abort\" um es zu entfernen." +"Benutzen Sie \"git am --abort\", um es zu entfernen." #: git-am.sh:535 msgid "Resolve operation not in progress, we are not resuming." @@ -10284,7 +10284,7 @@ #: git-am.sh:732 msgid "Patch does not have a valid e-mail address." -msgstr "Patch enthält keine gültige Email-Adresse." +msgstr "Patch enthält keine gültige E-Mail-Adresse." #: git-am.sh:779 msgid "cannot be interactive without stdin connected to a terminal." @@ -10515,7 +10515,7 @@ msgstr "" "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben.\n" "Bitte korrigieren Sie dies im Arbeitsverzeichnis und benutzen Sie dann \n" -"'git add/rm <Datei>' um die Auflösung entsprechend zu markieren, oder\n" +"'git add/rm <Datei>', um die Auflösung entsprechend zu markieren, oder\n" "benutzen Sie 'git commit -a'." #: git-pull.sh:25 @@ -11014,7 +11014,7 @@ "discard them" msgstr "" "Arbeitsverzeichnis von Submodul in '$displaypath' enthält lokale Änderungen; " -"verwenden Sie '-f' um diese zu verwerfen" +"verwenden Sie '-f', um diese zu verwerfen" #: git-submodule.sh:701 #, sh-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/reachable.c new/git-2.1.2/reachable.c --- old/git-2.1.1/reachable.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/reachable.c 2014-09-30 21:00:40.000000000 +0200 @@ -229,6 +229,9 @@ /* Add all external refs */ for_each_ref(add_one_ref, revs); + /* detached HEAD is not included in the list above */ + head_ref(add_one_ref, revs); + /* Add all reflog info */ if (mark_reflog) for_each_reflog(add_one_reflog, revs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/remote-curl.c new/git-2.1.2/remote-curl.c --- old/git-2.1.1/remote-curl.c 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/remote-curl.c 2014-09-30 21:00:40.000000000 +0200 @@ -863,6 +863,7 @@ int i, err; struct argv_array args; struct string_list_item *cas_option; + struct strbuf preamble = STRBUF_INIT; argv_array_init(&args); argv_array_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status", @@ -880,17 +881,22 @@ for_each_string_list_item(cas_option, &cas_options) argv_array_push(&args, cas_option->string); argv_array_push(&args, url.buf); + + argv_array_push(&args, "--stdin"); for (i = 0; i < nr_spec; i++) - argv_array_push(&args, specs[i]); + packet_buf_write(&preamble, "%s\n", specs[i]); + packet_buf_flush(&preamble); memset(&rpc, 0, sizeof(rpc)); rpc.service_name = "git-receive-pack", rpc.argv = args.argv; + rpc.stdin_preamble = &preamble; err = rpc_service(&rpc, heads); if (rpc.result.len) write_or_die(1, rpc.result.buf, rpc.result.len); strbuf_release(&rpc.result); + strbuf_release(&preamble); argv_array_clear(&args); return err; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t1303-wacky-config.sh new/git-2.1.2/t/t1303-wacky-config.sh --- old/git-2.1.1/t/t1303-wacky-config.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t1303-wacky-config.sh 2014-09-30 21:00:40.000000000 +0200 @@ -111,4 +111,24 @@ test_must_fail git config section.key ' +test_expect_success '--add appends new value after existing empty value' ' + cat >expect <<-\EOF && + + + fool + roll + EOF + cp .git/config .git/config.old && + test_when_finished "mv .git/config.old .git/config" && + cat >.git/config <<-\EOF && + [foo] + baz + baz = + baz = fool + EOF + git config --add foo.baz roll && + git config --get-all foo.baz >output && + test_cmp expect output +' + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t1450-fsck.sh new/git-2.1.2/t/t1450-fsck.sh --- old/git-2.1.1/t/t1450-fsck.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t1450-fsck.sh 2014-09-30 21:00:40.000000000 +0200 @@ -69,7 +69,7 @@ git update-ref refs/heads/bogus $cmt && test_when_finished "git update-ref -d refs/heads/bogus" && - test_might_fail git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "$sha.*corrupt" out ' @@ -101,7 +101,7 @@ test_when_finished "remove_object $new" && git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && - git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "error in commit $new" out ' @@ -113,7 +113,7 @@ test_when_finished "remove_object $new" && git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && - git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "error in commit $new.* - bad name" out ' @@ -125,7 +125,7 @@ test_when_finished "remove_object $new" && git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && - git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "error in commit $new.* - missing email" out ' @@ -137,7 +137,7 @@ test_when_finished "remove_object $new" && git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && - git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "error in commit $new" out ' @@ -151,11 +151,31 @@ test_when_finished "remove_object $new" && git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && - git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "error in commit $new.*integer overflow" out ' +test_expect_success 'malformatted tree object' ' + test_when_finished "git update-ref -d refs/tags/wrong" && + test_when_finished "remove_object \$T" && + T=$( + GIT_INDEX_FILE=test-index && + export GIT_INDEX_FILE && + rm -f test-index && + >x && + git add x && + T=$(git write-tree) && + ( + git cat-file tree $T && + git cat-file tree $T + ) | + git hash-object -w -t tree --stdin + ) && + test_must_fail git fsck 2>out && + grep "error in tree .*contains duplicate file entries" out +' + test_expect_success 'tag pointing to nonexistent' ' cat >invalid-tag <<-\EOF && object ffffffffffffffffffffffffffffffffffffffff @@ -282,4 +302,60 @@ ) ' +# create a static test repo which is broken by omitting +# one particular object ($1, which is looked up via rev-parse +# in the new repository). +create_repo_missing () { + rm -rf missing && + git init missing && + ( + cd missing && + git commit -m one --allow-empty && + mkdir subdir && + echo content >subdir/file && + git add subdir/file && + git commit -m two && + unrelated=$(echo unrelated | git hash-object --stdin -w) && + git tag -m foo tag $unrelated && + sha1=$(git rev-parse --verify "$1") && + path=$(echo $sha1 | sed 's|..|&/|') && + rm .git/objects/$path + ) +} + +test_expect_success 'fsck notices missing blob' ' + create_repo_missing HEAD:subdir/file && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices missing subtree' ' + create_repo_missing HEAD:subdir && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices missing root tree' ' + create_repo_missing HEAD^{tree} && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices missing parent' ' + create_repo_missing HEAD^ && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices missing tagged object' ' + create_repo_missing tag^{blob} && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices ref pointing to missing commit' ' + create_repo_missing HEAD && + test_must_fail git -C missing fsck +' + +test_expect_success 'fsck notices ref pointing to missing tag' ' + create_repo_missing tag && + test_must_fail git -C missing fsck +' + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t4212-log-corrupt.sh new/git-2.1.2/t/t4212-log-corrupt.sh --- old/git-2.1.1/t/t4212-log-corrupt.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t4212-log-corrupt.sh 2014-09-30 21:00:40.000000000 +0200 @@ -14,7 +14,7 @@ ' test_expect_success 'fsck notices broken commit' ' - git fsck 2>actual && + test_must_fail git fsck 2>actual && test_i18ngrep invalid.author actual ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t5304-prune.sh new/git-2.1.2/t/t5304-prune.sh --- old/git-2.1.1/t/t5304-prune.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t5304-prune.sh 2014-09-30 21:00:40.000000000 +0200 @@ -104,6 +104,28 @@ ' +test_expect_success 'prune: do not prune detached HEAD with no reflog' ' + + git checkout --detach --quiet && + git commit --allow-empty -m "detached commit" && + # verify that there is no reflogs + # (should be removed and disabled by previous test) + test ! -e .git/logs && + git prune -n >prune_actual && + : >prune_expected && + test_cmp prune_actual prune_expected + +' + +test_expect_success 'prune: prune former HEAD after checking out branch' ' + + head_sha1=$(git rev-parse HEAD) && + git checkout --quiet master && + git prune -v >prune_actual && + grep "$head_sha1" prune_actual + +' + test_expect_success 'prune: do not prune heads listed as an argument' ' : > file2 && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t5408-send-pack-stdin.sh new/git-2.1.2/t/t5408-send-pack-stdin.sh --- old/git-2.1.1/t/t5408-send-pack-stdin.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/git-2.1.2/t/t5408-send-pack-stdin.sh 2014-09-30 21:00:40.000000000 +0200 @@ -0,0 +1,92 @@ +#!/bin/sh + +test_description='send-pack --stdin tests' +. ./test-lib.sh + +create_ref () { + tree=$(git write-tree) && + test_tick && + commit=$(echo "$1" | git commit-tree $tree) && + git update-ref "$1" $commit +} + +clear_remote () { + rm -rf remote.git && + git init --bare remote.git +} + +verify_push () { + git rev-parse "$1" >expect && + git --git-dir=remote.git rev-parse "${2:-$1}" >actual && + test_cmp expect actual +} + +test_expect_success 'setup refs' ' + cat >refs <<-\EOF && + refs/heads/A + refs/heads/C + refs/tags/D + refs/heads/B + refs/tags/E + EOF + for i in $(cat refs); do + create_ref $i || return 1 + done +' + +# sanity check our setup +test_expect_success 'refs on cmdline' ' + clear_remote && + git send-pack remote.git $(cat refs) && + for i in $(cat refs); do + verify_push $i || return 1 + done +' + +test_expect_success 'refs over stdin' ' + clear_remote && + git send-pack remote.git --stdin <refs && + for i in $(cat refs); do + verify_push $i || return 1 + done +' + +test_expect_success 'stdin lines are full refspecs' ' + clear_remote && + echo "A:other" >input && + git send-pack remote.git --stdin <input && + verify_push refs/heads/A refs/heads/other +' + +test_expect_success 'stdin mixed with cmdline' ' + clear_remote && + echo A >input && + git send-pack remote.git --stdin B <input && + verify_push A && + verify_push B +' + +test_expect_success 'cmdline refs written in order' ' + clear_remote && + test_must_fail git send-pack remote.git A:foo B:foo && + verify_push A foo +' + +test_expect_success '--stdin refs come after cmdline' ' + clear_remote && + echo A:foo >input && + test_must_fail git send-pack remote.git --stdin B:foo <input && + verify_push B foo +' + +test_expect_success 'refspecs and --mirror do not mix (cmdline)' ' + clear_remote && + test_must_fail git send-pack remote.git --mirror $(cat refs) +' + +test_expect_success 'refspecs and --mirror do not mix (stdin)' ' + clear_remote && + test_must_fail git send-pack remote.git --mirror --stdin <refs +' + +test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t5541-http-push-smart.sh new/git-2.1.2/t/t5541-http-push-smart.sh --- old/git-2.1.1/t/t5541-http-push-smart.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t5541-http-push-smart.sh 2014-09-30 21:00:40.000000000 +0200 @@ -323,5 +323,20 @@ test_cmp expect actual ' +run_with_limited_cmdline () { + (ulimit -s 128 && "$@") +} + +test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true' + +test_expect_success CMDLINE_LIMIT 'push 2000 tags over http' ' + sha1=$(git rev-parse HEAD) && + test_seq 2000 | + sort | + sed "s|.*|$sha1 refs/tags/really-long-tag-name-&|" \ + >.git/packed-refs && + run_with_limited_cmdline git push --mirror +' + stop_httpd test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/t/t9300-fast-import.sh new/git-2.1.2/t/t9300-fast-import.sh --- old/git-2.1.1/t/t9300-fast-import.sh 2014-09-19 23:45:27.000000000 +0200 +++ new/git-2.1.2/t/t9300-fast-import.sh 2014-09-30 21:00:40.000000000 +0200 @@ -3017,4 +3017,108 @@ git rev-parse --verify refs/heads/not-to-delete ' +### +### series U (filedelete) +### + +cat >input <<INPUT_END +commit refs/heads/U +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +test setup +COMMIT +M 100644 inline hello.c +data <<BLOB +blob 1 +BLOB +M 100644 inline good/night.txt +data <<BLOB +sleep well +BLOB +M 100644 inline good/bye.txt +data <<BLOB +au revoir +BLOB + +INPUT_END + +test_expect_success 'U: initialize for U tests' ' + git fast-import <input +' + +cat >input <<INPUT_END +commit refs/heads/U +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +delete good/night.txt +COMMIT +from refs/heads/U^0 +D good/night.txt + +INPUT_END + +test_expect_success 'U: filedelete file succeeds' ' + git fast-import <input +' + +cat >expect <<EOF +:100644 000000 2907ebb4bf85d91bf0716bb3bd8a68ef48d6da76 0000000000000000000000000000000000000000 D good/night.txt +EOF + +git diff-tree -M -r U^1 U >actual + +test_expect_success 'U: validate file delete result' ' + compare_diff_raw expect actual +' + +cat >input <<INPUT_END +commit refs/heads/U +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +delete good dir +COMMIT +from refs/heads/U^0 +D good + +INPUT_END + +test_expect_success 'U: filedelete directory succeeds' ' + git fast-import <input +' + +cat >expect <<EOF +:100644 000000 69cb75792f55123d8389c156b0b41c2ff00ed507 0000000000000000000000000000000000000000 D good/bye.txt +EOF + +git diff-tree -M -r U^1 U >actual + +test_expect_success 'U: validate directory delete result' ' + compare_diff_raw expect actual +' + +cat >input <<INPUT_END +commit refs/heads/U +committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE +data <<COMMIT +must succeed +COMMIT +from refs/heads/U^0 +D "" + +INPUT_END + +test_expect_success 'U: filedelete root succeeds' ' + git fast-import <input +' + +cat >expect <<EOF +:100644 000000 c18147dc648481eeb65dc5e66628429a64843327 0000000000000000000000000000000000000000 D hello.c +EOF + +git diff-tree -M -r U^1 U >actual + +test_expect_success 'U: validate root delete result' ' + compare_diff_raw expect actual +' + test_done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-2.1.1/version new/git-2.1.2/version --- old/git-2.1.1/version 2014-09-19 23:45:28.000000000 +0200 +++ new/git-2.1.2/version 2014-09-30 21:00:41.000000000 +0200 @@ -1 +1 @@ -2.1.1 +2.1.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ldb for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package ldb for openSUSE:Factory checked in at 2014-10-05 20:28:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldb (Old) and /work/SRC/openSUSE:Factory/.ldb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ldb" Changes: -------- --- /work/SRC/openSUSE:Factory/ldb/ldb.changes 2014-05-26 14:40:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ldb.new/ldb.changes 2014-10-05 20:28:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 23 18:10:04 UTC 2014 - lmuelle(a)suse.com + +- BuildRequire docbook-xsl-stylesheets and libxslt to process the man pages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldb.spec ++++++ --- /var/tmp/diff_new_pack.yocQWX/_old 2014-10-05 20:28:12.000000000 +0200 +++ /var/tmp/diff_new_pack.yocQWX/_new 2014-10-05 20:28:12.000000000 +0200 @@ -23,6 +23,7 @@ %define tevent_version 0.9.17 Name: ldb +BuildRequires: docbook-xsl-stylesheets %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline %endif @@ -30,6 +31,7 @@ BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} +BuildRequires: libxslt BuildRequires: popt-devel BuildRequires: pytalloc-devel >= %{talloc_version} BuildRequires: python-devel @@ -196,6 +198,13 @@ %{_bindir}/ldbmodify %{_bindir}/ldbrename %{_bindir}/ldbsearch +%{_mandir}/man1/ldbadd.1.gz +%{_mandir}/man1/ldbdel.1.gz +%{_mandir}/man1/ldbedit.1.gz +%{_mandir}/man1/ldbmodify.1.gz +%{_mandir}/man1/ldbrename.1.gz +%{_mandir}/man1/ldbsearch.1.gz +%{_mandir}/man3/ldb.3.gz %files -n pyldb %defattr(-,root,root,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2014-10-05 20:28:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk3" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2014-09-30 19:38:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk3.new/gtk3.changes 2014-10-05 20:28:10.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 30 09:25:11 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 3.14.1: + + Bugs fixed: bgo#635258, bgo#654051, bgo#708206, bgo#719936, + bgo#729782, bgo#734879, bgo#735054, bgo#735338, bgo#735749, + bgo#736193, bgo#736338, bgo#736557, bgo#736702, bgo#736830, + bgo#736971, bgo#737251, bgo#737297, bgo#737363, bgo#737386, + bgo#737439, bgo#737517. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gtk+-3.14.0.tar.xz New: ---- gtk+-3.14.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.gxmu8F/_old 2014-10-05 20:28:11.000000000 +0200 +++ /var/tmp/diff_new_pack.gxmu8F/_new 2014-10-05 20:28:11.000000000 +0200 @@ -25,7 +25,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.14.0 +Version: 3.14.1 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ ++++++ gtk+-3.14.0.tar.xz -> gtk+-3.14.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/gtk3/gtk+-3.14.0.tar.xz /work/SRC/openSUSE:Factory/.gtk3.new/gtk+-3.14.1.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0