openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2015
- 1 participants
- 1239 discussions
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked in at 2015-06-01 09:53:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave"
Changes:
--------
--- /work/SRC/openSUSE:Factory/octave/octave.changes 2015-02-24 13:07:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-06-01 09:53:22.000000000 +0200
@@ -1,0 +2,12 @@
+Fri May 29 22:08:34 UTC 2015 - dmitry_r(a)opensuse.org
+
+- Update to version 4.0.0
+ * See icluded NEWS file for details
+- Drop obsolete patches:
+ * octave-3.8.0-llvm-3.4.patch
+ * octave-suitesparse-4.4.patch
+ * octave-unzip-info-in-gui.patch
+- Add RPM macros to octave-devel package
+ * octave.macros
+
+-------------------------------------------------------------------
Old:
----
octave-3.8.0-llvm-3.4.patch
octave-3.8.2.tar.bz2
octave-suitesparse-4.4.patch
octave-unzip-info-in-gui.patch
New:
----
octave-4.0.0.tar.xz
octave.macros
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave.spec ++++++
--- /var/tmp/diff_new_pack.XUoMIB/_old 2015-06-01 09:53:24.000000000 +0200
+++ /var/tmp/diff_new_pack.XUoMIB/_new 2015-06-01 09:53:24.000000000 +0200
@@ -27,6 +27,8 @@
# Image processing library
# Default variant - GraphicsMagick
%define with_imagemagick 0
+# Sound IO
+%define with_sound 1
# SLE11
%if 0%{?suse_version} == 1110
@@ -43,21 +45,18 @@
%endif
Name: octave
-Version: 3.8.2
+Version: 4.0.0
Release: 0
+# Required for RC builds, in this case version contains ~rc, src_ver -rc
+%define src_ver %{version}
Summary: A High Level Programming Language
License: GPL-3.0+
Group: Productivity/Scientific/Math
-%define apiver v49+
+%define apiver v50+
Url: http://www.octave.org/
-Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2: octave.pc.in
-# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch -- https://savannah.gnu.org/bugs/?41061
-Patch1: octave-3.8.0-llvm-3.4.patch
-# PATCH-FIX-UPSTREAM octave-suitesparse-4.4.patch -- http://savannah.gnu.org/bugs/?43063
-Patch2: octave-suitesparse-4.4.patch
-# PATCH-FIX-UPSTREAM octave-unzip-info-in-gui.patch
-Patch3: octave-unzip-info-in-gui.patch
+Source3: octave.macros
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -73,9 +72,6 @@
BuildRequires: gnuplot
BuildRequires: gperf
BuildRequires: hdf5-devel
-%if 0%{?with_java}
-BuildRequires: java-devel
-%endif
BuildRequires: lapack-devel
%if 0%{?with_imagemagick}
BuildRequires: libMagick++-devel
@@ -84,13 +80,6 @@
%endif
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
-%if 0%{?with_gui}
-BuildRequires: libqscintilla-devel
-BuildRequires: libqt4-devel
-%endif
-%if 0%{?with_jit}
-BuildRequires: llvm-devel
-%endif
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -103,12 +92,32 @@
BuildRequires: texlive-dvips
%endif
BuildRequires: texlive-latex
-BuildRequires: xorg-x11-libSM-devel
-BuildRequires: xorg-x11-libX11-devel
-BuildRequires: xorg-x11-libXext-devel
+BuildRequires: xz
BuildRequires: zlib-devel
+# GUI build requires
+%if 0%{?with_gui}
+BuildRequires: desktop-file-utils
+BuildRequires: hicolor-icon-theme
+BuildRequires: libqt4-devel
+BuildRequires: qscintilla-devel
+Obsoletes: octave-gui < 4.0
+%endif
+# Sound IO build requires
+%if 0%{?with_sound}
+BuildRequires: alsa-devel
+BuildRequires: libsndfile-devel
+BuildRequires: portaudio-devel
+%endif
+# JAVA functions build requires
+%if 0%{?with_java}
+BuildRequires: java-devel
+%endif
+# JIT build requires
+%if 0%{?with_jit}
+BuildRequires: llvm-devel
+%endif
+# Native graphics build requires
%if 0%{?with_native_graphics}
-# for native graphics
%if 0%{?suse_version} > 1220
BuildRequires: glu-devel
%endif
@@ -116,45 +125,55 @@
BuildRequires: fltk-devel
BuildRequires: fontconfig-devel
BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-libSM-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXext-devel
%else
Requires: gnuplot
%endif
-Requires: makeinfo
-Recommends: blas-devel
-Recommends: fftw3-devel
-Recommends: fftw3-threads-devel
-Recommends: gcc
-Recommends: gcc-fortran
-Recommends: hdf5-devel
-Recommends: make
-Recommends: octave-devel = %{version}
-Recommends: octave-doc = %{version}
-%if 0%{?with_gui}
-Recommends: octave-gui = %{version}
-%endif
+# Tests build requires
+BuildRequires: unzip
+BuildRequires: zip
+Requires: octave-cli = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Octave is a high level programming language. It is designed for the
solution of numeric problems. There is a command line interface
supplied.
-
%if 0%{?with_gui}
-%package gui
-Summary: Graphical user interface for Octave
+This package contains graphical user interface.
+%endif
+
+%package cli
+Summary: Command-line user interface for Octave
Group: Productivity/Scientific/Math
+Requires: makeinfo
+%if 0%{?with_native_graphics}
+Recommends: epstool
+Recommends: pstoedit
+Recommends: transfig
+%endif
+Recommends: octave-devel = %{version}
+Recommends: octave-doc = %{version}
-%description gui
+%description cli
Octave is a high level programming language. It is designed for the
solution of numeric problems.
-This package contains official graphical user interface.
-%endif
+This package contains command-line user interface.
%package devel
Summary: Development files for Octave
Group: Productivity/Scientific/Math
Requires: %{name} = %{version}
+Recommends: blas-devel
+Recommends: fftw3-devel
+Recommends: fftw3-threads-devel
+Recommends: gcc
+Recommends: gcc-fortran
+Recommends: hdf5-devel
+Recommends: make
%description devel
Octave is a high level programming language. It is designed for the
@@ -166,7 +185,6 @@
%package doc
Summary: Documentation for Octave
Group: Documentation/Other
-Requires: %{name} = %{version}
%if 0%{?suse_version} > 1110
BuildArch: noarch
%endif
@@ -178,19 +196,7 @@
This package contains documentation for Octave.
%prep
-%setup -q
-
-# check llvm version
-%if %{?with_jit} == 1
-%if %( echo `rpm -q --queryformat %%{version} llvm-devel`| tr -d '.' ) > 33
-%patch1 -p1
-%endif
-%endif
-# check suitesparse library version
-%if %( echo `rpm -q --queryformat %%{version} suitesparse-devel`| tr -d '.' ) > 421
-%patch2 -p1
-%endif
-%patch3
+%setup -q -n %{name}-%{src_ver}
%build
export CPPFLAGS="-DH5_USE_16_API"
@@ -215,15 +221,15 @@
# .pc file
cp %{SOURCE2} octave.pc
-sed -i 's:@VERSION@:%{version}:' octave.pc
+sed -i 's:@VERSION@:%{src_ver}:' octave.pc
sed -i 's:@LIB@:%{_lib}:' octave.pc
%install
%make_install
# see bnc#557340
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name}/%{version} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-rm %{buildroot}/%{_libdir}/%{name}/%{version}/*.la
+echo %{_libdir}/%{name}/%{src_ver} > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+rm %{buildroot}/%{_libdir}/%{name}/%{src_ver}/*.la
# local rc file into /etc
mkdir %{buildroot}/%{_sysconfdir}/%{name}
mv %{buildroot}/%{_datadir}/%{name}/site/m/startup/octaverc %{buildroot}/%{_sysconfdir}/%{name}
@@ -234,72 +240,93 @@
# .pc file
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
cp octave.pc %{buildroot}/%{_libdir}/pkgconfig
+# big icons size
+%if 0%{?suse_version} <= 1320
+rm -rf %{buildroot}/%{_datadir}/icons/hicolor/512x512/
+%endif
+# gui related fixes
+%if %{?with_gui}
+mv %{buildroot}/%{_datadir}/applications/*octave.desktop %{buildroot}/%{_datadir}/applications/octave.desktop
+%else
+rm -rf %{buildroot}/%{_datadir}/icons/hicolor/
+rm -rf %{buildroot}/%{_datadir}/appdata/
+%endif
+# rpm macros
+install -Dm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.octave
%check
make check
%post
/sbin/ldconfig
-%install_info --info-dir=%{_infodir} %{_infodir}/octave.info.gz
%postun
/sbin/ldconfig
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
-%if 0%{?with_gui}
-%post gui
+%post cli
/sbin/ldconfig
+%install_info --info-dir=%{_infodir} %{_infodir}/octave.info.gz
-%postun gui
+%postun cli
/sbin/ldconfig
-%endif
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS
%doc README ChangeLog
-%doc %{_infodir}/*.gz
-%doc %{_mandir}/man1/*.gz
%{_bindir}/octave
-%{_bindir}/octave-%{version}
+%{_bindir}/octave-%{src_ver}
+%{_mandir}/man1/octave.1.gz
+%if 0%{?with_gui}
+%{_libdir}/%{name}/%{src_ver}/exec/*-suse-linux-gnu*/octave-gui
+%{_libdir}/%{name}/%{src_ver}/liboctgui.so.*
+%{_datadir}/%{name}/%{src_ver}/locale/
+%{_datadir}/appdata/*.xml
+%{_datadir}/applications/*.desktop
+%if 0%{?suse_version} <= 1310
+%dir %{_datadir}/appdata
+%endif
+%{_datadir}/icons/hicolor/*/apps/octave.*
+%endif
+
+%files cli
+%defattr(-,root,root)
%{_bindir}/octave-cli
-%{_bindir}/octave-cli-%{version}
+%{_bindir}/octave-cli-%{src_ver}
+%{_mandir}/man1/octave-cli.1.gz
%{_bindir}/mkoctfile
-%{_bindir}/mkoctfile-%{version}
+%{_bindir}/mkoctfile-%{src_ver}
+%{_mandir}/man1/mkoctfile.1.gz
%{_bindir}/octave-config
-%{_bindir}/octave-config-%{version}
+%{_bindir}/octave-config-%{src_ver}
+%{_mandir}/man1/octave-config.1.gz
+%{_infodir}/*.gz
%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/octaverc
%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{version}
+%dir %{_libdir}/%{name}/%{src_ver}
%dir %{_libdir}/%{name}/packages
%dir %{_datadir}/%{name}/packages
%dir %{_sysconfdir}/%{name}
-%{_libdir}/%{name}/%{version}/oct
-%{_libdir}/%{name}/%{version}/liboctave.so.*
-%{_libdir}/%{name}/%{version}/liboctinterp.so.*
+%{_libdir}/%{name}/%{src_ver}/oct
+%{_libdir}/%{name}/%{src_ver}/liboctave.so.*
+%{_libdir}/%{name}/%{src_ver}/liboctinterp.so.*
%if 0%{?with_gui}
-%dir %{_libdir}/%{name}/%{version}/exec/
-%dir %{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu*/
-%exclude %{_datadir}/%{name}/%{version}/locale/
+%dir %{_libdir}/%{name}/%{src_ver}/exec/
+%dir %{_libdir}/%{name}/%{src_ver}/exec/*-suse-linux-gnu*/
+%exclude %{_datadir}/%{name}/%{src_ver}/locale/
%endif
%{_datadir}/octave/
%{_libdir}/%{name}/site
-%config(noreplace) %{_sysconfdir}/%{name}/octaverc
%{_libdir}/pkgconfig/octave.pc
-%if 0%{?with_gui}
-%files gui
-%defattr(-,root,root)
-%{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu*/octave-gui
-%{_libdir}/%{name}/%{version}/liboctgui.so.*
-%{_datadir}/%{name}/%{version}/locale/
-%endif
-
%files devel
%defattr(-,root,root)
%{_includedir}/*
-%{_libdir}/%{name}/%{version}/lib*.so
+%{_libdir}/%{name}/%{src_ver}/lib*.so
%{_libdir}/%{name}/api-%{apiver}
+%config %{_sysconfdir}/rpm/macros.octave
%files doc
%defattr(-,root,root)
++++++ octave.macros ++++++
#
# Macros for Octave
#
%octave \
%{_bindir}/octave --no-gui --no-window-system --norc --no-history --quiet
# Octave API
%octave_api \
%(octave-config -p API_VERSION || echo 0)
# Octave directories
%octpackages_dir %{_datadir}/octave/packages
%octlib_dir %{_libdir}/octave/packages
%octsysw_settings %{_datadir}/octave/site/m/startup/octaverc
# Octave package source preparation
%octave_pkg_src \
directory=`ls -d *` \
if [ "$directory" != "%{octpkg}-%{version}" ]; then \
mv $directory %{octpkg}-%{version} \
fi \
tar czf %{octpkg}-%{version}.tar.gz %{octpkg}-%{version}
# Octave package build
%octave_pkg_build \
%octave --eval "pkg build -nodeps -verbose . %{octpkg}-%{version}.tar.gz"
# Octave package installation
%octave_pkg_install \
mkdir -p %{buildroot}%{octpackages_dir} \
mkdir -p %{buildroot}%{octlib_dir} \
%octave --eval "pkg prefix %{buildroot}%{octpackages_dir} %{buildroot}%{octlib_dir}; pkg install -nodeps %{octpkg}-%{version}.tar.gz" \
rm -f %{buildroot}%{octpackages_dir}/%{octpkg}-%{version}/packinfo/.autoload
# Octave package tests
%octskiptests .*fetch.*|ga|csape|tbl(read|write)|princomp
%octave_pkg_test \
for fpath in $(find %{octpkg}-%{version} -name '*.m') ; do \
filename="${fpath##*/}" ; \
basename="${filename%.m}" ; \
if grep -q '^%\! *test' $fpath ; then \
if echo $basename | grep -q -v -E '^(%{octskiptests})$' ; then \
%octave --eval "test $basename" | ( grep test || : ) > test.log ; \
if grep -s 'test *failed' test.log ; then \
echo "Failed tests for %{octpkg}-%{version}" ; \
cat test.log ; \
false ; \
else \
grep -i test test.log || true \
true ; \
fi ; \
fi ; \
fi ; \
done
1
0
Hello community,
here is the log from the commit of package fcitx-table-extra for openSUSE:Factory checked in at 2015-06-01 09:53:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-table-extra (Old)
and /work/SRC/openSUSE:Factory/.fcitx-table-extra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-table-extra"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-table-extra/fcitx-table-extra.changes 2014-06-10 14:39:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx-table-extra.new/fcitx-table-extra.changes 2015-06-01 09:53:05.000000000 +0200
@@ -1,0 +2,6 @@
+Sat May 30 07:33:12 UTC 2015 - i(a)marguerite.su
+
+- update version 0.3.7
+ * just add an gpl3 license
+
+-------------------------------------------------------------------
Old:
----
fcitx-table-extra-0.3.6.tar.xz
New:
----
fcitx-table-extra-0.3.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx-table-extra.spec ++++++
--- /var/tmp/diff_new_pack.6xnzfr/_old 2015-06-01 09:53:06.000000000 +0200
+++ /var/tmp/diff_new_pack.6xnzfr/_new 2015-06-01 09:53:06.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx-table-extra
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: fcitx-table-extra
-Version: 0.3.6
+Version: 0.3.7
Release: 0
Summary: Extra table for Fcitx
License: GPL-2.0+
++++++ fcitx-table-extra-0.3.6.tar.xz -> fcitx-table-extra-0.3.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-table-extra-0.3.6/COPYING.GPL3 new/fcitx-table-extra-0.3.7/COPYING.GPL3
--- old/fcitx-table-extra-0.3.6/COPYING.GPL3 1970-01-01 01:00:00.000000000 +0100
+++ new/fcitx-table-extra-0.3.7/COPYING.GPL3 2014-09-18 02:25:16.000000000 +0200
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
1
0
Hello community,
here is the log from the commit of package fcitx-kkc for openSUSE:Factory checked in at 2015-06-01 09:52:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-kkc (Old)
and /work/SRC/openSUSE:Factory/.fcitx-kkc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-kkc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-kkc/fcitx-kkc.changes 2014-06-10 14:39:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx-kkc.new/fcitx-kkc.changes 2015-06-01 09:52:49.000000000 +0200
@@ -1,0 +2,6 @@
+Sat May 30 07:23:36 UTC 2015 - i(a)marguerite.su
+
+- update version 0.1.2
+ * add more skk dictionaries
+
+-------------------------------------------------------------------
Old:
----
fcitx-kkc-0.1.1.tar.xz
New:
----
fcitx-kkc-0.1.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx-kkc.spec ++++++
--- /var/tmp/diff_new_pack.RV5VaT/_old 2015-06-01 09:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.RV5VaT/_new 2015-06-01 09:52:49.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx-kkc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: fcitx-kkc
-Version: 0.1.1
+Version: 0.1.2
Release: 0
Summary: Japanese KKC IME Wrapper for Fcitx
License: GPL-3.0+
++++++ fcitx-kkc-0.1.1.tar.xz -> fcitx-kkc-0.1.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-kkc-0.1.1/CMakeLists.txt new/fcitx-kkc-0.1.2/CMakeLists.txt
--- old/fcitx-kkc-0.1.1/CMakeLists.txt 2014-05-16 03:59:59.000000000 +0200
+++ new/fcitx-kkc-0.1.2/CMakeLists.txt 2015-05-18 17:47:33.000000000 +0200
@@ -15,7 +15,7 @@
endif ()
if (NOT SKK_DEFAULT_PATH)
- set(SKK_DEFAULT_PATH "/usr/share/skk/SKK-JISYO.L")
+ set(SKK_DEFAULT_PATH "/usr/share/skk/")
endif ()
# This will add a uninstall target. Comment out this line if other cmake packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-kkc-0.1.1/po/ja.po new/fcitx-kkc-0.1.2/po/ja.po
--- old/fcitx-kkc-0.1.1/po/ja.po 2014-05-16 03:59:59.000000000 +0200
+++ new/fcitx-kkc-0.1.2/po/ja.po 2015-05-18 17:47:33.000000000 +0200
@@ -4,16 +4,17 @@
#
# Translators:
# しろう, 2013
-# しろう, 2013
+# WAKAYAMA Shirou <shirou.faw(a)gmail.com>, 2013
+# AWASHIRO Ikuya <ikunya(a)gmail.com>, 2014-2015
# Masaharu IWAI <iwaim.sub(a)gmail.com>, 2013
-# しろう, 2013
+# WAKAYAMA Shirou <shirou.faw(a)gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: fcitx\n"
"Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n"
-"POT-Creation-Date: 2013-11-07 18:02-0500\n"
-"PO-Revision-Date: 2013-11-07 22:59+0000\n"
-"Last-Translator: Masaharu IWAI <iwaim.sub(a)gmail.com>\n"
+"POT-Creation-Date: 2015-04-29 18:02+0200\n"
+"PO-Revision-Date: 2015-04-29 14:31+0000\n"
+"Last-Translator: AWASHIRO Ikuya <ikunya(a)gmail.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/fcitx/language/"
"ja/)\n"
"Language: ja\n"
@@ -44,7 +45,7 @@
#: gui/adddictdialog.cpp:35
msgid "&Type:"
-msgstr ""
+msgstr "形式(&T):"
#: src/fcitx-kkc.desc:47
msgid "Auto correct input sequence"
@@ -95,7 +96,7 @@
#: src/fcitx-kkc.desc:33
msgid "Global"
-msgstr "全体"
+msgstr "任せる"
#: gui/shortcutmodel.cpp:50 src/kkc.c:83 src/fcitx-kkc.desc:18
msgid "Half width Katakana"
@@ -139,7 +140,7 @@
#: gui/shortcutwidget.cpp:155
msgid "Key to add is conflict with existing shortcut."
-msgstr "追加したキーは存在するするショートカットキーと競合しています。"
+msgstr "追加したキーは存在するショートカットキーと競合しています。"
#: src/fcitx-kkc.conf.in:3
msgid "Kkc Addon of Fcitx"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-kkc-0.1.1/po/zh_TW.po new/fcitx-kkc-0.1.2/po/zh_TW.po
--- old/fcitx-kkc-0.1.1/po/zh_TW.po 2014-05-16 03:59:59.000000000 +0200
+++ new/fcitx-kkc-0.1.2/po/zh_TW.po 2015-05-18 17:47:33.000000000 +0200
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# BrLi <rainman59118(a)gmail.com>, 2014
# fhoshino <fh(a)pinchia.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: fcitx\n"
"Report-Msgid-Bugs-To: fcitx-dev(a)googlegroups.com\n"
-"POT-Creation-Date: 2014-04-10 07:02+0200\n"
-"PO-Revision-Date: 2014-04-10 04:43+0000\n"
-"Last-Translator: fhoshino <fh(a)pinchia.com>\n"
+"POT-Creation-Date: 2014-06-06 07:02+0200\n"
+"PO-Revision-Date: 2014-06-06 04:46+0000\n"
+"Last-Translator: BrLi <rainman59118(a)gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/fcitx/"
"language/zh_TW/)\n"
"Language: zh_TW\n"
@@ -41,7 +42,7 @@
#: gui/adddictdialog.cpp:35
msgid "&Type:"
-msgstr ""
+msgstr "&類型:"
#: src/fcitx-kkc.desc:47
msgid "Auto correct input sequence"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx-kkc-0.1.1/src/dictionary_list.in new/fcitx-kkc-0.1.2/src/dictionary_list.in
--- old/fcitx-kkc-0.1.1/src/dictionary_list.in 2014-05-16 03:59:59.000000000 +0200
+++ new/fcitx-kkc-0.1.2/src/dictionary_list.in 2015-05-18 17:47:33.000000000 +0200
@@ -1,2 +1,6 @@
-type=file,file=@SKK_DEFAULT_PATH@,mode=readonly
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.L,mode=readonly
type=file,file=$FCITX_CONFIG_DIR/kkc/dictionary,mode=readwrite
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.zipcode,mode=readonly
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.station,mode=readonly
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.jinmei,mode=readonly
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.geo,mode=readonly
1
0
Hello community,
here is the log from the commit of package fcitx-anthy for openSUSE:Factory checked in at 2015-06-01 09:52:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcitx-anthy (Old)
and /work/SRC/openSUSE:Factory/.fcitx-anthy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx-anthy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcitx-anthy/fcitx-anthy.changes 2014-06-10 14:38:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fcitx-anthy.new/fcitx-anthy.changes 2015-06-01 09:52:32.000000000 +0200
@@ -1,0 +2,11 @@
+Sat May 30 06:45:43 UTC 2015 - i(a)marguerite.su
+
+- update version 0.2.2
+ * fix some errors in 101kana.sty and tsuki-2-203-106.sty
+ * quick kana: shift modifiered keys produces voiced
+ consonant kana
+ * add circle latin-hiragana mode
+ * [anthy]delete duplicate defined of UTF8 scancode
+ * fix unexpected clear key bindings when load_config().
+
+-------------------------------------------------------------------
Old:
----
fcitx-anthy-0.2.1.tar.xz
New:
----
fcitx-anthy-0.2.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcitx-anthy.spec ++++++
--- /var/tmp/diff_new_pack.FXKfoS/_old 2015-06-01 09:52:32.000000000 +0200
+++ /var/tmp/diff_new_pack.FXKfoS/_new 2015-06-01 09:52:32.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fcitx-anthy
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: fcitx-anthy
-Version: 0.2.1
+Version: 0.2.2
Release: 0
Summary: Japanese Anthy IME Wrapper for Fcitx
License: GPL-2.0+
++++++ fcitx-anthy-0.2.1.tar.xz -> fcitx-anthy-0.2.2.tar.xz ++++++
++++ 3632 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in at 2015-06-01 09:52:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2015-03-11 09:57:27.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2015-06-01 09:52:15.000000000 +0200
@@ -1,0 +2,10 @@
+Wed May 27 18:12:40 UTC 2015 - ramaxlo(a)gmail.com
+
+- Add qt5 immodule support.
+- Add qt5gui-header-path-fix.patch to fix build failure.
+- Add plasma5-dirty-fix.patch to fix plasma 5 black screen issue
+ during starting. The reason is unknown so far.
+ Refer to http://hyperrate.com/thread.php?tid=31194 for more
+ information.
+
+-------------------------------------------------------------------
New:
----
plasma5-dirty-fix.patch
qt5gui-header-path-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gcin.spec ++++++
--- /var/tmp/diff_new_pack.QYOl8A/_old 2015-06-01 09:52:16.000000000 +0200
+++ /var/tmp/diff_new_pack.QYOl8A/_new 2015-06-01 09:52:16.000000000 +0200
@@ -40,6 +40,10 @@
Patch5: gcin-keep-debug-symbols.patch
# PATCH-FIX-UPSTREAM glin(a)suse.com - fix the Makefile dependency for parallel compiling
Patch7: gcin-parallel-compiling.patch
+# PATCH-FIX-UPSTREAM ramaxlo(a)gmail.com - Fix incorrect search path of Qt5Gui header
+Patch8: qt5gui-header-path-fix.patch
+# PATCH-FIX-UPSTREAM ramaxlo(a)gmail.com - Plasma 5 starting dirty fix
+Patch9: plasma5-dirty-fix.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -48,6 +52,11 @@
BuildRequires: pkg-config
BuildRequires: update-desktop-files
BuildRequires: xz
+%if 0%{?suse_version} > 1310
+BuildRequires: libQt5Gui-private-headers-devel
+BuildRequires: libQt5PlatformSupport-devel-static
+BuildRequires: libqt5-qtbase-devel
+%endif
Requires: %{name}-branding
Requires: %{name}-gtk2-immodule = %{version}
Requires: %{name}-qt4-immodule = %{version}
@@ -96,6 +105,17 @@
%description qt4-immodule
gcin qt4 immodule, support Qt4-based applications
+%if 0%{?suse_version} > 1310
+%package qt5-immodule
+Summary: Gcin qt5 immodule
+License: GPL-2.0
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+
+%description qt5-immodule
+gcin qt5 immodule, support Qt5-based applications
+%endif
+
%package anthy-module
Summary: Gcin anthy module
License: LGPL-2.1
@@ -125,6 +145,10 @@
%patch4 -p1
%patch5 -p1
%patch7 -p1
+%if 0%{?suse_version} > 1310
+%patch8 -p1
+%patch9 -p1
+%endif
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
@@ -224,6 +248,12 @@
%defattr(-,root,root)
%{_libdir}/qt4/plugins/inputmethods/im-gcin.so
+%if 0%{?suse_version} > 1310
+%files qt5-immodule
+%defattr(-,root,root)
+%{_libdir}/qt5/plugins/platforminputcontexts/libgcinplatforminputcontextplugin.so
+%endif
+
%files anthy-module
%defattr(-,root,root)
%{_libdir}/gcin/anthy-module.so
++++++ plasma5-dirty-fix.patch ++++++
Index: gcin-2.8.3/qt5-im/gcin-imcontext-qt5.cpp
===================================================================
--- gcin-2.8.3.orig/qt5-im/gcin-imcontext-qt5.cpp
+++ gcin-2.8.3/qt5-im/gcin-imcontext-qt5.cpp
@@ -57,7 +57,6 @@ QGcinPlatformInputContext::QGcinPlatform
if(!native)
return;
Display *display = static_cast<Display *>(native->nativeResourceForWindow("display", NULL));
- printf("display %p\n", display);
if (!(gcin_ch = gcin_im_client_open(display))) {
perror("cannot open gcin_ch");
++++++ qt5gui-header-path-fix.patch ++++++
Index: gcin-2.8.3/qt5-im/Makefile
===================================================================
--- gcin-2.8.3.orig/qt5-im/Makefile
+++ gcin-2.8.3/qt5-im/Makefile
@@ -5,7 +5,7 @@ IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARC
INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags`
# dirty fix for ubuntu 14.04, pkg-config Qt5Gui --cflags return -I/usr/include/qt5/QtGui, missing 5.2.1/QtGui
-INCS+=-I /usr/include/qt5/QtGui/5.2.1/QtGui
+INCS+=-I `pkg-config --variable=includedir Qt5Gui`/QtGui/`pkg-config --modversion Qt5Gui`/QtGui
CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)"
OBJS= moc_gcin-qt5.o gcin-qt5.o gcin-imcontext-qt5.o moc_qgcinplatforminputcontext.o
1
0
Hello community,
here is the log from the commit of package python3-py for openSUSE:Factory checked in at 2015-06-01 09:51:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-py (Old)
and /work/SRC/openSUSE:Factory/.python3-py.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-py"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-py/python3-py.changes 2015-05-11 19:49:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-py.new/python3-py.changes 2015-06-01 09:51:56.000000000 +0200
@@ -1,0 +2,7 @@
+Sat May 30 02:32:54 UTC 2015 - arun(a)gmx.de
+
+- update to version 1.4.28:
+ * fix issue64 – dirpath regression when “abs=True” is passed. Thanks
+ Gilles Dartiguelongue.
+
+-------------------------------------------------------------------
Old:
----
py-1.4.27.tar.gz
New:
----
py-1.4.28.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-py.spec ++++++
--- /var/tmp/diff_new_pack.CJpJOl/_old 2015-06-01 09:51:57.000000000 +0200
+++ /var/tmp/diff_new_pack.CJpJOl/_new 2015-06-01 09:51:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-py
-Version: 1.4.27
+Version: 1.4.28
Release: 0
Summary: Library with cross-python path, ini-parsing, io, code, log facilities
License: MIT
++++++ py-1.4.27.tar.gz -> py-1.4.28.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/CHANGELOG new/py-1.4.28/CHANGELOG
--- old/py-1.4.27/CHANGELOG 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/CHANGELOG 2015-05-22 08:30:55.000000000 +0200
@@ -1,3 +1,9 @@
+1.4.28
+==================================================
+
+- fix issue64 -- dirpath regression when "abs=True" is passed.
+ Thanks Gilles Dartiguelongue.
+
1.4.27
==================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/PKG-INFO new/py-1.4.28/PKG-INFO
--- old/py-1.4.27/PKG-INFO 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/PKG-INFO 2015-05-22 08:30:56.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py
-Version: 1.4.27
+Version: 1.4.28
Summary: library with cross-python path, ini-parsing, io, code, log facilities
Home-page: http://pylib.readthedocs.org/
Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/py/__init__.py new/py-1.4.28/py/__init__.py
--- old/py-1.4.27/py/__init__.py 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/py/__init__.py 2015-05-22 08:30:55.000000000 +0200
@@ -8,7 +8,7 @@
(c) Holger Krekel and others, 2004-2014
"""
-__version__ = '1.4.27'
+__version__ = '1.4.28'
from py import _apipkg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/py/_path/local.py new/py-1.4.28/py/_path/local.py
--- old/py-1.4.27/py/_path/local.py 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/py/_path/local.py 2015-05-22 08:30:55.000000000 +0200
@@ -304,13 +304,15 @@
raise ValueError("invalid part specification %r" % name)
return res
- def dirpath(self, *args):
+ def dirpath(self, *args, **kwargs):
""" return the directory path joined with any given path arguments. """
- path = object.__new__(self.__class__)
- path.strpath = dirname(self.strpath)
- if args:
- path = path.join(*args)
- return path
+ if not kwargs:
+ path = object.__new__(self.__class__)
+ path.strpath = dirname(self.strpath)
+ if args:
+ path = path.join(*args)
+ return path
+ return super(LocalPath, self).dirpath(*args, **kwargs)
def join(self, *args, **kwargs):
""" return a new path by appending all 'args' as path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/py.egg-info/PKG-INFO new/py-1.4.28/py.egg-info/PKG-INFO
--- old/py-1.4.27/py.egg-info/PKG-INFO 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/py.egg-info/PKG-INFO 2015-05-22 08:30:56.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: py
-Version: 1.4.27
+Version: 1.4.28
Summary: library with cross-python path, ini-parsing, io, code, log facilities
Home-page: http://pylib.readthedocs.org/
Author: holger krekel, Ronny Pfannschmidt, Benjamin Peterson and others
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/setup.py new/py-1.4.28/setup.py
--- old/py-1.4.27/setup.py 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/setup.py 2015-05-22 08:30:55.000000000 +0200
@@ -7,7 +7,7 @@
name='py',
description='library with cross-python path, ini-parsing, io, code, log facilities',
long_description = open('README.txt').read(),
- version='1.4.27',
+ version='1.4.28',
url='http://pylib.readthedocs.org/',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/py-1.4.27/testing/path/test_local.py new/py-1.4.28/testing/path/test_local.py
--- old/py-1.4.27/testing/path/test_local.py 2015-05-07 11:36:24.000000000 +0200
+++ new/py-1.4.28/testing/path/test_local.py 2015-05-22 08:30:55.000000000 +0200
@@ -34,6 +34,12 @@
p = tmpdir.join("..//%s/" % tmpdir.basename)
assert p == tmpdir
+ @skiponwin32
+ def test_dirpath_abs_no_abs(self, tmpdir):
+ p = tmpdir.join('foo')
+ assert p.dirpath('/bar') == tmpdir.join('bar')
+ assert tmpdir.dirpath('/bar', abs=True) == py.path.local('/bar')
+
def test_gethash(self, tmpdir):
md5 = py.builtin._tryimport('md5', 'hashlib').md5
lib = py.builtin._tryimport('sha', 'hashlib')
1
0
Hello community,
here is the log from the commit of package python3-tornado for openSUSE:Factory checked in at 2015-06-01 09:51:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-tornado (Old)
and /work/SRC/openSUSE:Factory/.python3-tornado.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-tornado"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-tornado/python3-tornado.changes 2015-02-11 16:44:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python3-tornado.new/python3-tornado.changes 2015-06-01 09:51:39.000000000 +0200
@@ -1,0 +2,132 @@
+Sat May 30 02:19:32 UTC 2015 - arun(a)gmx.de
+
+- update to version 4.2:
+ * Backwards-compatibility notes
+ - "SSLIOStream.connect" and .IOStream.start_tls now validate
+ certificates by default.
+ - Certificate validation will now use the system CA root
+ certificates instead of "certifi" when possible (i.e. Python
+ 2.7.9+ or 3.4+). This includes .IOStream and
+ "simple_httpclient", but not "curl_httpclient".
+ - The default SSL configuration has become stricter, using
+ ssl.create_default_context where available on the client side.
+ (On the server side, applications are encouraged to migrate from
+ the "ssl_options" dict-based API to pass an ssl.SSLContext
+ instead).
+ - The deprecated classes in the tornado.auth module,
+ "GoogleMixin", "FacebookMixin", and "FriendFeedMixin" have been
+ removed.
+ * New modules: tornado.locks and tornado.queues
+ - These modules provide classes for coordinating coroutines,
+ merged from Toro http://toro.readthedocs.org
+ (See http://www.tornadoweb.org/en/stable/releases/v4.2.0.html for more details)
+ * tornado.autoreload
+ - Improved compatibility with Windows.
+ - Fixed a bug in Python 3 if a module was imported during a reload
+ check.
+ * tornado.concurrent
+ - .run_on_executor now accepts arguments to control which
+ attributes it uses to find the .IOLoop and executor.
+ * tornado.curl_httpclient
+ - Fixed a bug that would cause the client to stop processing
+ requests if an exception occurred in certain places while there
+ is a queue.
+ * tornado.escape
+ - .xhtml_escape now supports numeric character references in hex
+ format (" ")
+ * tornado.gen
+ - .WaitIterator no longer uses weak references, which fixes
+ several garbage-collection-related bugs.
+ - tornado.gen.Multi and tornado.gen.multi_future (which are used
+ when yielding a list or dict in a coroutine) now log any
+ exceptions after the first if more than one .Future fails
+ (previously they would be logged when the .Future was
+ garbage-collected, but this is more reliable). Both have a new
+ keyword argument "quiet_exceptions" to suppress logging of
+ certain exception types; to use this argument you must call
+ "Multi" or "multi_future" directly instead of simply yielding a
+ list.
+ - .multi_future now works when given multiple copies of the same
+ .Future.
+ - On Python 3, catching an exception in a coroutine no longer
+ leads to leaks via "Exception.__context__".
+ * tornado.httpclient
+ - The "raise_error" argument now works correctly with the
+ synchronous .HTTPClient.
+ - The synchronous .HTTPClient no longer interferes with
+ .IOLoop.current().
+ * tornado.httpserver
+ - .HTTPServer is now a subclass of tornado.util.Configurable.
+ * tornado.httputil
+ - .HTTPHeaders can now be copied with copy.copy and copy.deepcopy.
+ * tornado.ioloop
+ - The .IOLoop constructor now has a "make_current" keyword
+ argument to control whether the new .IOLoop becomes
+ .IOLoop.current().
+ - Third-party implementations of .IOLoop should accept "**kwargs"
+ in their ~.IOLoop.initialize methods and pass them to the
+ superclass implementation.
+ - .PeriodicCallback is now more efficient when the clock jumps
+ forward by a large amount.
+ * tornado.iostream
+ - "SSLIOStream.connect" and .IOStream.start_tls now validate
+ certificates by default.
+ - New method .SSLIOStream.wait_for_handshake allows server-side
+ applications to wait for the handshake to complete in order to
+ verify client certificates or use NPN/ALPN.
+ - The .Future returned by "SSLIOStream.connect" now resolves after
+ the handshake is complete instead of as soon as the TCP
+ connection is established.
+ - Reduced logging of SSL errors.
+ - .BaseIOStream.read_until_close now works correctly when a
+ "streaming_callback" is given but "callback" is None (i.e. when
+ it returns a .Future)
+ * tornado.locale
+ - New method .GettextLocale.pgettext allows additional context to be
+ supplied for gettext translations.
+ * tornado.log
+ - .define_logging_options now works correctly when given a
+ non-default "options" object.
+ * tornado.process
+ - New method .Subprocess.wait_for_exit is a coroutine-friendly
+ version of .Subprocess.set_exit_callback.
+ * tornado.simple_httpclient
+ - Improved performance on Python 3 by reusing a single
+ ssl.SSLContext.
+ - New constructor argument "max_body_size" controls the maximum
+ response size the client is willing to accept. It may be bigger
+ than "max_buffer_size" if "streaming_callback" is used.
+ * tornado.tcpserver
+ - .TCPServer.handle_stream may be a coroutine (so that any
+ exceptions it raises will be logged).
+ * tornado.util
+ - .import_object now supports unicode strings on Python 2.
+ - .Configurable.initialize now supports positional arguments.
+ * tornado.web
+ - Key versioning support for cookie signing. "cookie_secret"
+ application setting can now contain a dict of valid keys with
+ version as key. The current signing key then must be specified
+ via "key_version" setting.
+ - Parsing of the "If-None-Match" header now follows the RFC and
+ supports weak validators.
+ - Passing "secure=False" or "httponly=False" to
+ .RequestHandler.set_cookie now works as expected (previously
+ only the presence of the argument was considered and its value
+ was ignored).
+ - .RequestHandler.get_arguments now requires that its " argument
+ be of type bool. This helps prevent errors caused by the
+ slightly dissimilar interfaces between the singular and plural
+ methods.
+ - Errors raised in "_handle_request_exception" are now logged more
+ reliably.
+ - .RequestHandler.redirect now works correctly when called from a
+ handler whose path begins with two slashes.
+ - Passing messages containing "%" characters to
+ tornado.web.HTTPError no longer causes broken error messages.
+ * tornado.websocket
+ - The "on_close" method will no longer be called more than once.
+ - When the other side closes a connection, we now echo the
+ received close code back instead of sending an empty close
+ frame.
+
+-------------------------------------------------------------------
Old:
----
tornado-4.1.tar.gz
New:
----
tornado-4.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-tornado.spec ++++++
--- /var/tmp/diff_new_pack.5jlvlF/_old 2015-06-01 09:51:40.000000000 +0200
+++ /var/tmp/diff_new_pack.5jlvlF/_new 2015-06-01 09:51:40.000000000 +0200
@@ -17,7 +17,7 @@
Name: python3-tornado
-Version: 4.1
+Version: 4.2
Release: 0
Url: http://www.tornadoweb.org
Summary: Open source version of scalable, non-blocking web server that power FriendFeed
++++++ tornado-4.1.tar.gz -> tornado-4.2.tar.gz ++++++
++++ 14778 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2015-06-01 09:51:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cloud-init (Old)
and /work/SRC/openSUSE:Factory/.cloud-init.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2015-05-06 07:49:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cloud-init.new/cloud-init.changes 2015-06-01 09:51:23.000000000 +0200
@@ -1,0 +2,8 @@
+Wed May 20 18:27:02 UTC 2015 - rjschwei(a)suse.com
+
+- Properly write the routes file for static networks (bnc#920190)
+ + modify suseIntegratedHandler.patch
+- Remove suseSetInitCmd.patch
+ + is now integrated with suseIntegratedHandler.patch
+
+-------------------------------------------------------------------
Old:
----
suseSetInitCmd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cloud-init.spec ++++++
--- /var/tmp/diff_new_pack.VX5jIy/_old 2015-06-01 09:51:24.000000000 +0200
+++ /var/tmp/diff_new_pack.VX5jIy/_new 2015-06-01 09:51:24.000000000 +0200
@@ -35,8 +35,6 @@
Patch5: openSUSEhostsTemplate.diff
# FIXME dynamicInitCmd.patch proposed for upstream merge
Patch6: dynamicInitCmd.diff
-# FIXME suseSetInitCmd.patch send upstream once the SUSE handlers are accepted
-Patch7: suseSetInitCmd.patch
Patch9: cloud-init-no-dmidecode-on-ppc64.patch
Patch10: cloud-init-no-user-lock-if-already-locked.patch
Patch11: dataSourceOpenNebula.patch
@@ -134,7 +132,6 @@
%patch3 -p1
%patch5
%patch6
-%patch7
%patch9 -p1
%patch10 -p1
%patch11 -p2
++++++ suseIntegratedHandler.patch ++++++
--- /var/tmp/diff_new_pack.VX5jIy/_old 2015-06-01 09:51:24.000000000 +0200
+++ /var/tmp/diff_new_pack.VX5jIy/_new 2015-06-01 09:51:24.000000000 +0200
@@ -1,6 +1,6 @@
--- /dev/null
+++ cloudinit/distros/opensuse.py
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,221 @@
+# vi: ts=4 expandtab
+#
+# Copyright (C) 2014 SUSE LLC
@@ -42,8 +42,10 @@
+ locale_conf_fn = '/etc/sysconfig/language'
+ network_conf_fn = '/etc/sysconfig/network'
+ hostname_conf_fn = '/etc/HOSTNAME'
++ init_cmd = ['service']
+ network_script_tpl = '/etc/sysconfig/network/ifcfg-%s'
+ resolve_conf_fn = '/etc/resolv.conf'
++ route_conf_tpl = '/etc/sysconfig/network/ifroute-%s'
+ tz_local_fn = '/etc/localtime'
+ systemd_locale_conf_fn = '/etc/locale.conf'
+
@@ -53,9 +55,13 @@
+ # calls from repeatly happening (when they
+ # should only happen say once per instance...)
+ self._runner = helpers.Runners(paths)
++ cfg['ssh_svcname'] = 'sshd'
+ self.osfamily = 'suse'
+ self.systemdDist = util.which('systemctl')
-+
++ if self.systemdDist:
++ self.init_cmd = ['systemctl']
++ cfg['ssh_svcname'] = 'sshd.service'
++
+ def apply_locale(self, locale, out_fn=None):
+ if self.systemdDist:
+ if not out_fn:
@@ -176,15 +182,18 @@
+ dev_names = entries.keys()
+ for (dev, info) in entries.iteritems():
+ net_fn = self.network_script_tpl % (dev)
++ route_fn = self.route_conf_tpl % (dev)
+ mode = None
+ if info.get('auto', None):
+ mode = 'auto'
+ else:
+ mode = 'manual'
++ bootproto = info.get('bootproto', None)
++ gateway = info.get('gateway', None)
+ net_cfg = {
-+ 'BOOTPROTO': info.get('bootproto'),
++ 'BOOTPROTO': bootproto,
+ 'BROADCAST': info.get('broadcast'),
-+ 'GATEWAY': info.get('gateway'),
++ 'GATEWAY': gateway,
+ 'IPADDR': info.get('address'),
+ 'LLADDR': info.get('hwaddress'),
+ 'NETMASK': info.get('netmask'),
@@ -196,6 +205,9 @@
+ else:
+ net_cfg['FIREWALL'] = 'no'
+ rhutil.update_sysconfig_file(net_fn, net_cfg, True)
++ if gateway and bootproto == 'static':
++ default_route = 'default %s' %gateway
++ util.write_file(route_fn, default_route, 0644)
+ if 'dns-nameservers' in info:
+ nameservers.extend(info['dns-nameservers'])
+ if 'dns-search' in info:
1
0
Hello community,
here is the log from the commit of package rubygem-hiera-eyaml for openSUSE:Factory checked in at 2015-06-01 09:51:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-hiera-eyaml (Old)
and /work/SRC/openSUSE:Factory/.rubygem-hiera-eyaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-hiera-eyaml"
Changes:
--------
New Changes file:
--- /dev/null 2015-05-15 19:41:08.266053825 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-hiera-eyaml.new/rubygem-hiera-eyaml.changes 2015-06-01 09:51:07.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Sat Apr 18 14:08:11 UTC 2015 - tampakrap(a)opensuse.org
+
+- Initial commit
+
New:
----
hiera-eyaml-2.0.8.gem
rubygem-hiera-eyaml.changes
rubygem-hiera-eyaml.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-hiera-eyaml.spec ++++++
#
# spec file for package rubygem-hiera-eyaml
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: rubygem-hiera-eyaml
Version: 2.0.8
Release: 0
%define mod_name hiera-eyaml
%define mod_full_name %{mod_name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: %{ruby}
BuildRequires: %{rubygem gem2rpm}
BuildRequires: update-alternatives
Url: http://github.com/TomPoulton/hiera-eyaml
Source: http://rubygems.org/gems/%{mod_full_name}.gem
Summary: OpenSSL Encryption backend for Hiera
License: MIT
Group: Development/Languages/Ruby
PreReq: update-alternatives
%description
Hiera backend for decrypting encrypted yaml properties.
%prep
%build
%install
%gem_install \
--symlink-binaries \
--doc-files="CHANGES.md LICENSE.txt README.md" \
-f
%gem_packages
%changelog
1
0
Hello community,
here is the log from the commit of package dialog for openSUSE:Factory checked in at 2015-06-01 09:49:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dialog (Old)
and /work/SRC/openSUSE:Factory/.dialog.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dialog"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dialog/dialog.changes 2015-03-09 10:04:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dialog.new/dialog.changes 2015-06-01 09:49:46.000000000 +0200
@@ -1,0 +2,27 @@
+Fri May 22 07:29:30 UTC 2015 - mpluskal(a)suse.com
+
+- Add gpg signature
+- Update to 1-2-20150513
+ + add configure option --with-install-prefix, like ncurses.
+ + add --with-screen and related configure options from ncurses-examples
+ to allow building with ncurses6 test-packages.
+ + update configure macros for improved coding style from lynx changes.
+ + updated ro.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+ > patches by Florent Rougon:
+ + fix two bugs in the "--file" option.
+ + When the number of arguments read from the included file is 0, the
+ code used to just skip over '--file' and its argument instead of
+ removing them from the argument list, causing "Error: Unknown
+ option --file" later on.
+ + In the alternative case (at least one argument read from the file),
+ the previous code used to do '--j;' in order to "force rescan" of
+ the inserted arguments. However, control then flowed to outer
+ blocks where a '++j;' counteracted this measure, causing "Error:
+ Unknown option --msgbox" (for instance) later on.
+ + modify escaping in argv.c to be more uniform, whether or not the
+ backslash is found within a parameter.
+
+
+-------------------------------------------------------------------
Old:
----
dialog-1.2-20150225.tgz
New:
----
dialog-1.2-20150513.tgz
dialog-1.2-20150513.tgz.asc
dialog.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dialog.spec ++++++
--- /var/tmp/diff_new_pack.PqjbG4/_old 2015-06-01 09:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.PqjbG4/_new 2015-06-01 09:49:48.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dialog
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,28 @@
#
+%define src_date 20150513
+%define somajor 12
Name: dialog
-Url: http://invisible-island.net/dialog/
Version: 1.2
Release: 0
-%define src_date 20150225
-%define somajor 12
Summary: Menus and Input Boxes for Shell Scripts
License: LGPL-2.1
Group: Development/Tools/Other
-Source: ftp://invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz
-Source1: dialog.rc
-Source2: dialog.ko.po.bz2
+Url: http://invisible-island.net/dialog/
+Source0: ftp://invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz
+Source1: ftp://invisible-island.net/dialog/%{name}-%{version}-%{src_date}.tgz.asc
+Source2: %{name}.keyring
+Source3: dialog.rc
+Source4: dialog.ko.po.bz2
# PATCH-FIX-OPENSUSE : fix shadow during resizing terminal
Patch0: dialog-1.2-20121230.dif
Patch2: dialog-gcc-warnings.patch
-Requires: terminfo-base
-Suggests: terminfo
BuildRequires: libtool
BuildRequires: ncurses-devel
+BuildRequires: pkg-config
+Requires: terminfo-base
+Suggests: terminfo
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -65,15 +68,15 @@
Examples of using menus and dialog boxes in shell scripts.
%prep
-%setup -n %{name}-%{version}-%{src_date}
-bzcat %{S:2} > po/ko.po
-%patch0 -p0
+%setup -q -n %{name}-%{version}-%{src_date}
+bzcat %{SOURCE4} > po/ko.po
+%patch0
%patch2 -p1
%build
CC=gcc
LIBS=""
- CFLAGS="$RPM_OPT_FLAGS -pipe -Wall"
+ CFLAGS="%{optflags} -pipe -Wall"
for ncurses_conf in ncursesw6-config ncurstesw5-config ; do
ncurses_conf=$(type -p $ncurses_conf 2> /dev/null) || continue
LIBS="${LIBS:+$LIBS }$($ncurses_conf --libs)"
@@ -100,26 +103,27 @@
%install
# libtool seems to be broken in shell function func_lalib_unsafe_p()
exec 0</dev/null
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+rm -rf %{buildroot}%{_libdir}/.libs
+find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
find %{buildroot}%{_libdir} -name '*.a' -type f -delete -print
rm -rf %{buildroot}%{_datadir}/locale/mg/ # Malagasy (Malayalam??)
rm -rf %{buildroot}%{_datadir}/locale/rm/ # Rhaeto-Romance
mkdir %{buildroot}/etc
-install -m 0644 %{S:1} %{buildroot}/etc/dialogrc
-%find_lang %name
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dialogrc
+%find_lang %{name}
%post -n libdialog%{somajor} -p /sbin/ldconfig
%postun -n libdialog%{somajor} -p /sbin/ldconfig
-%files -f %name.lang
+%files -f %{name}.lang
%defattr(-,root,root)
%doc CHANGES README VERSION COPYING
-%config(noreplace) /etc/dialogrc
+%config(noreplace) %{_sysconfdir}/dialogrc
%{_bindir}/dialog
%{_mandir}/man1/dialog.1.gz
++++++ dialog-1.2-20150225.tgz -> dialog-1.2-20150513.tgz ++++++
++++ 24619 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/CHANGES new/dialog-1.2-20150513/CHANGES
--- old/dialog-1.2-20150225/CHANGES 2015-02-26 03:11:23.000000000 +0100
+++ new/dialog-1.2-20150513/CHANGES 2015-05-13 18:02:12.000000000 +0200
@@ -1,9 +1,31 @@
--- $Id: CHANGES,v 1.508 2015/02/26 02:11:23 tom Exp $
+-- $Id: CHANGES,v 1.515 2015/05/13 16:02:12 tom Exp $
-- Thomas E. Dickey <dickey(a)invisible-island.net>
This version of dialog was originally from a Debian snapshot. I've done this
to it:
+2015/05/13
+ + add configure option --with-install-prefix, like ncurses.
+ + add --with-screen and related configure options from ncurses-examples
+ to allow building with ncurses6 test-packages.
+ + update configure macros for improved coding style from lynx changes.
+ + updated ro.po from
+ http://translationproject.org/latest/dialog/
+ + update config.guess, config.sub
+ > patches by Florent Rougon:
+ + fix two bugs in the "--file" option.
+ + When the number of arguments read from the included file is 0, the
+ code used to just skip over '--file' and its argument instead of
+ removing them from the argument list, causing "Error: Unknown
+ option --file" later on.
+ + In the alternative case (at least one argument read from the file),
+ the previous code used to do '--j;' in order to "force rescan" of
+ the inserted arguments. However, control then flowed to outer
+ blocks where a '++j;' counteracted this measure, causing "Error:
+ Unknown option --msgbox" (for instance) later on.
+ + modify escaping in argv.c to be more uniform, whether or not the
+ backslash is found within a parameter.
+
2015/02/25
+ modify gauge widget to keep from erasing a second gauge widget, e.g.,
via the "--and-widget" option. This is a cosmetic change to match
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/VERSION new/dialog-1.2-20150513/VERSION
--- old/dialog-1.2-20150225/VERSION 2015-02-25 11:11:07.000000000 +0100
+++ new/dialog-1.2-20150513/VERSION 2015-05-13 16:46:07.000000000 +0200
@@ -1 +1 @@
-12:0:0 1.2 20150225
+12:0:0 1.2 20150513
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/argv.c new/dialog-1.2-20150513/argv.c
--- old/dialog-1.2-20150225/argv.c 2014-09-10 10:58:27.000000000 +0200
+++ new/dialog-1.2-20150513/argv.c 2015-05-13 02:34:39.000000000 +0200
@@ -1,9 +1,9 @@
/*
- * $Id: argv.c,v 1.3 2014/09/10 08:58:27 tom Exp $
+ * $Id: argv.c,v 1.5 2015/05/13 00:34:39 tom Exp $
*
* argv - Reusable functions for argv-parsing.
*
- * Copyright 2011-2012,2014 Thomas E. Dickey
+ * Copyright 2011-2014,2015 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -55,18 +55,12 @@
++count;
inparm = TRUE;
}
- } else if (blob[n] == '\\') {
- if (quoted && !isspace(UCH(blob[n + 1]))) {
+ } else if (!quoted && isspace(UCH(blob[n]))) {
+ if (inparm) {
if (pass) {
- *param++ = blob[n];
- *param++ = blob[n + 1];
+ *param++ = '\0';
}
- }
- ++n;
- } else if (!quoted && isspace(UCH(blob[n]))) {
- inparm = FALSE;
- if (pass) {
- *param++ = '\0';
+ inparm = FALSE;
}
} else {
if (!inparm) {
@@ -75,6 +69,10 @@
++count;
inparm = TRUE;
}
+ if (blob[n] == '\\') {
+ if (++n == length)
+ break; /* The string is terminated by a backslash */
+ }
if (pass) {
*param++ = blob[n];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/configure.in new/dialog-1.2-20150513/configure.in
--- old/dialog-1.2-20150225/configure.in 2015-02-24 13:20:14.000000000 +0100
+++ new/dialog-1.2-20150513/configure.in 2015-05-13 18:01:18.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.83 2015/02/24 12:20:14 tom Exp $
+dnl $Id: configure.in,v 1.86 2015/05/13 16:01:18 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl ---------------------------------------------------------------------------
dnl Copyright 1999-2014,2015 -- Thomas E. Dickey
@@ -62,10 +62,10 @@
CF_XOPEN_SOURCE
CF_LARGEFILE
+CF_WITH_INSTALL_PREFIX
CF_WITH_WARNINGS
CF_PKG_CONFIG
-
dnl
dnl Allow dialog program and library to be renamed.
AC_MSG_CHECKING(for this package's name)
@@ -120,23 +120,8 @@
CF_ENABLE_RPATH
-use_ncurses=no
-AC_ARG_WITH(ncurses,
- [ --with-ncurses compile/link with ncurses library],
- [use_ncurses=ncurses])
-AC_ARG_WITH(ncursesw,
- [ --with-ncursesw compile/link with wide-char ncurses library],
- [use_ncurses=ncursesw])
-if test $use_ncurses != no ; then
- cf_wide_curses=yes
- if test $use_ncurses = ncursesw ; then
- CF_UTF8_LIB
- fi
- CF_NCURSES_CONFIG($use_ncurses)
-else
- cf_wide_curses=no
- CF_CURSES_CONFIG
-fi
+CF_WITH_NCURSES_ETC
+CF_WIDEC_CURSES
cf_all_widgets=yes
CF_ARG_MSG_ENABLE([if you want extra dialogs],
@@ -200,7 +185,7 @@
CF_ARG_MSG_ENABLE([if you want the wide-curses features],
widec,
[ --enable-widec enable wide-curses features],
- [AC_DEFINE(USE_WIDE_CURSES,1,[Define to 1 to enable wide-curses features])],,$cf_wide_curses)
+ [AC_DEFINE(USE_WIDE_CURSES,1,[Define to 1 to enable wide-curses features])],,$cf_cv_widec_curses)
AC_SUBST(EXTRAOBJS)
@@ -210,7 +195,7 @@
AC_HEADER_STDC
AC_HEADER_TIME
AC_HEADER_DIRENT
-AC_CHECK_HEADERS(search.h unctrl.h unistd.h)
+AC_CHECK_HEADERS(search.h unistd.h)
CF_CURSES_TERM_H
dnl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/dialog.1 new/dialog-1.2-20150513/dialog.1
--- old/dialog-1.2-20150225/dialog.1 2014-02-20 01:32:58.000000000 +0100
+++ new/dialog-1.2-20150513/dialog.1 2015-05-13 22:11:04.000000000 +0200
@@ -1,6 +1,6 @@
'\" t
-.\" $Id: dialog.1,v 1.184 2014/02/20 00:32:58 tom Exp $
-.\" Copyright 2005-2013,2014 Thomas E. Dickey
+.\" $Id: dialog.1,v 1.185 2015/05/13 20:11:04 tom Exp $
+.\" Copyright 2005-2014,2015 Thomas E. Dickey
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU Lesser General Public License, version 2.1
@@ -43,7 +43,7 @@
.IP \(bu 4
..
.
-.TH \*D 1 "" "$Date: 2014/02/20 00:32:58 $"
+.TH \*D 1 "" "$Date: 2015/05/13 20:11:04 $"
.SH NAME
dialog \- display dialog boxes from shell scripts
.SH SYNOPSIS
@@ -147,6 +147,7 @@
rather than a filename.
.
.SS \fBCommon Options\fP
+Most of the common options are reset before processing each widget.
.
.IP "\fB--ascii-lines
Rather than draw graphics lines around boxes,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/dialog.c new/dialog-1.2-20150513/dialog.c
--- old/dialog-1.2-20150225/dialog.c 2015-01-25 23:57:06.000000000 +0100
+++ new/dialog-1.2-20150513/dialog.c 2015-05-11 11:16:22.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * $Id: dialog.c,v 1.238 2015/01/25 22:57:06 tom Exp $
+ * $Id: dialog.c,v 1.239 2015/05/11 09:16:22 Florent.Rougon Exp $
*
* cdialog - Display simple dialog boxes from shell scripts
*
@@ -414,49 +414,58 @@
blob[length] = '\0';
list = dlg_string_to_argv(blob);
- if ((added = dlg_count_argv(list)) != 0) {
- if (added > 2) {
- size_t need = (size_t) (*argcp + added + 1);
- if (doalloc) {
- *argvp = dlg_realloc(char *, need, *argvp);
- assert_ptr(*argvp, "unescape_argv");
- } else {
- char **newp = dlg_malloc(char *, need);
- assert_ptr(newp, "unescape_argv");
- for (n = 0; n < *argcp; ++n) {
- newp[n] = (*argvp)[n];
- }
- *argvp = newp;
- doalloc = TRUE;
+ added = dlg_count_argv(list);
+ if (added > 2) {
+ /* *argcp arguments before the expansion of --file
+ - 2 for the removal of '--file <filepath>'
+ + added for the arguments contained in <filepath>
+ + 1 for the terminating NULL pointer */
+ size_t need = (size_t) (*argcp + added - 1);
+ if (doalloc) {
+ *argvp = dlg_realloc(char *, need, *argvp);
+ assert_ptr(*argvp, "unescape_argv");
+ } else {
+ char **newp = dlg_malloc(char *, need);
+ assert_ptr(newp, "unescape_argv");
+ for (n = 0; n < *argcp; ++n) {
+ newp[n] = (*argvp)[n];
}
- dialog_opts = dlg_realloc(bool, need, dialog_opts);
- assert_ptr(dialog_opts, "unescape_argv");
+ /* The new array is not NULL-terminated yet. */
+ *argvp = newp;
+ doalloc = TRUE;
}
- if (added > 2) {
- for (n = *argcp; n >= j + 2; --n) {
- (*argvp)[n + added - 2] = (*argvp)[n];
- dialog_opts[n + added - 2] = dialog_opts[n];
- }
- } else if (added == 1) {
- for (n = j; n < *argcp; ++n) {
- (*argvp)[n] = (*argvp)[n + 1];
- dialog_opts[n] = dialog_opts[n + 1];
- }
+ dialog_opts = dlg_realloc(bool, need, dialog_opts);
+ assert_ptr(dialog_opts, "unescape_argv");
+
+ /* Shift the arguments after '--file <filepath>'
+ right by (added - 2) positions */
+ for (n = *argcp - 1; n >= j + 2; --n) {
+ (*argvp)[n + added - 2] = (*argvp)[n];
+ dialog_opts[n + added - 2] = dialog_opts[n];
}
- for (n = 0; n < added; ++n) {
- (*argvp)[n + j] = list[n];
- dialog_opts[n + j] = FALSE;
+ } else if (added < 2) {
+ /* 0 or 1 argument read from the included file
+ -> shift the arguments after '--file <filepath>'
+ left by (2 - added) positions */
+ for (n = j + added; n + 2 - added < *argcp; ++n) {
+ (*argvp)[n] = (*argvp)[n + 2 - added];
+ dialog_opts[n] = dialog_opts[n + 2 - added];
}
- *argcp += added - 2;
- free(list);
- --j; /* force rescan */
}
+ /* Copy the inserted arguments to *argvp */
+ for (n = 0; n < added; ++n) {
+ (*argvp)[n + j] = list[n];
+ dialog_opts[n + j] = FALSE;
+ }
+ *argcp += added - 2;
+ (*argvp)[*argcp] = 0; /* Write the NULL terminator */
+ free(list); /* No-op if 'list' is NULL */
+ /* Force rescan starting from the first inserted argument */
+ --j;
+ continue;
} else {
dlg_exiterr("Cannot open --file %s", filename);
}
- (*argvp)[*argcp] = 0;
- ++j;
- continue;
} else {
dlg_exiterr("No value given for --file");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/makefile.in new/dialog-1.2-20150513/makefile.in
--- old/dialog-1.2-20150225/makefile.in 2015-02-26 00:37:38.000000000 +0100
+++ new/dialog-1.2-20150513/makefile.in 2015-05-13 18:06:35.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: makefile.in,v 1.92 2015/02/25 23:37:38 tom Exp $
+# $Id: makefile.in,v 1.93 2015/05/13 16:06:35 tom Exp $
# template makefile for DIALOG
##############################################################################
# Copyright (c) 1999-2014,2015 Thomas E. Dickey #
@@ -43,7 +43,7 @@
x = @EXEEXT@
o = .@OBJEXT@
-DESTDIR =
+DESTDIR = @DESTDIR@
THIS = dialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/mouse.c new/dialog-1.2-20150513/mouse.c
--- old/dialog-1.2-20150225/mouse.c 2012-12-21 11:00:30.000000000 +0100
+++ new/dialog-1.2-20150513/mouse.c 2015-05-13 22:56:28.000000000 +0200
@@ -1,9 +1,9 @@
/*
- * $Id: mouse.c,v 1.20 2012/12/21 10:00:30 tom Exp $
+ * $Id: mouse.c,v 1.21 2015/05/13 20:56:28 tom Exp $
*
* mouse.c -- mouse support for dialog
*
- * Copyright 2002-2007,2012 Thomas E. Dickey
+ * Copyright 2002-2012,2015 Thomas E. Dickey
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License, version 2.1
@@ -91,16 +91,16 @@
butPtr->next = regionList;
regionList = butPtr;
}
- if (butPtr != 0) {
- butPtr->mode = -1;
- butPtr->step_x = 0;
- butPtr->step_y = 0;
- butPtr->y = basey + y;
- butPtr->Y = basey + y + height;
- butPtr->x = basex + x;
- butPtr->X = basex + x + width;
- butPtr->code = basecode + code;
- }
+
+ butPtr->mode = -1;
+ butPtr->step_x = 0;
+ butPtr->step_y = 0;
+ butPtr->y = basey + y;
+ butPtr->Y = basey + y + height;
+ butPtr->x = basex + x;
+ butPtr->X = basex + x + width;
+ butPtr->code = basecode + code;
+
return butPtr;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/package/debian/changelog new/dialog-1.2-20150513/package/debian/changelog
--- old/dialog-1.2-20150225/package/debian/changelog 2015-02-25 11:11:07.000000000 +0100
+++ new/dialog-1.2-20150513/package/debian/changelog 2015-05-13 16:46:07.000000000 +0200
@@ -1,3 +1,15 @@
+cdialog (20150513) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey(a)invisible-island.net> Wed, 13 May 2015 10:46:07 -0400
+
+cdialog (20150512) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sun, 10 May 2015 19:31:46 -0400
+
cdialog (20150225) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/package/debian/rules new/dialog-1.2-20150513/package/debian/rules
--- old/dialog-1.2-20150225/package/debian/rules 2015-02-24 15:07:01.000000000 +0100
+++ new/dialog-1.2-20150513/package/debian/rules 2015-05-13 17:53:58.000000000 +0200
@@ -40,7 +40,7 @@
--enable-header-subdir \
--enable-widec \
--with-shared \
- --with-ncursesw \
+ --with-screen=ncursesw6 \
--with-package=${ACTUAL_PROG} \
--with-versioned-syms \
--disable-rpath-hack
@@ -91,6 +91,7 @@
dh_compress
dh_fixperms
dh_installdeb
+ dh_makeshlibs
dh_shlibdeps
dh_gencontrol
dh_md5sums
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/package/dialog.spec new/dialog-1.2-20150513/package/dialog.spec
--- old/dialog-1.2-20150225/package/dialog.spec 2015-02-25 11:11:07.000000000 +0100
+++ new/dialog-1.2-20150513/package/dialog.spec 2015-05-13 16:46:07.000000000 +0200
@@ -1,9 +1,9 @@
Summary: dialog - display dialog boxes from shell scripts
%define AppProgram dialog
%define AppVersion 1.2
-%define AppRelease 20150225
+%define AppRelease 20150513
%define ActualProg c%{AppProgram}
-# $XTermId: dialog.spec,v 1.69 2015/02/25 10:11:07 tom Exp $
+# $XTermId: dialog.spec,v 1.72 2015/05/13 14:46:07 tom Exp $
Name: %{ActualProg}
Version: %{AppVersion}
Release: %{AppRelease}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/package/freebsd/Makefile new/dialog-1.2-20150513/package/freebsd/Makefile
--- old/dialog-1.2-20150225/package/freebsd/Makefile 2015-02-25 11:11:07.000000000 +0100
+++ new/dialog-1.2-20150513/package/freebsd/Makefile 2015-05-13 16:46:07.000000000 +0200
@@ -7,7 +7,7 @@
#
PORTNAME= cdialog
-PORTVERSION= 1.2.20150225
+PORTVERSION= 1.2.20150513
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S|^c||}/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/dialog-1.2-20150225/po/ro.po new/dialog-1.2-20150513/po/ro.po
--- old/dialog-1.2-20150225/po/ro.po 2008-07-20 21:05:16.000000000 +0200
+++ new/dialog-1.2-20150513/po/ro.po 2015-03-13 19:02:01.000000000 +0100
@@ -1,22 +1,24 @@
-# Mesajele în limba română pentru dialog.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Acest fişier este distribuit sub aceeaşi licenţă ca şi pachetul dialog.
+# Translation of dialog messages in Romanian.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the dialog package.
# Laurentiu Buzdugan <lbuz(a)rolix.org>, 2005.
-#
+# Mihai Cristescu <mihai.cristescu(a)archlinux.info>, 2015.
#
#
msgid ""
msgstr ""
-"Project-Id-Version: dialog 1.0-rel20041222\n"
+"Project-Id-Version: dialog 1.1.20080819\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-20 14:31-0400\n"
-"PO-Revision-Date: 2005-01-20 12:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <lbuz(a)rolix.org>\n"
+"POT-Creation-Date: 2008-06-18 18:26-0400\n"
+"PO-Revision-Date: 2015-03-13 19:50+0200\n"
+"Last-Translator: Mihai Cristescu <mihai.cristescu(a)archlinux.info>\n"
"Language-Team: Romanian <translation-team-ro(a)lists.sourceforge.net>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"X-Generator: Poedit 1.7.4\n"
#: buttons.c:385
msgid "Yes"
@@ -32,7 +34,7 @@
#: buttons.c:409
msgid "Cancel"
-msgstr "Renunţă"
+msgstr "Renunță"
#: buttons.c:417
msgid "EXIT"
@@ -49,16 +51,16 @@
#. Headline "Month"
#: calendar.c:273
msgid "Month"
-msgstr "Luna"
+msgstr "Lună"
#. Headline "Year"
#: calendar.c:293
msgid "Year"
msgstr "An"
-#: dialog.c:744
+#: dialog.c:741
msgid "Rename"
-msgstr "Redenumeşte"
+msgstr "Redenumește"
#: fselect.c:550
msgid "Directories"
@@ -66,48 +68,47 @@
#: fselect.c:551
msgid "Files"
-msgstr "Fişiere"
+msgstr "Fișiere"
#: mixedgauge.c:58
msgid "Succeeded"
-msgstr ""
+msgstr "A reușit"
#: mixedgauge.c:61
-#, fuzzy
msgid "Failed"
-msgstr "Fişiere"
+msgstr "A eșuat"
#: mixedgauge.c:64
msgid "Passed"
-msgstr ""
+msgstr "A trecut"
#: mixedgauge.c:67
msgid "Completed"
-msgstr ""
+msgstr "Complet"
#: mixedgauge.c:70
msgid "Checked"
-msgstr ""
+msgstr "Verificat"
#: mixedgauge.c:73
msgid "Done"
-msgstr ""
+msgstr "Gata"
#: mixedgauge.c:76
msgid "Skipped"
-msgstr ""
+msgstr "Omis"
#: mixedgauge.c:79
msgid "In Progress"
-msgstr ""
+msgstr "În curs"
#: mixedgauge.c:85
msgid "N/A"
-msgstr ""
+msgstr "N/A"
#: mixedgauge.c:193
msgid "Overall Progress"
-msgstr ""
+msgstr "Progres pe ansamblu"
#: textbox.c:489
msgid "Search"
++++++ dialog-gcc-warnings.patch ++++++
--- /var/tmp/diff_new_pack.PqjbG4/_old 2015-06-01 09:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.PqjbG4/_new 2015-06-01 09:49:48.000000000 +0200
@@ -1,7 +1,7 @@
-Index: dialog-1.2-20121230/dialog.h
+Index: dialog-1.2-20150513/dialog.h
===================================================================
---- dialog-1.2-20121230.orig/dialog.h
-+++ dialog-1.2-20121230/dialog.h
+--- dialog-1.2-20150513.orig/dialog.h
++++ dialog-1.2-20150513/dialog.h
@@ -43,6 +43,23 @@
#include <string.h>
#include <signal.h> /* fork() etc. */
1
0