openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
August 2021
- 1 participants
- 1985 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2021-08-31 19:55:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Aug 31 19:55:38 2021 rev:318 rq:915210 version:20210831.0de63caa
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2021-08-23 10:09:10.456176120 +0200
+++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1899/openSUSE-release-tools.changes 2021-08-31 19:56:32.054025267 +0200
@@ -1,0 +2,8 @@
+Tue Aug 31 08:53:00 UTC 2021 - opensuse-releaseteam(a)opensuse.org
+
+- Update to version 20210831.0de63caa:
+ * Update specfile for skippkg-finder
+ * Run skippkg-finder.py before pkglistgen
+ * Add skippkg-finder.py to overwrite NON_FTP_PACKAGES for obsoleted and unneeded package
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20210820.43b07171.obscpio
New:
----
openSUSE-release-tools-20210831.0de63caa.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.NbnALe/_old 2021-08-31 19:56:32.726026196 +0200
+++ /var/tmp/diff_new_pack.NbnALe/_new 2021-08-31 19:56:32.730026202 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20210820.43b07171
+Version: 20210831.0de63caa
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
@@ -438,6 +438,7 @@
%exclude %{_datadir}/%{source_dir}/maintenance-installcheck.py
%exclude %{_datadir}/%{source_dir}/project-installcheck.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
+%exclude %{_datadir}/%{source_dir}/skippkg-finder.py
%exclude %{_datadir}/%{source_dir}/osclib
%exclude %{_datadir}/%{source_dir}/osc-cycle.py
%exclude %{_datadir}/%{source_dir}/osc-origin.py
@@ -551,8 +552,10 @@
%files pkglistgen
%defattr(-,root,root,-)
%{_bindir}/osrt-pkglistgen
+%{_bindir}/osrt-skippkg-finder
%{_datadir}/%{source_dir}/pkglistgen
%{_datadir}/%{source_dir}/pkglistgen.py
+%{_datadir}/%{source_dir}/skippkg-finder.py
%files -n osclib
%defattr(-,root,root,-)
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.NbnALe/_old 2021-08-31 19:56:32.782026274 +0200
+++ /var/tmp/diff_new_pack.NbnALe/_new 2021-08-31 19:56:32.786026280 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param name="changesrevision">33d44e218e9251d5dd3cc30d285c03a5a20b5b4c</param>
+ <param name="changesrevision">2a3ee0c246daccbd3b500896fe6057c8dc04777b</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20210820.43b07171.obscpio -> openSUSE-release-tools-20210831.0de63caa.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210820.43b07171/dist/package/openSUSE-release-tools.spec new/openSUSE-release-tools-20210831.0de63caa/dist/package/openSUSE-release-tools.spec
--- old/openSUSE-release-tools-20210820.43b07171/dist/package/openSUSE-release-tools.spec 2021-08-20 09:49:06.000000000 +0200
+++ new/openSUSE-release-tools-20210831.0de63caa/dist/package/openSUSE-release-tools.spec 2021-08-31 10:51:24.000000000 +0200
@@ -439,6 +439,7 @@
%exclude %{_datadir}/%{source_dir}/maintenance-installcheck.py
%exclude %{_datadir}/%{source_dir}/project-installcheck.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
+%exclude %{_datadir}/%{source_dir}/skippkg-finder.py
%exclude %{_datadir}/%{source_dir}/osclib
%exclude %{_datadir}/%{source_dir}/osc-cycle.py
%exclude %{_datadir}/%{source_dir}/osc-origin.py
@@ -552,8 +553,10 @@
%files pkglistgen
%defattr(-,root,root,-)
%{_bindir}/osrt-pkglistgen
+%{_bindir}/osrt-skippkg-finder
%{_datadir}/%{source_dir}/pkglistgen
%{_datadir}/%{source_dir}/pkglistgen.py
+%{_datadir}/%{source_dir}/skippkg-finder.py
%files -n osclib
%defattr(-,root,root,-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210820.43b07171/gocd/pkglistgen.opensuse.gocd.yaml new/openSUSE-release-tools-20210831.0de63caa/gocd/pkglistgen.opensuse.gocd.yaml
--- old/openSUSE-release-tools-20210820.43b07171/gocd/pkglistgen.opensuse.gocd.yaml 2021-08-20 09:49:06.000000000 +0200
+++ new/openSUSE-release-tools-20210831.0de63caa/gocd/pkglistgen.opensuse.gocd.yaml 2021-08-31 10:51:24.000000000 +0200
@@ -107,6 +107,7 @@
resources:
- repo-checker
tasks:
+ - script: python3 ./skippkg-finder.py-A https://api.opensuse.org -o openSUSE:Leap:15.4 -s SUSE:SLE-15-SP4:GA
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.4 -s target
Update.Repos.Leap:
group: Leap.pkglistgen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210820.43b07171/gocd/pkglistgen.opensuse.gocd.yaml.erb new/openSUSE-release-tools-20210831.0de63caa/gocd/pkglistgen.opensuse.gocd.yaml.erb
--- old/openSUSE-release-tools-20210820.43b07171/gocd/pkglistgen.opensuse.gocd.yaml.erb 2021-08-20 09:49:06.000000000 +0200
+++ new/openSUSE-release-tools-20210831.0de63caa/gocd/pkglistgen.opensuse.gocd.yaml.erb 2021-08-31 10:51:24.000000000 +0200
@@ -81,6 +81,7 @@
resources:
- repo-checker
tasks:
+ - script: python3 ./skippkg-finder.py-A https://api.opensuse.org -o openSUSE:Leap:15.4 -s SUSE:SLE-15-SP4:GA
- script: python3 ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
<% end -%>
Update.Repos.Leap:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210820.43b07171/skippkg-finder.py new/openSUSE-release-tools-20210831.0de63caa/skippkg-finder.py
--- old/openSUSE-release-tools-20210820.43b07171/skippkg-finder.py 1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-release-tools-20210831.0de63caa/skippkg-finder.py 2021-08-31 10:51:24.000000000 +0200
@@ -0,0 +1,372 @@
+#!/usr/bin/python3
+
+import argparse
+import logging
+import sys
+
+from urllib.error import HTTPError
+
+import re
+from lxml import etree as ET
+from collections import namedtuple
+
+import osc.conf
+import osc.core
+from osc.core import http_GET
+from osc.core import makeurl
+from osc import oscerr
+import osclib
+from osclib.core import source_file_ensure
+
+SUPPORTED_ARCHS = ['x86_64', 'i586', 'aarch64', 'ppc64le', 's390x']
+DEFAULT_REPOSITORY = 'standard'
+
+META_PACKAGE = '000package-groups'
+
+class SkippkgFinder(object):
+ def __init__(self, opensuse_project, sle_project, print_only, verbose):
+ self.opensuse_project = opensuse_project
+ self.sle_project = sle_project
+ self.print_only = print_only
+ self.verbose = verbose
+ self.apiurl = osc.conf.config['apiurl']
+ self.debug = osc.conf.config['debug']
+
+ def is_sle_specific(self, package):
+ """
+ Return True if package is provided for SLE only or a SLE forking.
+ Add new condition here if you do not want package being added to
+ selected_binarylist[].
+ """
+ pkg = package.lower()
+ prefixes = (
+ 'desktop-data',
+ 'libyui-bindings',
+ 'libyui-doc',
+ 'libyui-ncurses',
+ 'libyui-qt',
+ 'libyui-rest',
+ 'lifecycle-data-sle',
+ 'kernel-livepatch',
+ 'kiwi-template',
+ 'mgr-',
+ 'migrate',
+ 'patterns',
+ 'release-notes',
+ 'sap',
+ 'sca-',
+ 'skelcd',
+ 'sle-',
+ 'sle_',
+ 'sle15',
+ 'sles15',
+ 'spacewalk',
+ 'supportutils-plugin',
+ 'suse-migration',
+ 'susemanager-',
+ 'yast2-hana'
+ )
+ suffixes = (
+ '-caasp',
+ '-sle',
+ 'bootstrap'
+ )
+ matches = (
+ 'gtk-vnc2',
+ 'ibus-googlepinyin',
+ 'infiniband-diags',
+ 'llvm',
+ 'lua51-luajit',
+ 'lvm2-clvm',
+ 'osad',
+ 'rhncfg',
+ 'python-ibus',
+ 'python-pymemcache',
+ 'suse-build-key',
+ 'suse-hpc',
+ 'txt2tags',
+ 'zypp-plugin-spacewalk',
+ 'zypper-search-packages-plugin'
+ )
+ if pkg.startswith(prefixes) or pkg.endswith(suffixes) or pkg in matches:
+ return True
+ if 'sles' in pkg or\
+ 'sled' in pkg or\
+ 'sap-' in pkg or\
+ '-sap' in pkg or\
+ 'eula' in pkg or\
+ 'branding' in pkg:
+ return True
+ return False
+
+ def get_packagelist(self, project, by_project=True):
+ """
+ Return the list of package's info of a project.
+ If the latest package is from an incident then returns incident
+ package.
+ """
+
+ pkglist = {}
+ packageinfo = {}
+ query = {'expand': 1}
+ root = ET.parse(http_GET(makeurl(self.apiurl, ['source', project],
+ query=query))).getroot()
+ for i in root.findall('entry'):
+ pkgname = i.get('name')
+ orig_project = i.get('originproject')
+ is_incidentpkg = False
+ # Metapackage should not be selected
+ if pkgname.startswith('000') or\
+ pkgname.startswith('_') or\
+ pkgname.startswith('patchinfo.') or\
+ pkgname.startswith('skelcd-') or\
+ pkgname.startswith('installation-images') or\
+ pkgname.endswith('-mini'):
+ continue
+ # Ugly hack for package has dot in source package name
+ # eg. go1.x incidents as the name would be go1.x.xxx
+ if '.' in pkgname and re.match(r'[0-9]+$', pkgname.split('.')[-1]) and \
+ orig_project.startswith('SUSE:') and orig_project.endswith(':Update'):
+ is_incidentpkg = True
+ if pkgname.startswith('go1') or\
+ pkgname.startswith('bazel0') or\
+ pkgname.startswith('dotnet') or\
+ pkgname.startswith('rust1') or\
+ pkgname.startswith('ruby2'):
+ if not (pkgname.count('.') > 1):
+ is_incidentpkg = False
+
+ # If an incident found then update the package origin info
+ if is_incidentpkg:
+ orig_name = re.sub(r'\.[0-9]+$', '', pkgname)
+ incident_number = int(pkgname.split('.')[-1])
+ if orig_name in pkglist and pkglist[orig_name]['Project'] == orig_project:
+ if re.match(r'[0-9]+$', pkglist[orig_name]['Package'].split('.')[-1]):
+ old_incident_number = int(pkglist[orig_name]['Package'].split('.')[-1])
+ if incident_number > old_incident_number:
+ pkglist[orig_name]['Package'] = pkgname
+ else:
+ pkglist[orig_name]['Package'] = pkgname
+ else:
+ pkglist[pkgname] = {'Project': orig_project, 'Package': pkgname}
+
+ if by_project:
+ for pkg in pkglist.keys():
+ if pkglist[pkg]['Project'].startswith('SUSE:') and self.is_sle_specific(pkg):
+ continue
+ if pkglist[pkg]['Project'] not in packageinfo:
+ packageinfo[pkglist[pkg]['Project']] = []
+ if pkglist[pkg]['Package'] not in packageinfo[pkglist[pkg]['Project']]:
+ packageinfo[pkglist[pkg]['Project']].append(pkglist[pkg]['Package'])
+ return packageinfo
+
+ return pkglist
+
+ def get_project_binary_list(self, project, repository, arch, package_binaries={}):
+ """
+ Returns binarylist of a project
+ """
+
+ # Use pool repository for SUSE namespace project.
+ # Because RPMs were injected to pool repository on OBS rather than
+ # standard repository.
+ if project.startswith('SUSE:'):
+ repository = 'pool'
+
+ path = ['build', project, repository, arch]
+ url = makeurl(self.apiurl, path, {'view': 'binaryversions'})
+ root = ET.parse(http_GET(url)).getroot()
+
+ for binary_list in root:
+ package = binary_list.get('package')
+ package = package.split(':', 1)[0]
+ index = project + "_" + package
+
+ if index not in package_binaries:
+ package_binaries[index] = []
+ for binary in binary_list:
+ filename = binary.get('name')
+ result = re.match(osclib.core.RPM_REGEX, filename)
+ if not result:
+ continue
+
+ if result.group('arch') == 'src' or result.group('arch') == 'nosrc':
+ continue
+ if result.group('name').endswith('-debuginfo') or result.group('name').endswith('-debuginfo-32bit'):
+ continue
+ if result.group('name').endswith('-debugsource'):
+ continue
+
+ if result.group('name') not in package_binaries[index]:
+ package_binaries[index].append(result.group('name'))
+
+ return package_binaries
+
+ def exception_package(self, package):
+ """
+ Do not skip the package if matches the condition.
+ package parameter is source package name.
+ """
+
+ if '-bootstrap' in package or\
+ 'Tumbleweed' in package or\
+ 'metis' in package:
+ return True
+ # These packages must have a good reason not to be single-speced
+ # from one source.
+ if package.startswith('python2-') or\
+ package.startswith('python3'):
+ return True
+ return False
+
+ def exception_binary(self, package):
+ """
+ Do not skip the binary if matches the condition
+ package parameter is RPM filename.
+ """
+
+ if package == 'openSUSE-release' or\
+ package == 'openSUSE-release-ftp' or\
+ package == 'openSUSE-Addon-NonOss-release':
+ return True
+ return False
+
+ def crawl(self):
+ """Main method"""
+
+ leap_pkglist = self.get_packagelist(self.opensuse_project)
+ sle_pkglist = self.get_packagelist(self.sle_project, by_project=False)
+ # The selected_binarylist[] includes the latest sourcepackage list
+ # binary RPMs from the latest sources need to be presented in ftp eventually
+ selected_binarylist = []
+ # Any existed binary RPMs from any SPx/Leap/Backports
+ fullbinarylist = []
+ # package_binaries[] is a pre-formated binarylist per each package
+ # access to the conotent uses package_binaries['SUSE:SLE-15:Update_libcdio.12032']
+ package_binaries = {}
+
+ # Inject binarylist to a list per package name no matter what archtectures was
+ for arch in SUPPORTED_ARCHS:
+ for prj in leap_pkglist.keys():
+ package_binaries = self.get_project_binary_list(prj, DEFAULT_REPOSITORY, arch, package_binaries)
+
+ for pkg in package_binaries.keys():
+ if not self.exception_package(pkg):
+ fullbinarylist += package_binaries[pkg]
+
+ for prj in leap_pkglist.keys():
+ for pkg in leap_pkglist[prj]:
+ cands = [prj + "_" + pkg]
+ # Handling for SLE forks, or package has different multibuild bits
+ # enablility between SLE and openSUSE
+ if prj.startswith('openSUSE:') and pkg in sle_pkglist and\
+ not self.is_sle_specific(pkg):
+ cands.append(sle_pkglist[pkg]['Project'] + "_" + sle_pkglist[pkg]['Package'])
+ logging.debug(cands)
+ for index in cands:
+ if index in package_binaries:
+ selected_binarylist += package_binaries[index]
+ else:
+ logging.info("Can not find binary of %s" % index)
+
+ # Some packages has been obsoleted by new updated package, however
+ # there are application still depend on old library when it builds
+ # eg. SUSE:SLE-15-SP3:GA has qpdf/libqpdf28 but cups-filter was build
+ # in/when SLE15 SP2 which requiring qpdf/libqpdf6, therefore old
+ # qpdf/libqpdf6 from SLE15 SP2 should not to be missed.
+ extra_packagelist = [
+ # gnome-software requirement
+ 'SUSE:SLE-15-SP2:Update_libxmlb.15999',
+ # cups-filter requirement
+ 'SUSE:SLE-15-SP2:GA_qpdf',
+ # libcdio_paranoia2 requirement
+ 'SUSE:SLE-15:Update_libcdio.12032',
+ # libstoken1 requirement
+ 'SUSE:SLE-15:Update_libnettle.19992',
+ # python2-Pillow requirement
+ 'SUSE:SLE-15:Update_libwebp.19719',
+ # amarok requirement
+ 'SUSE:SLE-15:Update_mariadb.20531',
+ # bogofilter requirement
+ 'SUSE:SLE-15:GA_gsl',
+ # gnome-builder requirement
+ 'SUSE:SLE-15-SP2:GA_vala',
+ # hfst-ospell requirement
+ 'SUSE:SLE-15:Update_icu.14528'
+ ]
+ for pkg in extra_packagelist:
+ selected_binarylist += package_binaries[pkg]
+
+ # Preparing a packagelist for the skipping candidate
+ obsoleted = []
+ for pkg in fullbinarylist:
+ if pkg not in selected_binarylist and pkg not in obsoleted:
+ if not self.exception_binary(pkg):
+ obsoleted.append(pkg)
+
+ # Post processing of obsoleted packagelist
+ tmp_obsoleted = obsoleted.copy()
+ for pkg in tmp_obsoleted:
+ # Respect to single-speced python package, when a python2 RPM is
+ # considered then a python3 flavor should also be selected to be
+ # skipped, if not, don't add it.
+ if pkg.startswith('python2-') and re.sub(r'^python2', 'python3', pkg) not in obsoleted:
+ obsoleted.remove(pkg)
+ # Main RPM must to be skipped if -32 bit RPM or -64bit RPM is
+ # considered.
+ if pkg.endswith('-32bit') or pkg.endswith('-64bit'):
+ main_filename = re.sub('-[36][24]bit', '', pkg)
+ if main_filename not in obsoleted:
+ obsoleted.remove(pkg)
+
+ skip_list = ET.Element('group', {'name': 'NON_FTP_PACKAGES'})
+ ET.SubElement(skip_list, 'conditional', {'name': 'drop_from_ftp'})
+ packagelist = ET.SubElement(skip_list, 'packagelist', {'relationship': 'requires'})
+ for pkg in sorted(obsoleted):
+ if not self.print_only and self.verbose:
+ print(pkg)
+ attr = {'name': pkg}
+ ET.SubElement(packagelist, 'package', attr)
+ if not self.print_only:
+ source_file_ensure(self.apiurl, self.opensuse_project, META_PACKAGE, 'NON_FTP_PACKAGES.group',
+ ET.tostring(skip_list, pretty_print=True, encoding='unicode'),
+ 'Update the skip list')
+ else:
+ print(ET.tostring(skip_list, pretty_print=True,
+ encoding='unicode'))
+
+
+def main(args):
+ osc.conf.get_config(override_apiurl=args.apiurl)
+ osc.conf.config['debug'] = args.debug
+
+ if args.opensuse_project is None or args.sle_project is None:
+ print("Please pass --opensuse-project and --sle-project argument. See usage with --help.")
+ quit()
+
+ uc = SkippkgFinder(args.opensuse_project, args.sle_project, args.print_only, args.verbose)
+ uc.crawl()
+
+
+if __name__ == '__main__':
+ description = 'Overwrites NON_FTP_PACKAGES.group according to the latest sources. '\
+ 'This tool only works for Leap after CtLG implemented.'
+ parser = argparse.ArgumentParser(description=description)
+ parser.add_argument('-A', '--apiurl', metavar='URL', help='API URL')
+ parser.add_argument('-d', '--debug', action='store_true',
+ help='print info useful for debuging')
+ parser.add_argument('-o', '--opensuse-project', dest='opensuse_project', metavar='OPENSUSE_PROJECT',
+ help='openSUSE project on buildservice')
+ parser.add_argument('-s', '--sle-project', dest='sle_project', metavar='SLE_PROJECT',
+ help='SLE project on buildservice')
+ parser.add_argument('-p', '--print-only', action='store_true',
+ help='show the result instead of the uploading')
+ parser.add_argument('-v', '--verbose', action='store_true',
+ help='show the diff')
+
+ args = parser.parse_args()
+
+ logging.basicConfig(level=logging.DEBUG if args.debug
+ else logging.INFO)
+
+ sys.exit(main(args))
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.NbnALe/_old 2021-08-31 19:56:33.630027448 +0200
+++ /var/tmp/diff_new_pack.NbnALe/_new 2021-08-31 19:56:33.630027448 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20210820.43b07171
-mtime: 1629445746
-commit: 43b07171ad85c0edbf2f11ec0853a32672e378d3
+version: 20210831.0de63caa
+mtime: 1630399884
+commit: 0de63caa85db778ad9f6909093f87bedb11cad02
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package bibletime for openSUSE:Factory checked in at 2021-08-31 19:55:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bibletime (Old)
and /work/SRC/openSUSE:Factory/.bibletime.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bibletime"
Tue Aug 31 19:55:37 2021 rev:20 rq:915208 version:3.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/bibletime/bibletime.changes 2021-08-10 10:27:47.829789534 +0200
+++ /work/SRC/openSUSE:Factory/.bibletime.new.1899/bibletime.changes 2021-08-31 19:56:29.974022636 +0200
@@ -1,0 +2,12 @@
+Mon Aug 30 20:16:11 UTC 2021 - Cor Blom <cornelis(a)solcon.nl>
+
+- Update to 3.0.2:
+ * Fixed a build-error caused by an C++11 incompatibility (bug #332)
+ * Fixed copying of text disabled with Qt versions earlier than than
+ 5.13 (bug #334)
+ * Fixed some undefined behavior and out-of-bounds memory errors
+ * Fixed missing documentation in Windows
+ * Updated translations
+ * Added ability to copy docs into build during install and packaging
+
+-------------------------------------------------------------------
Old:
----
bibletime-3.0.1.tar.xz
New:
----
bibletime-3.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bibletime.spec ++++++
--- /var/tmp/diff_new_pack.bIT0C3/_old 2021-08-31 19:56:30.506023301 +0200
+++ /var/tmp/diff_new_pack.bIT0C3/_new 2021-08-31 19:56:30.506023301 +0200
@@ -21,7 +21,7 @@
%global __requires_exclude qmlimport\\(BibleTime.*
Name: bibletime
-Version: 3.0.1
+Version: 3.0.2
Release: 0
Summary: A Bible study tool
License: GPL-2.0-or-later
++++++ bibletime-3.0.1.tar.xz -> bibletime-3.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/CMakeLists.txt new/bibletime-3.0.2/CMakeLists.txt
--- old/bibletime-3.0.1/CMakeLists.txt 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/CMakeLists.txt 2021-08-30 21:42:50.000000000 +0200
@@ -46,6 +46,10 @@
install the howto in PDF format if BUILD_HOWTO_PDF is enabled. \
Leave empty use all supported languages.")
+SET(INSTALL_GENERATED_DOCS "OFF" CACHE BOOL
+ "Install generated_docs from a specified path.")
+SET(GENERATED_DOCS_DIR "" CACHE PATH
+ "Path to the checked out generated_docs for this revision of BibleTime")
######################################################
# Misc. settings:
@@ -112,7 +116,7 @@
SET(BT_VERSION_MAJOR "3")
SET(BT_VERSION_MINOR "0")
-SET(BT_VERSION_PATCH "1")
+SET(BT_VERSION_PATCH "2")
SET(BT_VERSION_BUILD "") # Temporarily uncomment this line for release procedures
# Determine build, if needed:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/ChangeLog new/bibletime-3.0.2/ChangeLog
--- old/bibletime-3.0.1/ChangeLog 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/ChangeLog 2021-08-30 21:42:50.000000000 +0200
@@ -1,3 +1,9 @@
+2021-08-30 Jaak Ristioja <jaak(a)ristioja.ee>
+ * Released 3.0.2.
+
+2021-08-09 Gary Holmlund <gw(a)holmlund.org>
+ * Fix bug #334 - Copy text disabled on Bible Time 3.0.1 with Qt less than 5.13
+
2021-07-30 Jaak Ristioja <jaak(a)ristioja.ee>
* Released 3.0.1.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/cmake/BTDocumentation.cmake new/bibletime-3.0.2/cmake/BTDocumentation.cmake
--- old/bibletime-3.0.1/cmake/BTDocumentation.cmake 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/cmake/BTDocumentation.cmake 2021-08-30 21:42:50.000000000 +0200
@@ -24,6 +24,14 @@
######################################################
+
+IF(INSTALL_GENERATED_DOCS)
+ INSTALL(DIRECTORY ${GENERATED_DOCS_DIR}/handbook DESTINATION ${BT_DOCDIR})
+ INSTALL(DIRECTORY ${GENERATED_DOCS_DIR}/howto DESTINATION ${BT_DOCDIR})
+ENDIF()
+
+
+######################################################
# Return if nothing to do:
#
IF(NOT BUILD_DOCS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/handbook/handbook-ko.po new/bibletime-3.0.2/i18n/handbook/handbook-ko.po
--- old/bibletime-3.0.1/i18n/handbook/handbook-ko.po 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/handbook/handbook-ko.po 2021-08-30 21:42:50.000000000 +0200
@@ -3,15 +3,16 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Hanjo Kim <lordmiss(a)gmail.com>, 2020
+# Hanjo Kim <lordmiss(a)gmail.com>, 2020-2021
+# Jaak Ristioja, 2021
# rokmcssu <yaraba(a)daum.net>, 2017
# rokmcssu <yaraba(a)daum.net>, 2017
msgid ""
msgstr ""
"Project-Id-Version: BibleTime\n"
"POT-Creation-Date: 2019-12-22 02:05+0200\n"
-"PO-Revision-Date: 2020-12-27 05:09+0000\n"
-"Last-Translator: Hanjo Kim <lordmiss(a)gmail.com>\n"
+"PO-Revision-Date: 2021-08-30 19:37+0000\n"
+"Last-Translator: Jaak Ristioja\n"
"Language-Team: Korean (http://www.transifex.com/bibletime/bibletime/language/"
"ko/)\n"
"Language: ko\n"
@@ -848,6 +849,12 @@
"scrolling or scroll the other direction press Shift+Up one or more times. "
"Pressing any other key or changing the active window will stop the scrolling."
msgstr ""
+"������ ������ ������������ ������������ ��������� ������������ ���������������. Shift+Down��� ��������� "
+"������������ ���������������. Shift+Down��� ��������� ��������� ��������� ��������� ������ ��� ���������"
+"���. ������������ ������������ ��������������� ������������. ������ ��������� ������ ������������ ������������"
+"��� ��������������� ������ ��������� ���������. ��������� ��������� ������������ ������ ������������ ���������"
+"��������� Shift+Up��� ��������� ���������. ������ ������ ������������ ������ ������������ ��������� ������"
+"������ ������������."
#. type: Content of: <chapter><sect1><sect2><sect3><title>
#: docs/handbook/en/docbook/hdbk-operation.docbook:164
@@ -898,6 +905,9 @@
"commentary by just clicking on any verse. A dialog opens which allows you "
"to add or edit text for that verse."
msgstr ""
+"������������ ������������ ������������ <mousebutton>������</mousebutton> ��������� ������������ ���"
+"������ ���������. ������ ������ ��������� ��� ��������� ��������� ��� ������������. ������ ������ ������ ���"
+"��� ��������������� ��������� ��� ������ ������������ ������������."
#. type: Content of: <chapter><sect1><sect2><sect3><tip><para>
#: docs/handbook/en/docbook/hdbk-operation.docbook:194
@@ -1071,6 +1081,9 @@
"match any single character. The use of parenthesis allows you to group your "
"search terms, e.g. '(Jesus OR spirit) AND God'."
msgstr ""
+"������������������ ��������� ��� ������������: '*' ��� ������ ������ ���������, while '?' ��� ��� ���"
+"��� ��������� ���������������. ��������� ������ '(Jesus OR spirit) AND God' ��� ������ ���������"
+"��� ������ ��� ������������."
#. type: Content of: <chapter><sect1><sect2><sect3><para>
#: docs/handbook/en/docbook/hdbk-operation.docbook:291
@@ -1298,6 +1311,11 @@
"modules). &bibletime; will automatically maintain a list of remote libraries "
"and the works available from them."
msgstr ""
+"��� ������������ ��� ��������� (���������������)��� ������������ ������ ��������� ������ ������ ��������� ���"
+"��� ������������ ��� ������������. ��� ��������������������� ������ (&sword; CD������), ������ ������ "
+"(Crosswire��� ��������� ��������� ������ &sword; ��������� ������������ ������ ���������)��� ��� ���"
+"���������. &bibletime; ��� ������ ������������������ ������ ��� ������������ ������ ��������� ������ ���"
+"������ ������������ ���������������."
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/handbook/en/docbook/hdbk-operation.docbook:413
@@ -1310,6 +1328,12 @@
"click on the <guibutton>Install Works</guibutton>. After the works are "
"installed, click on the <guibutton>Finish</guibutton>."
msgstr ""
+"������ ��������� ��������������� ������ ������ ������������ ������������������ ���������������. ��������� ���"
+"��� <guibutton>������</guibutton> ��������� ���������������. ��� ��� ������ ������ ������������ ���"
+"������ ������������ ������ <guibutton>������</guibutton> ��������� ���������������. ������ ���������"
+"������ ��� ��� ������������. ������ ������������ ������ ������ ��������� ��������������� ������������������"
+"���. ������ ������ ������������ ������ ��������� ������ <guibutton>��� ������</guibutton>��� ������"
+"���������. ������ ��� ������������ <guibutton>������</guibutton>��� ���������������."
#. type: Content of: <chapter><sect1><sect2><title>
#: docs/handbook/en/docbook/hdbk-operation.docbook:424
@@ -1330,7 +1354,7 @@
#. type: Content of: <chapter><sect1><sect2><title>
#: docs/handbook/en/docbook/hdbk-operation.docbook:432
msgid "Remove works"
-msgstr ""
+msgstr "��� ������"
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/handbook/en/docbook/hdbk-operation.docbook:433
@@ -1339,6 +1363,8 @@
"Bookshelf too free up disk space. Simply choose the works` and click on the "
"<guibutton>Remove works</guibutton> button."
msgstr ""
+"��� ��������� ������������ ������ ������ ������ ������ ������ ��������� ��� ��������� ��� ���������. ������ "
+"������ ������������ <guibutton>��� ������</guibutton> ��������� ������������ ���������."
#. type: Content of: <chapter><sect1><title>
#: docs/handbook/en/docbook/hdbk-operation.docbook:440
@@ -2879,7 +2905,7 @@
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1416
msgid "<keycombo action=\"simul\"> <keycap>&Shift;+Down</keycap></keycombo>"
-msgstr ""
+msgstr "<keycombo action=\"simul\"> <keycap>&Shift;+Down</keycap></keycombo>"
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1420
@@ -2887,11 +2913,13 @@
"<menuchoice> <guimenu>View</guimenu> <guimenuitem>Auto scroll down</"
"guimenuitem> </menuchoice>"
msgstr ""
+"<menuchoice> <guimenu>������</guimenu> <guimenuitem>������ ��������� ������</"
+"guimenuitem> </menuchoice>"
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1429
msgid "<keycombo action=\"simul\"> <keycap>&Shift;+Up</keycap></keycombo>"
-msgstr ""
+msgstr "<keycombo action=\"simul\"> <keycap>&Shift;+Up</keycap></keycombo>"
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1433
@@ -2899,11 +2927,13 @@
"<menuchoice> <guimenu>View</guimenu> <guimenuitem>Auto scroll up</"
"guimenuitem> </menuchoice>"
msgstr ""
+"<menuchoice> <guimenu>������</guimenu> <guimenuitem>������ ��������� ���</"
+"guimenuitem> </menuchoice>"
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1442
msgid "<keycombo action=\"simul\"> <keycap>&Space;</keycap> </keycombo>"
-msgstr ""
+msgstr "<keycombo action=\"simul\"> <keycap>&Space;</keycap> </keycombo>"
#. type: Content of: <chapter><sect1><informaltable><tgroup><tbody><row><entry>
#: docs/handbook/en/docbook/hdbk-reference.docbook:1447
@@ -2911,6 +2941,8 @@
"<menuchoice> <guimenu>View</guimenu> <guimenuitem>Auto scroll pause</"
"guimenuitem> </menuchoice>"
msgstr ""
+"<menuchoice> <guimenu>������</guimenu> <guimenuitem>������ ��������� ������</"
+"guimenuitem> </menuchoice>"
#. type: Content of: <chapter><sect1><sect2><title>
#: docs/handbook/en/docbook/hdbk-start.docbook:2
@@ -3027,6 +3059,13 @@
"&bibletime;'s basic features quickly. You will be presented with a list of "
"works that are available from the &cbs; and other repositories;"
msgstr ""
+"<action>������ ������</action>. ��� ������������ ������ ������, ��� ������������ ������ ��������� "
+"��������� ��� ��������� ��� ���������. ��� ��������� ������ ��������� ������������ ������ ������������ ������"
+"���������. <link linkend=\"hdbk-op-bookshelfmanager\">������ ���������</link>���������"
+"��� ��� ��������� ��������� ��� ��� ������������. ������ ��� ������������ ���������������, ��������� ������ "
+"��������� ������, ������, ���������, ��������� ������ ��������� ������������ ������ &bibletime; ��� ���"
+"��� ��������� ��������� ������������ ��������� ��� ������������. $cbs; ��� ������ ��������������� ������ "
+"��������� ������ ������������ ������������ ������������."
#. type: Content of: <chapter><sect1><variablelist><varlistentry><term>
#: docs/handbook/en/docbook/hdbk-start.docbook:66
@@ -3087,7 +3126,7 @@
#. type: Content of the Space entity
#: docs/handbook/en/docbook/index.docbook:14
msgid "Space"
-msgstr ""
+msgstr "������������"
#. type: Content of: <book><bookinfo><title>
#: docs/handbook/en/docbook/index.docbook:24
@@ -3137,12 +3176,12 @@
#. type: Content of: <book><bookinfo><authorgroup><author><firstname>
#: docs/handbook/en/docbook/index.docbook:44
msgid "Gary"
-msgstr ""
+msgstr "Gary"
#. type: Content of: <book><bookinfo><authorgroup><author><surname>
#: docs/handbook/en/docbook/index.docbook:45
msgid "Holmlund"
-msgstr ""
+msgstr "Holmlund"
#. TRANS:ROLES_OF_TRANSLATORS
#. type: Content of: <book><bookinfo>
@@ -3151,6 +3190,8 @@
"<copyright> <year>1999-2019</year> <holder>The &bibletime; Team</holder> </"
"copyright>"
msgstr ""
+"<copyright> <year>1999-2019</year> <holder>The &bibletime; Team</holder> </"
+"copyright>"
#. type: Content of: <book><bookinfo><legalnotice><para>
#: docs/handbook/en/docbook/index.docbook:55
@@ -3161,12 +3202,12 @@
#. type: Content of: <book><bookinfo>
#: docs/handbook/en/docbook/index.docbook:59
msgid "<date>December 2019</date>"
-msgstr ""
+msgstr "<date>2019��� 12���</date>"
#. type: Content of: <book><bookinfo><releaseinfo>
#: docs/handbook/en/docbook/index.docbook:61
msgid "3.0.0+"
-msgstr ""
+msgstr "3.0.0+"
#. type: Content of: <book><bookinfo><abstract><para>
#: docs/handbook/en/docbook/index.docbook:64
@@ -3178,11 +3219,17 @@
"Bible texts, commentaries, dictionaries and books in over 50 languages "
"provided by the &cbs; and several other repositories."
msgstr ""
+"&bibletime; ��� ��������� ������ ������ ������ ���������������������. ��������������� ��������� ���������"
+"��������� &qt; ������������������ ���������������, ���������, ���������, FreeBSD ��������� ���OS��� ���"
+"��� ������������������ ��������� ��� ������������. ��� ������������������ &sword; ������������ ������������"
+"������ ������������ ��������� 900��� ��������� ������ ������ ���������, ������, ������, ��������� ������ "
+"������������ 50��� ��������� ��������� ������������ &cbs; ��������� ������ ��������������� ��������� ��� "
+"������������."
#. type: Content of: <book><bookinfo><keywordset><keyword>
#: docs/handbook/en/docbook/index.docbook:74
msgid "Qt5"
-msgstr ""
+msgstr "Qt5"
#. type: Content of: <book><bookinfo><keywordset><keyword>
#: docs/handbook/en/docbook/index.docbook:75
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/howto/howto-ja.po new/bibletime-3.0.2/i18n/howto/howto-ja.po
--- old/bibletime-3.0.1/i18n/howto/howto-ja.po 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/howto/howto-ja.po 2021-08-30 21:42:50.000000000 +0200
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: BibleTime\n"
"POT-Creation-Date: 2015-02-11 20:30+0100\n"
-"PO-Revision-Date: 2021-06-24 08:08+0000\n"
+"PO-Revision-Date: 2021-08-08 07:16+0000\n"
"Last-Translator: \"Sleepy\" Eutychus\n"
"Language-Team: Japanese (http://www.transifex.com/bibletime/bibletime/"
"language/ja/)\n"
@@ -26,7 +26,7 @@
#. type: Content of: <chapter><title>
#: docs/howto/en/docbook/howto-basics.docbook:2
msgid "Bible Study Basics"
-msgstr "���������������"
+msgstr "���������������������"
#. type: Content of: <chapter><sect1><title>
#: docs/howto/en/docbook/howto-basics.docbook:4
@@ -157,7 +157,7 @@
#: docs/howto/en/docbook/howto-basics.docbook:57
#: docs/howto/en/docbook/index.docbook:53
msgid "Study"
-msgstr "������������"
+msgstr "������"
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/howto/en/docbook/howto-basics.docbook:58
@@ -185,7 +185,7 @@
#. type: Content of: <chapter><sect1><sect2><title>
#: docs/howto/en/docbook/howto-basics.docbook:69
msgid "Memorize"
-msgstr "������������"
+msgstr "������"
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/howto/en/docbook/howto-basics.docbook:70
@@ -199,7 +199,7 @@
#. type: Content of: <chapter><sect1><sect2><title>
#: docs/howto/en/docbook/howto-basics.docbook:75
msgid "Meditate"
-msgstr "������������"
+msgstr "������"
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/howto/en/docbook/howto-basics.docbook:76
@@ -209,10 +209,9 @@
"streams of water, Which yields its fruit in its season, And its leaf does "
"not wither; And in whatever he does, he prospers.</quote>"
msgstr ""
-"������������������������1���2���3��� <quote><b>���</b>���������������������������<br />������������ ���"
-"���������������������������������<br />������������<br />������������������������������������������<br />"
-"���������������������������<br />���������������������<br />������������������������������������������</"
-"quote>"
+"������������������������1���2���3��� <quote>������������������������������������ / ������������ ������������"
+"������������������������ / ������������ / ������������������������������������������ / ������������������������"
+"��� / ��������������������� / ������������������������������������������</quote>"
#. type: Content of: <chapter><sect1><sect2><para>
#: docs/howto/en/docbook/howto-basics.docbook:82
@@ -579,7 +578,7 @@
#. type: Content of: <chapter><sect1><title>
#: docs/howto/en/docbook/howto-importance.docbook:7
msgid "A Book that is Unique"
-msgstr "������������"
+msgstr "������������������"
#. type: Content of: <chapter><sect1><para>
#: docs/howto/en/docbook/howto-importance.docbook:8
@@ -601,8 +600,8 @@
"authorship. It was written over a period of 1600 years by 40 different "
"authors from different backgrounds, yet reads as if written by one."
msgstr ""
-"���������1,600���������������������������������������������������������������������������������40���������������"
-"������������������������������������������������������������������������������������������������������"
+"������������1,600���������������������������������������������������������������������������������40������������"
+"���������������������������������������������������������������������������������������������������������"
#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
#: docs/howto/en/docbook/howto-importance.docbook:21
@@ -1091,7 +1090,7 @@
#. type: Content of: <chapter><sect1><title>
#: docs/howto/en/docbook/howto-importance.docbook:236
msgid "A Book that Wars"
-msgstr "������������"
+msgstr "���������"
#. type: Content of: <chapter><sect1><para>
#: docs/howto/en/docbook/howto-importance.docbook:237
@@ -1192,16 +1191,16 @@
"endless, and excessive devotion to books is wearying to the body.</emphasis>"
"\""
msgstr ""
-"���������������������������������12���11���12���<br />��� <emphasis>������������������������������������"
-"���<br />������������������������������<br />���������������������������������<br />���������������������"
-"������������������������������<br />���������������������������������������������������������<br />���������"
-"���������������������������������������������������<br />������������������������������������������������<br /"
-">���������������������������������������������������</emphasis>���"
+"���������������������������������12���11���12������ <emphasis>��������������������������������������� / "
+"������������������������������ / ��������������������������������� / ������������������������������������������"
+"��������� / ��������������������������������������������������������� / ���������������������������������������"
+"��������������������� / ������������������������������������������������ / ������������������������������������"
+"���������������</emphasis>���"
#. type: Content of: <chapter><sect1><title>
#: docs/howto/en/docbook/howto-importance.docbook:288
msgid "Appendix: \"Once for All\""
-msgstr "������:������������������������"
+msgstr "������:������������������"
#. type: Content of: <chapter><sect1><blockquote><attribution>
#: docs/howto/en/docbook/howto-importance.docbook:290
@@ -1866,8 +1865,8 @@
#: docs/howto/en/docbook/howto-interpretation.docbook:276
msgid "Is.59:1 <quote>The Lord's hand is not short;</quote>"
msgstr ""
-"������������������������������59���1������<quote><b>���</b>������������������������������������������������"
-"</quote>���"
+"������������������������������59���1������<quote>���������������������������������������������������������</"
+"quote>���"
#. type: Content of: <chapter><section><section><para>
#: docs/howto/en/docbook/howto-interpretation.docbook:278
@@ -2053,7 +2052,7 @@
#. type: Content of: <book><bookinfo><abstract><title>
#: docs/howto/en/docbook/index.docbook:39
msgid "Abstract"
-msgstr "������"
+msgstr "���������������"
#. type: Content of: <book><bookinfo><abstract><para>
#: docs/howto/en/docbook/index.docbook:40
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/messages/bibletime_ui_ko.ts new/bibletime-3.0.2/i18n/messages/bibletime_ui_ko.ts
--- old/bibletime-3.0.1/i18n/messages/bibletime_ui_ko.ts 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/messages/bibletime_ui_ko.ts 2021-08-30 21:42:50.000000000 +0200
@@ -819,7 +819,7 @@
<message>
<location filename="../../src/frontend/btaboutdialog.cpp" line="134"/>
<source>(c)1999-2020, The BibleTime Team</source>
- <translation type="unfinished"></translation>
+ <translation>(c)1999-2020, The BibleTime Team</translation>
</message>
<message>
<location filename="../../src/frontend/btaboutdialog.cpp" line="177"/>
@@ -1214,7 +1214,7 @@
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="45"/>
<source>Copy by References</source>
- <translation type="unfinished"></translation>
+ <translation>��������� ������</translation>
</message>
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="57"/>
@@ -1442,12 +1442,12 @@
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="114"/>
<source>%1 KiB</source>
- <translation type="unfinished"></translation>
+ <translation>%1 KiB</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="120"/>
<source>0 KiB</source>
- <translation type="unfinished"></translation>
+ <translation>0 KiB</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/btindexdialog.cpp" line="128"/>
@@ -1578,7 +1578,7 @@
<message>
<location filename="../../src/frontend/btmoduleindexdialog.cpp" line="76"/>
<source><UNKNOWN EXCEPTION></source>
- <translation type="unfinished"></translation>
+ <translation><UNKNOWN EXCEPTION></translation>
</message>
<message>
<location filename="../../src/frontend/btmoduleindexdialog.cpp" line="80"/>
@@ -1927,12 +1927,12 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="118"/>
<source>The currently active window can be auto scrolled up or down. Start scrolling by pressing Shift+Down. You can increase the scrolling speed by pressing Shift+Down multiple times. To pause scrolling press Space. To start scrolling again at the previous speed press Space again. To slow down scrolling or scroll the other direction press Shift+Up one or more times. Pressing any other key or changing the active window will stop the scrolling.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ������������ ������������ ��������� ������������ ���������������. Shift+Down��� ��������� ������������ ���������������. Shift+Down��� ��������� ��������� ��������� ��������� ������ ��� ������������. ������������ ������������ ��������������� ������������. ������ ��������� ������ ������������ ��������������� ��������������� ������ ��������� ���������. ��������� ��������� ������������ ������ ������������ ������������������ Shift+Up��� ��������� ���������. ������ ������ ������������ ������ ������������ ��������� ������������ ������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
<source>To add multiple Bible works in parallel in your active Bible or commentary window select this icon and choose another Bible or commentary work.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ��������� ���������������, ������ ������������ ������ ��������� ��� ������������ ������������ ������ ������ ������ ������ ������ ���������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
@@ -1982,7 +1982,7 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="165"/>
<source>You can save personal notes for specific verse references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source, English as the language, and look under Commentary. Once installed, open it like any other window, or in parallel with a bible. Click a verse to edit it.</source>
- <translation type="unfinished"></translation>
+ <translation>������ ��������� ������������ ������ ��������� ��������� ��� ������������. ��� ��������� ��������������� ������ ������ ��������� ������������ ���������. ������ ������������ ������ ��������� Crosswire, ��������� English��� ������������ ������ ��������� ���������. ������ ������������ ������ ������ ��������� ��������� ��������� ������ ��� ��� ������������. ��������� ������������ ���������������.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
@@ -2378,7 +2378,7 @@
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="119"/>
<source>Did you know? You can help translating the GUI of BibleTime to your language at <a href="https://www.transifex.com/bibletime/bibletime/">Transife….</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������������? BibleTime��� GUI��� ��������� ��������� ������������ ������ <a href="https://www.transifex.com/bibletime/bibletime/">Transife… ������ ��� ������������ .</translation>
</message>
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="219"/>
@@ -2436,7 +2436,7 @@
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="214"/>
<source>Copy by references...</source>
- <translation type="unfinished"></translation>
+ <translation>��������� ������</translation>
</message>
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="218"/>
@@ -3219,22 +3219,22 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="417"/>
<source>Zapotec, San Juan Guelav���</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, San Juan Guelav���</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="420"/>
<source>Zapotec, Amatl��n</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Amatl��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="422"/>
<source>Zapotec, Yal��lag</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Yal��lag</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="425"/>
<source>Zapotec, Quioquitani-Quier��</source>
- <translation type="unfinished"></translation>
+ <translation>Zapotec, Quioquitani-Quier��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="282"/>
@@ -3270,7 +3270,7 @@
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="288"/>
<source>Kekch��</source>
<comment>kek</comment>
- <translation type="unfinished"></translation>
+ <translation>Kekch��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="295"/>
@@ -3355,17 +3355,17 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="325"/>
<source>Mam, Todos Santos Cuchumat��n</source>
- <translation type="unfinished"></translation>
+ <translation>Mam, Todos Santos Cuchumat��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="330"/>
<source>Norwegian Bokm��l</source>
- <translation type="unfinished"></translation>
+ <translation>Norwegian Bokm��l</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="331"/>
<source>Nahuatl, Michoac��n</source>
- <translation type="unfinished"></translation>
+ <translation>Nahuatl, Michoac��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="333"/>
@@ -3545,12 +3545,12 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="223"/>
<source>Chinantec, Ozumac��n</source>
- <translation type="unfinished"></translation>
+ <translation>Chinantec, Ozumac��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="281"/>
<source>Itz��</source>
- <translation type="unfinished"></translation>
+ <translation>Itz��</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="304"/>
@@ -3560,7 +3560,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="348"/>
<source>Otomi, Quer��taro</source>
- <translation type="unfinished"></translation>
+ <translation>Otomi, Quer��taro</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="352"/>
@@ -3571,7 +3571,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="361"/>
<source>Quich��, West Central</source>
- <translation type="unfinished"></translation>
+ <translation>Quich��, West Central</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="381"/>
@@ -3581,7 +3581,7 @@
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="402"/>
<source>Tzotzil, Zinacant��n</source>
- <translation type="unfinished"></translation>
+ <translation>Tzotzil, Zinacant��n</translation>
</message>
<message>
<location filename="../../src/backend/managers/clanguagemgr.cpp" line="414"/>
@@ -4669,7 +4669,7 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="187"/>
<source><UNKNOWN EXCEPTION></source>
- <translation type="unfinished"></translation>
+ <translation><UNKNOWN EXCEPTION></translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="191"/>
@@ -4679,7 +4679,7 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="192"/>
<source>An internal error occurred while executing your search:<br/><br/>%1</source>
- <translation type="unfinished"></translation>
+ <translation>������ ������ ������ ��� ������ ������ ������:<br/><br/>%1</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="243"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/i18n/messages/bibletime_ui_pt_BR.ts new/bibletime-3.0.2/i18n/messages/bibletime_ui_pt_BR.ts
--- old/bibletime-3.0.1/i18n/messages/bibletime_ui_pt_BR.ts 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/i18n/messages/bibletime_ui_pt_BR.ts 2021-08-30 21:42:50.000000000 +0200
@@ -1214,7 +1214,7 @@
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="45"/>
<source>Copy by References</source>
- <translation type="unfinished"></translation>
+ <translation>C��pia por refer��ncias</translation>
</message>
<message>
<location filename="../../src/frontend/btcopybyreferencesdialog.cpp" line="57"/>
@@ -1625,7 +1625,7 @@
<message>
<location filename="../../src/frontend/display/modelview/btqmlinterface.cpp" line="204"/>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>Editar</translation>
</message>
</context>
<context>
@@ -1927,12 +1927,12 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="118"/>
<source>The currently active window can be auto scrolled up or down. Start scrolling by pressing Shift+Down. You can increase the scrolling speed by pressing Shift+Down multiple times. To pause scrolling press Space. To start scrolling again at the previous speed press Space again. To slow down scrolling or scroll the other direction press Shift+Up one or more times. Pressing any other key or changing the active window will stop the scrolling.</source>
- <translation type="unfinished"></translation>
+ <translation>A janela atualmente ativa pode rolar automaticamente para cima ou para baixo. Comece a rolagem pressionando Shift+Down. Voc�� pode aumentar a velocidade de rolagem pressionando Shift+Down v��rias vezes. Para parar a rolagem, pressione Espa��o. Para iniciar a rolagem novamente na velocidade anterior, pressione novamente Espa��o. Para diminuir a velocidade de rolagem ou rolar na outra dire����o, pressione Shift+Up uma ou mais vezes. Pressionar qualquer outra tecla ou mudar a janela ativa ir�� parar a rolagem.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="126"/>
<source>To add multiple Bible works in parallel in your active Bible or commentary window select this icon and choose another Bible or commentary work.</source>
- <translation type="unfinished"></translation>
+ <translation>Para adicionar m��ltiplas obras b��blicas em paralelo em sua B��blia ativa ou janela de coment��rios, selecione este ��cone e escolha outra obra b��blica ou de coment��rios.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="130"/>
@@ -1982,7 +1982,7 @@
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="165"/>
<source>You can save personal notes for specific verse references. You must install the Personal commentary. Open the Bookshelf Manager, choose Crosswire as the source, English as the language, and look under Commentary. Once installed, open it like any other window, or in parallel with a bible. Click a verse to edit it.</source>
- <translation type="unfinished"></translation>
+ <translation>Voc�� pode salvar notas pessoais para refer��ncias de versos espec��ficos. Voc�� deve instalar o Coment��rio pessoal. Abra o Gerente da Estante, escolha Crosswire como fonte, ingl��s como idioma e veja em Coment��rio. Uma vez instalado, abra-o como qualquer outra janela, ou em paralelo com uma b��blia. Clique em um verso para edit��-lo.</translation>
</message>
<message>
<location filename="../../src/frontend/tips/bttipdialog.cpp" line="174"/>
@@ -2378,7 +2378,7 @@
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="119"/>
<source>Did you know? You can help translating the GUI of BibleTime to your language at <a href="https://www.transifex.com/bibletime/bibletime/">Transife….</source>
- <translation type="unfinished"></translation>
+ <translation>Voc�� sabia? Voc�� pode ajudar a traduzir a GUI do BibleTime para seu idioma na <a href="https://www.transifex.com/bibletime/bibletime/"> Transifex</a>.</translation>
</message>
<message>
<location filename="../../src/frontend/settingsdialogs/cdisplaysettings.cpp" line="219"/>
@@ -2436,7 +2436,7 @@
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="214"/>
<source>Copy by references...</source>
- <translation type="unfinished"></translation>
+ <translation>Copiar por refer��ncias ...</translation>
</message>
<message>
<location filename="../../src/frontend/displaywindow/cdisplaywindow.cpp" line="218"/>
@@ -4699,12 +4699,12 @@
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="255"/>
<source>&Manage Indexes...</source>
- <translation type="unfinished"></translation>
+ <translation>&Gerenciar ��ndices...</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="256"/>
<source>Recreate search indexes</source>
- <translation type="unfinished"></translation>
+ <translation>Recriar ��ndices de pesquisa</translation>
</message>
<message>
<location filename="../../src/frontend/searchdialog/csearchdialog.cpp" line="260"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/backend/filters/teitohtml.cpp new/bibletime-3.0.2/src/backend/filters/teitohtml.cpp
--- old/bibletime-3.0.1/src/backend/filters/teitohtml.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/backend/filters/teitohtml.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -127,7 +127,11 @@
//if the osisRef like "GerLut:key" contains a module, use that
int pos = ref.indexOf(":");
- if ((pos >= 0) && ref.at(pos - 1).isLetter() && ref.at(pos + 1).isLetter()) {
+ if ((pos > 0)
+ && (pos < ref.size() - 1)
+ && ref.at(pos - 1).isLetter()
+ && ref.at(pos + 1).isLetter())
+ {
QString newModuleName = ref.left(pos);
hrefRef = ref.mid(pos + 1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/display/modelview/DisplayView.qml new/bibletime-3.0.2/src/frontend/display/modelview/DisplayView.qml
--- old/bibletime-3.0.1/src/frontend/display/modelview/DisplayView.qml 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/display/modelview/DisplayView.qml 2021-08-30 21:42:50.000000000 +0200
@@ -36,6 +36,8 @@
property int column: 0 // Column containing selected text
property int indexFirst: -1 // Index of first delegate item with selected text
property int indexLast: -1 // Index of last delegate item with selected text
+ property Item itemFirst: null // First delegate item with selected text
+ property Item itemLast: null // Last delegate item with selected text
property int textPosFirst: -1 // Position of first selected character
property int textPosLast: -1 // Position of last selected character
@@ -60,6 +62,12 @@
// Save cursor position for later use
mousePressedX = x;
mousePressedY = y;
+
+ if (btQmlInterface.hasSelectedText()) {
+ deselectByItem();
+ return;
+ }
+
var delegateItem = listView.itemAt( x, y + listView.contentY);
if (delegateItem === null)
return;
@@ -90,7 +98,7 @@
column = Math.floor(mousePressedX / (listView.width / listView.columns));
sortMousePoints();
getSelectedTextPositions();
- selectByIndex();
+ selectByItem();
selectionInProgress = true;
}
}
@@ -106,7 +114,7 @@
return;
if (selectionInProgress)
return;
- deselectByIndex();
+ deselectByItem();
if (openPersonalCommentary(mousePressedX, mousePressedY))
return;
if (! isCrossReference(pressedLink))
@@ -147,54 +155,68 @@
return;
indexFirst = listView.indexAt(mouseUL.x, mouseUL.y + listView.contentY);
+ itemFirst = listView.itemAt(mouseUL.x, mouseUL.y + listView.contentY);
var delegateXFirst = listView.contentX + mouseUL.x - firstDelegateItem.x;
var delegateYFirst = listView.contentY + mouseUL.y - firstDelegateItem.y;
textPosFirst = firstDelegateItem.positionAt(delegateXFirst, delegateYFirst, column);
indexLast = listView.indexAt(mouseLR.x, mouseLR.y + listView.contentY);
+ itemLast = listView.itemAt(mouseLR.x, mouseLR.y + listView.contentY);
var delegateXLast = listView.contentX + mouseLR.x - lastDelegateItem.x;
var delegateYLast = listView.contentY + mouseLR.y - lastDelegateItem.y;
textPosLast = lastDelegateItem.positionAt(delegateXLast, delegateYLast, column);
}
- function selectDelegateItem(index, delegateItem) {
- if (delegateItem === null)
+ function selectDelegateItem(index, dItem) {
+ if (dItem === null || dItem === 0)
return;
- if (index === indexFirst && index === indexLast)
- delegateItem.selectSingle(column, textPosFirst, textPosLast);
- else if (index === indexFirst)
- delegateItem.selectFirst(column, textPosFirst);
- else if (index === indexLast)
- delegateItem.selectLast(column, textPosLast);
- else if (index > indexFirst && index < indexLast)
- delegateItem.selectAll(column);
+ if (dItem === itemFirst && dItem === itemLast)
+ dItem.selectSingle(column, textPosFirst, textPosLast);
+ else if (dItem === itemFirst)
+ dItem.selectFirst(column, textPosFirst);
+ else if (dItem === itemLast)
+ dItem.selectLast(column, textPosLast);
+ else if (dItem !== itemFirst && dItem !== itemLast)
+ dItem.selectAll(column);
else
return;
- var columnSelectedText = delegateItem.getSelectedText(column);
+ var columnSelectedText = dItem.getSelectedText(column);
btQmlInterface.saveSelectedText(index, columnSelectedText)
}
- function selectByIndex() {
- if (indexFirst < 0 || indexLast < 0 || indexFirst > indexLast)
- return;
-
- var index;
- for (index = indexFirst; index <= indexLast; index++) {
- var delegateItem = listView.itemAtIndex(index);
- selectDelegateItem(index, delegateItem);
+ function nextItem(currentItem) {
+ var nextY = currentItem.y+currentItem.height+listView.spacing;
+ var nextI = listView.itemAt(currentItem.x, nextY);
+ return nextI;
+ }
+
+ function selectByItem() {
+ var delegateItem = itemFirst;
+ var loopIndex = 0;
+ while (true) {
+ selectDelegateItem(loopIndex, delegateItem);
+ if (delegateItem == itemLast)
+ break;
+ delegateItem = nextItem(delegateItem);
+ loopIndex++;
}
}
- function deselectByIndex() {
- if (indexFirst < 0 || indexLast < 0 || indexFirst > indexLast)
- return;
- var index;
- for (index = indexFirst; index <= indexLast; index++) {
- var delegateItem = listView.itemAtIndex(index);
- if (delegateItem !== null)
- delegateItem.deselect(column);
- }
+ function deselectByItem() {
+ if (itemFirst == null)
+ return;
+ var delegateItem = itemFirst;
+ while (true) {
+ delegateItem.deselect(column);
+ if (delegateItem == itemLast)
+ break;
+ delegateItem = nextItem(delegateItem);
+ }
+ itemFirst = null;
+ itemLast = null
+ column = 0;
+ btQmlInterface.clearSelectedText();
}
function openPersonalCommentary(x, y) {
@@ -309,9 +331,9 @@
delegate: DisplayDelegate {
id: dd
- Component.onCompleted: {
- selectDelegateItem(index, dd);
- }
+// Component.onCompleted: {
+// selectDelegateItem(index, dd);
+// }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/display/modelview/bttextfilter.cpp new/bibletime-3.0.2/src/frontend/display/modelview/bttextfilter.cpp
--- old/bibletime-3.0.1/src/frontend/display/modelview/bttextfilter.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/display/modelview/bttextfilter.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -30,9 +30,7 @@
fixDoubleBR();
if (m_showReferences) {
- int i = 0;
- int count = m_parts.count();
- do {
+ for (int i = 0; i < m_parts.count();) {
QString part = m_parts.at(i);
if (part.startsWith("<") && part.contains("class=\"footnote\"")) {
@@ -48,7 +46,7 @@
} else {
i++;
}
- } while (i < count);
+ }
}
return m_parts.join("");
@@ -96,7 +94,7 @@
// Output: <span class="footnote" note="ESV2011/Luke 11:37/1">1</span>
int BtTextFilter::rewriteFootnoteAsLink(int i, const QString& part) {
- if (i+2 > m_parts.count())
+ if (i + 2 >= m_parts.count())
return 1;
QRegExp rxlen("note=\"([^\"]*)");
@@ -137,6 +135,8 @@
// Typical input: <span lemma="H07225">God</span>
// Output: "<a href="sword://lemmamorph/lemma=H0430||/God" style="color: black">"
int BtTextFilter::rewriteLemmaOrMorphAsLink(int i, const QString& part) {
+ if (i + 2 >= m_parts.count())
+ return 1;
QString value;
QRegExp rx1("lemma=\"([^\"]*)*");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibletime-3.0.1/src/frontend/settingsdialogs/btfontsettings.cpp new/bibletime-3.0.2/src/frontend/settingsdialogs/btfontsettings.cpp
--- old/bibletime-3.0.1/src/frontend/settingsdialogs/btfontsettings.cpp 2021-07-30 18:12:22.000000000 +0200
+++ new/bibletime-3.0.2/src/frontend/settingsdialogs/btfontsettings.cpp 2021-08-30 21:42:50.000000000 +0200
@@ -94,7 +94,7 @@
work.settings.second = newFont;
});
BT_CONNECT(m_languageComboBox,
- qOverload<int>(&QComboBox::currentIndexChanged),
+ QOverload<int>::of(&QComboBox::currentIndexChanged),
[this](int const newIndex) {
auto const i = static_cast<std::size_t>(newIndex);
auto const & p = m_workSettings[i].settings;
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sqlmap for openSUSE:Factory checked in at 2021-08-31 19:55:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sqlmap (Old)
and /work/SRC/openSUSE:Factory/.sqlmap.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sqlmap"
Tue Aug 31 19:55:34 2021 rev:3 rq:915183 version:1.5.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/sqlmap/sqlmap.changes 2021-07-20 15:39:40.897495722 +0200
+++ /work/SRC/openSUSE:Factory/.sqlmap.new.1899/sqlmap.changes 2021-08-31 19:56:29.078021514 +0200
@@ -1,0 +2,7 @@
+Tue Aug 31 05:16:54 UTC 2021 - Steve Kowalik <steven.kowalik(a)suse.com>
+
+- Update fix_shebang.patch to switch Python scripts to calling
+ /usr/bin/python3.
+- Add Requires on python3 for full interpreter.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sqlmap.spec ++++++
--- /var/tmp/diff_new_pack.3F7Bi5/_old 2021-08-31 19:56:29.594022160 +0200
+++ /var/tmp/diff_new_pack.3F7Bi5/_new 2021-08-31 19:56:29.594022160 +0200
@@ -28,6 +28,7 @@
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
+Requires: python3
BuildArch: noarch
%description
++++++ fix_shebang.patch ++++++
--- /var/tmp/diff_new_pack.3F7Bi5/_old 2021-08-31 19:56:29.618022190 +0200
+++ /var/tmp/diff_new_pack.3F7Bi5/_new 2021-08-31 19:56:29.618022190 +0200
@@ -8,48 +8,53 @@
Only in sqlmap-1.5/extra/runcmd/src/runcmd: stdafx.cpp.txt
Only in sqlmap-1.5.ori/extra/runcmd/src/runcmd: stdafx.h
Only in sqlmap-1.5/extra/runcmd/src/runcmd: stdafx.h.txt
-diff --color -rub sqlmap-1.5.ori/extra/shutils/autocompletion.sh sqlmap-1.5/extra/shutils/autocompletion.sh
---- sqlmap-1.5.ori/extra/shutils/autocompletion.sh 2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/extra/shutils/autocompletion.sh 2021-07-01 17:19:46.749860716 +0200
+Index: sqlmap-1.5.7/extra/shutils/autocompletion.sh
+===================================================================
+--- sqlmap-1.5.7.orig/extra/shutils/autocompletion.sh
++++ sqlmap-1.5.7/extra/shutils/autocompletion.sh
@@ -1,4 +1,4 @@
-#/usr/bin/env bash
+#!/usr/bin/bash
# source ./extra/shutils/autocompletion.sh
-diff --color -rub sqlmap-1.5.ori/extra/shutils/duplicates.py sqlmap-1.5/extra/shutils/duplicates.py
---- sqlmap-1.5.ori/extra/shutils/duplicates.py 2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/extra/shutils/duplicates.py 2021-07-01 17:20:26.786475153 +0200
+Index: sqlmap-1.5.7/extra/shutils/duplicates.py
+===================================================================
+--- sqlmap-1.5.7.orig/extra/shutils/duplicates.py
++++ sqlmap-1.5.7/extra/shutils/duplicates.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
# Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
# See the file 'LICENSE' for copying permission
-diff --color -rub sqlmap-1.5.ori/sqlmapapi.py sqlmap-1.5/sqlmapapi.py
---- sqlmap-1.5.ori/sqlmapapi.py 2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/sqlmapapi.py 2021-07-01 17:23:26.465232679 +0200
+Index: sqlmap-1.5.7/sqlmapapi.py
+===================================================================
+--- sqlmap-1.5.7.orig/sqlmapapi.py
++++ sqlmap-1.5.7/sqlmapapi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
"""
Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
-diff --color -rub sqlmap-1.5.ori/sqlmap.py sqlmap-1.5/sqlmap.py
---- sqlmap-1.5.ori/sqlmap.py 2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/sqlmap.py 2021-07-01 17:23:41.313460555 +0200
+Index: sqlmap-1.5.7/sqlmap.py
+===================================================================
+--- sqlmap-1.5.7.orig/sqlmap.py
++++ sqlmap-1.5.7/sqlmap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
"""
Copyright (c) 2006-2021 sqlmap developers (http://sqlmap.org/)
-diff --color -rub sqlmap-1.5.ori/thirdparty/identywaf/identYwaf.py sqlmap-1.5/thirdparty/identywaf/identYwaf.py
---- sqlmap-1.5.ori/thirdparty/identywaf/identYwaf.py 2021-01-03 15:23:40.000000000 +0100
-+++ sqlmap-1.5/thirdparty/identywaf/identYwaf.py 2021-07-01 17:20:49.558824640 +0200
+Index: sqlmap-1.5.7/thirdparty/identywaf/identYwaf.py
+===================================================================
+--- sqlmap-1.5.7.orig/thirdparty/identywaf/identYwaf.py
++++ sqlmap-1.5.7/thirdparty/identywaf/identYwaf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python
++#!/usr/bin/python3
"""
Copyright (c) 2019-2021 Miroslav Stampar (@stamparm), MIT
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package plib for openSUSE:Factory checked in at 2021-08-31 19:55:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plib (Old)
and /work/SRC/openSUSE:Factory/.plib.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plib"
Tue Aug 31 19:55:33 2021 rev:5 rq:915178 version:1.8.5+svn.2173
Changes:
--------
--- /work/SRC/openSUSE:Factory/plib/plib.changes 2019-11-30 10:40:25.740150225 +0100
+++ /work/SRC/openSUSE:Factory/.plib.new.1899/plib.changes 2021-08-31 19:56:28.058020237 +0200
@@ -1,0 +2,5 @@
+Tue Aug 31 06:02:17 UTC 2021 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Disable libssg and libssgaux build to fix (boo#1189887)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plib.spec ++++++
--- /var/tmp/diff_new_pack.8frscW/_old 2021-08-31 19:56:28.750021104 +0200
+++ /var/tmp/diff_new_pack.8frscW/_new 2021-08-31 19:56:28.754021108 +0200
@@ -1,7 +1,7 @@
#
# spec file for package plib
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -84,7 +84,7 @@
%build
autoreconf -fiv
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure --disable-static
+%configure --disable-static --enable-ssg=no --enable-ssgaux=no
make %{?_smp_mflags}
%install
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package umockdev for openSUSE:Factory checked in at 2021-08-31 19:55:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/umockdev (Old)
and /work/SRC/openSUSE:Factory/.umockdev.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "umockdev"
Tue Aug 31 19:55:31 2021 rev:3 rq:915146 version:0.16.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/umockdev/umockdev.changes 2021-05-12 19:33:02.178844880 +0200
+++ /work/SRC/openSUSE:Factory/.umockdev.new.1899/umockdev.changes 2021-08-31 19:56:26.350018099 +0200
@@ -1,0 +2,21 @@
+Thu Aug 26 18:45:30 UTC 2021 - Atri Bhattacharya <badshah400(a)gmail.com>
+
+- Update to version 0.16.2:
+ * Implement pcap control transfer replaying.
+ * Fix Coverity errors.
+ * Fix most valac build warnings.
+- Changes from version 0.16.1:
+ * Fix wrong ioctl constants on ppc64el.
+ * Fix test-umockdev-record failure in some build environments.
+- Changes from version 0.16.0:
+ * Move ioctl emulation from preload library to main test
+ process.
+ * Add test API for custom ioctl and device read/write handlers
+ (gh#martinpitt/umockdev#96, gh#martinpitt/umockdev#128).
+ * Support USB replay from usbmon pcap captures
+ (gh#martinpitt/umockdev#82, gh#martinpitt/umockdev#117).
+ * Support SPI ioctl/read/write record and replay
+ (gh#martinpitt/umockdev#121).
+- New upstream BuildRequires: pkgconfig(libpcap).
+
+-------------------------------------------------------------------
Old:
----
umockdev-0.15.5.tar.xz
New:
----
umockdev-0.16.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ umockdev.spec ++++++
--- /var/tmp/diff_new_pack.tsSYI0/_old 2021-08-31 19:56:26.790018650 +0200
+++ /var/tmp/diff_new_pack.tsSYI0/_new 2021-08-31 19:56:26.790018650 +0200
@@ -19,7 +19,7 @@
%define shlib libumockdev0
%define shlibpre libumockdev-preload0
Name: umockdev
-Version: 0.15.5
+Version: 0.16.2
Release: 0
Summary: Mock hardware devices for creating unit tests and bug reporting
License: LGPL-2.1-or-later
@@ -35,6 +35,7 @@
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(libpcap)
BuildRequires: pkgconfig(libudev)
%description
@@ -101,7 +102,7 @@
%files
%license COPYING
-%doc NEWS README.rst
+%doc NEWS README.md
%{_bindir}/*
%files -n %{shlib}
++++++ umockdev-0.15.5.tar.xz -> umockdev-0.16.2.tar.xz ++++++
++++ 6387 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ibus-typing-booster for openSUSE:Factory checked in at 2021-08-31 19:55:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-typing-booster (Old)
and /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-typing-booster"
Tue Aug 31 19:55:32 2021 rev:64 rq:915150 version:2.14.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster.changes 2021-08-24 10:55:23.160280168 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1899/ibus-typing-booster.changes 2021-08-31 19:56:27.302019291 +0200
@@ -1,0 +2,16 @@
+Mon Aug 30 21:47:02 UTC 2021 - maiku.fabian(a)gmail.com
+
+- Update to 2.14.8
+- Translation update from Weblate (ca, es, it updated)
+- Update emoji annotations from CLDR
+- Add IBus.KEY_KP_Decimal and IBus.KEY_period as a normal/keypad equivalence pair
+- get_string_from_lookup_table_cursor_pos() should return the string in NFC
+ (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/234)
+- If an exception happens when trying to play a sound, catch it.
+- Change default input method for pa from ���pa-inscript2��� to ���pa-inscript2-guru���
+- Make appearance tab narrower if possible (helps especially for the French translations)
+ (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/230)
+- Spellchecking the pre��dit should only spellcheck the part of the preedit which is a word
+ (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/229)
+
+-------------------------------------------------------------------
Old:
----
ibus-typing-booster-2.14.4.tar.gz
inscript2-20210812.tar.gz
New:
----
ibus-typing-booster-2.14.8.tar.gz
inscript2-20210820.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-typing-booster.spec ++++++
--- /var/tmp/diff_new_pack.NVGdym/_old 2021-08-31 19:56:27.794019907 +0200
+++ /var/tmp/diff_new_pack.NVGdym/_new 2021-08-31 19:56:27.798019911 +0200
@@ -15,14 +15,14 @@
#
Name: ibus-typing-booster
-Version: 2.14.4
+Version: 2.14.8
Release: 0
Summary: An input completion utility
License: GPL-3.0+
Group: System/X11/Utilities
URL: https://mike-fabian.github.io/ibus-typing-booster/
Source0: https://github.com/mike-fabian/ibus-typing-booster/releases/download/%{vers…
-Source1: https://releases.pagure.org/inscript2/inscript2-20210812.tar.gz
+Source1: https://releases.pagure.org/inscript2/inscript2-20210820.tar.gz
BuildRequires: ibus-devel
BuildRequires: python3
BuildRequires: python3-devel
++++++ ibus-typing-booster-2.14.4.tar.gz -> ibus-typing-booster-2.14.8.tar.gz ++++++
/work/SRC/openSUSE:Factory/ibus-typing-booster/ibus-typing-booster-2.14.4.tar.gz /work/SRC/openSUSE:Factory/.ibus-typing-booster.new.1899/ibus-typing-booster-2.14.8.tar.gz differ: char 13, line 1
++++++ inscript2-20210812.tar.gz -> inscript2-20210820.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/ChangeLog new/inscript2/ChangeLog
--- old/inscript2/ChangeLog 2021-08-12 03:20:32.000000000 +0200
+++ new/inscript2/ChangeLog 2021-08-20 07:51:10.000000000 +0200
@@ -1,3 +1,8 @@
+20 Aug 2021
+------------------------------
+- Add missing script in pa keymap name
+- Review and modify as needed 'Key Summary' for all keymaps
+
12 Aug 2021
------------------------------
- Fix syntax in mni-inscript2-mtei.mim file.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/gu-inscript2.mim new/inscript2/IM/gu-inscript2.mim
--- old/inscript2/IM/gu-inscript2.mim 2021-05-27 16:37:08.000000000 +0200
+++ new/inscript2/IM/gu-inscript2.mim 2021-08-20 04:48:54.000000000 +0200
@@ -31,24 +31,6 @@
ZWJ AltGr + 1
ZWNJ AltGr + 2
��� AltGr + 4
-
-Key summary :-
-1. ��������� : %
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. p + d + }
-2. ��������� : ^
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. l + d + j
-
-3. ��������� : &
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. k + d + <
-
-4. ��������� : *
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. M + d + j
-
-Key summary: Ankitkumar Rameshchandra Patel <ankit(a)redhat.com>
")
(title "���")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/hi-inscript2.mim new/inscript2/IM/hi-inscript2.mim
--- old/inscript2/IM/hi-inscript2.mim 2021-05-27 09:32:32.000000000 +0200
+++ new/inscript2/IM/hi-inscript2.mim 2021-08-20 04:49:12.000000000 +0200
@@ -31,24 +31,6 @@
ZWJ AltGr + 1
ZWNJ AltGr + 2
��� AltGr + 4
-
-Key Summary:
-1. ��������� : %
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. p + d + }
-2. ��������� : ^
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. l + d + j
-
-3. ��������� : &
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. k + d + <
-
-4. ��������� : *
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. M + d + j
-
-Key summary: Rajesh Ranjan <rranjan(a)redhat.com>
")
(title "���")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/kn-inscript2.mim new/inscript2/IM/kn-inscript2.mim
--- old/inscript2/IM/kn-inscript2.mim 2021-05-27 16:52:59.000000000 +0200
+++ new/inscript2/IM/kn-inscript2.mim 2021-08-20 07:03:39.000000000 +0200
@@ -53,20 +53,8 @@
\"������������\" : ��� + ��� + ��� +���
o + d + i + e
-6) \"ksha\" : k + halant + sha
- \"���������\" : ��� + ��� + ���
- k + d + < [OR] &
-
-7) \"thra\": th + halant + r + a
- \"���������\" : ��� + ��� +���
- l + d + j [OR] ^
-
-8) \"jna\" : j + halant + na
- \"���������\" : ��� + ��� + ���
- p + d + } [OR] %
-
-9) ZWJ is assigned to key 'Alt_Gr+1'
- ZWNJ is assigned to key 'Alt_Gr+2'
+6) ZWJ is assigned to key 'AltGr+1'
+ ZWNJ is assigned to key 'AltGr+2'
Key summary: Shankar Prasad <svenkate(a)redhat.com>
")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/ks-inscript2-deva.mim new/inscript2/IM/ks-inscript2-deva.mim
--- old/inscript2/IM/ks-inscript2-deva.mim 2021-08-09 09:28:09.000000000 +0200
+++ new/inscript2/IM/ks-inscript2-deva.mim 2021-08-20 04:49:38.000000000 +0200
@@ -32,23 +32,6 @@
ZWNJ AltGr + 2
��� AltGr + 4
-Key Summary:
-1. ��������� : %
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. p + d + }
-2. ��������� : ^
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. l + d + j
-
-3. ��������� : &
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. k + d + <
-
-4. ��������� : *
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. M + d + j
-
-Key summary: Rajesh Ranjan <rranjan(a)redhat.com>
")
(title "���")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/ml-inscript2.mim new/inscript2/IM/ml-inscript2.mim
--- old/inscript2/IM/ml-inscript2.mim 2021-05-27 09:33:35.000000000 +0200
+++ new/inscript2/IM/ml-inscript2.mim 2021-08-20 07:07:27.000000000 +0200
@@ -37,47 +37,47 @@
Case 1:
CHILLU aksharam:
(i) ��������� = ��� + ��� + zero width joiner(zwj)
-ie, key 'V' + key 'd' + key <AltGr+1>
+ie, key 'v' + key 'd' + key <AltGr+1>
(ii) ��������� = ��� + ��� + zero width joiner(zwj)
-ie, key 'N' + key 'd' + key <AltGr+1>
+ie, key 'n' + key 'd' + key <AltGr+1>
(iii) ��������� = ��� + ��� + zero width joiner(zwj)
-ie, key 'J' + key 'd' + key <AltGr+1>
+ie, key 'j' + key 'd' + key <AltGr+1>
(iv) ��������� = ��� + ��� + zero width joiner(zwj)
-ie, shift key 'C' + key 'd' + key <AltGr+1>
+ie, shift key 'c' + key 'd' + key <AltGr+1>
(v) ��������� = ��� + ��� + zero width joiner(zwj)
-ie, shift key 'N' + key 'd' + key <AltGr+1>
+ie, shift key 'n' + key 'd' + key <AltGr+1>
Case 2:
(i) ��������� = ��� + ��� + ���
-ie, shift key 'U' + key 'd' + key 'K'
+ie, shift key 'u' + key 'd' + key 'k'
(ii) ��������� = ��� + ��� + ���
-ie, key 'V' + key 'd' + key 'L'
+ie, key 'v' + key 'd' + key 'l'
(iii) ��������� = ��� + ��� + ���
ie, shift key '}' + key 'd' + key ';'
(iv) ��������� = ��� + ��� + ���
-ie, shift key 'C' + key 'd' + key '\"'
+ie, shift key 'c' + key 'd' + key '\''
(v) ��������� = ��� + ��� + ���
-ie, key 'V' + key 'd' + key 'H'
+ie, key 'v' + key 'd' + key 'h'
(vi) ��������� = ��� + ��� + ���
-ie, key 'C' + key 'd' + shift key '<'
+ie, key 'c' + key 'd' + shift key ','
Case 3:
Koottaksharangal:
(i) ��������� = ��� + ��� + ���
-ie, key 'K' + key 'd' + key 'K'
+ie, key 'k' + key 'd' + key 'k'
(ii) ��������� = ��� + ��� + ���
-ie, shift key 'U' + key 'd' + shift key 'U'
+ie, shift key 'u' + key 'd' + shift key 'u'
(iii) ��������� = ��� + ��� + ���
ie, key ';' + key 'd' + key ';'
@@ -86,60 +86,60 @@
ie, shift key '}' + key 'd' + shift key '}'
(v) ��������� = ��� + ��� + ���
-ie, key '\"' + key 'd' + key '\"'
+ie, key '\'' + key 'd' + key '\''
(vi) ��������� = ��� + ��� + ���
-ie, shift key 'C' + key 'd' + shift key 'C'
+ie, shift key 'c' + key 'd' + shift key 'c'
(vii) ��������� = ��� + ��� + ���
-ie, key 'L' + key 'd' + key 'L'
+ie, key 'l' + key 'd' + key 'l'
(viii) ��������� = ��� + ��� + ���
-ie, key 'V' + key 'd' + key 'V'
+ie, key 'v' + key 'd' + key 'v'
(ix) ��������� = ��� + ��� + ���
-ie, key 'C' + key 'd' + key 'C'
+ie, key 'c' + key 'd' + key 'c'
(x) ��������� = ��� + ��� + ���
-ie, key 'N' + key 'd' + key 'N'
+ie, key 'n' + key 'd' + key 'n'
(xi) ��������� = ��� + ��� + ���
-ie, key 'B' + key 'd' + key 'B'
+ie, key 'b' + key 'd' + key 'b'
(xii) ��������� = ��� + ��� + ���
-ie, key '?' + key 'd' + key '?'
+ie, key '/' + key 'd' + key '/'
(xiii) ��������� = ��� + ��� + ���
-ie, shift key 'M' + key 'd' + shift key 'M'
+ie, shift key 'm' + key 'd' + shift key 'm'
(xiv) ��������� = ��� + ��� + ���
-ie, key 'M' + key 'd' + key 'M'
+ie, key 'm' + key 'd' + key 'm'
(xv) ��������� = ��� + ��� + ���
-ie, shift key 'N' + key 'd' + shift key 'N'
+ie, shift key 'n' + key 'd' + shift key 'n'
(xvi) ��������� = ��� + ��� + ���
-ie, shift key 'J' + key 'd' + shift key 'J'
+ie, shift key 'j' + key 'd' + shift key 'j'
Case 4:
(Following conjuncts are explained with the help of consonant '���')
(1) Conjuncts formed with ��� (ra):
��������� = ��� + ��� + ���
-ie, key 'K' + key 'd' + key 'J'
+ie, key 'k' + key 'd' + key 'j'
(2) Conjuncts formed with ��� (ya):
��������� = ��� + ��� + ���
-ie, key 'K' + key 'd' + key '?'
+ie, key 'k' + key 'd' + key '/'
(3) Conjuncts formed with ��� (va):
��������� = ��� + ��� + ���
-ie, key 'K' + key 'd' + key 'B'
+ie, key 'k' + key 'd' + key 'b'
Special case:
��������� = ��� + ��� + ���
-ie, key 'V' + key 'd' + shift key 'J'
+ie, key 'v' + key 'd' + shift key 'j'
Author: Ani Peter <apeter(a)redhat.com>
")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/mr-inscript2.mim new/inscript2/IM/mr-inscript2.mim
--- old/inscript2/IM/mr-inscript2.mim 2021-05-27 14:43:02.000000000 +0200
+++ new/inscript2/IM/mr-inscript2.mim 2021-08-20 05:47:42.000000000 +0200
@@ -31,24 +31,6 @@
ZWJ AltGr + 1
ZWNJ AltGr + 2
��� AltGr + 4
-
-Key Summary:
-1. ��������� : %
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. p + d + }
-2. ��������� : ^
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. l + d + j
-
-3. ��������� : &
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. k + d + <
-
-4. ��������� : *
- This can also be typed as a sequence of following:
- ��� + ��� + ��� i.e. M + d + j
-
-Key summary: Rahul Bhalerao <rbhalera(a)redhat.com>
")
(title "���")
@@ -82,9 +64,13 @@
("$" "������")
("4" "���")
((G-4) "���")
+ ("%" "���������")
("5" "���")
+ ("^" "���������")
("6" "���")
+ ("&" "���������")
("7" "���")
+ ("*" "���������")
("8" "���")
("(" "(")
("9" "���")
@@ -167,10 +153,6 @@
("." ".")
((G-.) "���")
("/" "���")
- ("%" "���������")
- ("^" "���������")
- ("&" "���������")
- ("*" "���������")
("|" "���")
("\\" "���")
))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/or-inscript2.mim new/inscript2/IM/or-inscript2.mim
--- old/inscript2/IM/or-inscript2.mim 2021-08-12 03:18:08.000000000 +0200
+++ new/inscript2/IM/or-inscript2.mim 2021-08-20 04:52:00.000000000 +0200
@@ -31,25 +31,6 @@
ZWJ AltGr + 1
ZWNJ AltGr + 2
��� AltGr + 4
-
-Key Summary:
-1. ��������� : %
-This can also be typed as a sequence of following:
-��� + ��� + ��� i.e. p + d + }
-
-2. ��������� : ^
-This can also be typed as a sequence of following:
-��� + ��� + ��� i.e. l + d + j
-
-3. ��������� : &
-This can also be typed as a sequence of following:
-��� + ��� + ��� i.e. k + d + <
-
-4. ��������� : *
-This can also be typed as a sequence of following:
-��� + ��� + ��� i.e. M + d + j
-
-Key summary: Subhransu Behera <sbehera(a)redhat.com>
")
(title "���")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/pa-inscript2-guru.mim new/inscript2/IM/pa-inscript2-guru.mim
--- old/inscript2/IM/pa-inscript2-guru.mim 2021-05-27 08:35:19.000000000 +0200
+++ new/inscript2/IM/pa-inscript2-guru.mim 2021-08-20 07:23:44.000000000 +0200
@@ -18,7 +18,7 @@
;;
;; Author: Parag Nemade <pnemade(a)redhat.com>
-(input-method pa inscript2)
+(input-method pa inscript2-guru)
(description "Punjabi input method for enhanced inscript layout.
@@ -35,10 +35,6 @@
Key summary:
Some complex Characters
-x=���
-$=���
->=���
-/=���
d=��� (halant to type Parian character like Ra/Ha)
The conjuncts called HALANT letters can be used using the following keys:
@@ -52,7 +48,7 @@
ie, key 'K' + key 'd' + key 'b'
(iv) Consonant + YA
-ie, key 'K' + key 'd' + key '/'
+ie, key 'K' + key 'd' + key '/'
Key summary: AP Singh Brar <apbrar(a)gmail.com>, Jaswinder Singh <jsingh(a)redhat.com>
")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/sd-inscript2-deva.mim new/inscript2/IM/sd-inscript2-deva.mim
--- old/inscript2/IM/sd-inscript2-deva.mim 2021-05-27 14:22:06.000000000 +0200
+++ new/inscript2/IM/sd-inscript2-deva.mim 2021-08-20 05:01:12.000000000 +0200
@@ -31,22 +31,6 @@
ZWJ AltGr + 1
ZWNJ AltGr + 2
��� AltGr + 4
-
-Key Summary:
-��� :
- This characters can be typed using [��� + '_'(underscore)] or
- ['i' + '_'] or ['���'+ ���]
-��� :
- This characters can be typed using ��� + '_'(underscore)] or
- ['p' + '_'] or ['���'+ ���]
-��� :
- This characters can be typed using ��� + '_'(underscore)] or
- ['[' + '_'] or ['���'+ ���]
-��� :
- This characters can be typed using ��� + '_'(underscore)] or
- ['y' + '_'] or ['���'+ ���]
-
-Key summary: Pravin Satpute <psatpute(a)redhat.com>
")
(title "���")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inscript2/IM/te-inscript2.mim new/inscript2/IM/te-inscript2.mim
--- old/inscript2/IM/te-inscript2.mim 2021-08-03 08:03:04.000000000 +0200
+++ new/inscript2/IM/te-inscript2.mim 2021-08-20 07:10:25.000000000 +0200
@@ -36,12 +36,10 @@
��� => ������ + ������ + ���
��� => S + ������ + ���
-��������� => ������ + ������ + ���
��������������� => ������ + ������ + ������ + ���
������ => ������ + ������ + ������ + ���
������ => ������ + ��� + ���
������ => ������ + ��� + ���
-��������� => ������ + ������ + ���
������������������ => ������ + ������ + ������ + ���
������������ => ������ + ������ + ���
@@ -95,7 +93,7 @@
("6" "���")
("&" "���������")
("7" "���")
- ("*" "")
+ ("*" "���������")
("8" "���")
("(" "(")
("9" "���")
@@ -184,11 +182,6 @@
("." ".")
((G-.) "���")
("/" "���")
- ("%" "���������")
- ("^" "���������")
- ("&" "���������")
- ("*" "���������")
- ("#" "������")
))
(state
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package coturn for openSUSE:Factory checked in at 2021-08-31 19:55:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/coturn (Old)
and /work/SRC/openSUSE:Factory/.coturn.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coturn"
Tue Aug 31 19:55:30 2021 rev:8 rq:915145 version:4.5.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/coturn/coturn.changes 2021-01-11 17:17:59.864764853 +0100
+++ /work/SRC/openSUSE:Factory/.coturn.new.1899/coturn.changes 2021-08-31 19:56:25.158016607 +0200
@@ -1,0 +2,9 @@
+Mon Aug 30 11:55:53 UTC 2021 - Johannes Segitz <jsegitz(a)suse.com>
+
+- Added hardening to systemd service(s). Added patch(es):
+ * harden_coturn.service.patch
+ Modified:
+ * coturn.service
+ * coturn@.service
+
+-------------------------------------------------------------------
New:
----
harden_coturn.service.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ coturn.spec ++++++
--- /var/tmp/diff_new_pack.RYwl1i/_old 2021-08-31 19:56:26.034017704 +0200
+++ /var/tmp/diff_new_pack.RYwl1i/_new 2021-08-31 19:56:26.034017704 +0200
@@ -40,6 +40,7 @@
Source7: README.SUSE
Source8: %{name}-apparmor-usr.bin.turnserver
Source9: %{name}@.service
+Patch0: harden_coturn.service.patch
BuildRequires: fdupes
BuildRequires: firewall-macros
BuildRequires: libevent-devel >= 2.0.0
++++++ coturn.service ++++++
--- /var/tmp/diff_new_pack.RYwl1i/_old 2021-08-31 19:56:26.118017809 +0200
+++ /var/tmp/diff_new_pack.RYwl1i/_new 2021-08-31 19:56:26.118017809 +0200
@@ -44,6 +44,10 @@
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
RestrictNamespaces=yes
RestrictSUIDSGID=yes
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+RestrictRealtime=true
+# end of automatic additions
SystemCallArchitectures=native
SystemCallFilter=~@clock @debug @module @mount @raw-io @reboot @swap @privileged @resources @cpu-emulation @obsolete
++++++ coturn@.service ++++++
--- /var/tmp/diff_new_pack.RYwl1i/_old 2021-08-31 19:56:26.162017864 +0200
+++ /var/tmp/diff_new_pack.RYwl1i/_new 2021-08-31 19:56:26.162017864 +0200
@@ -44,6 +44,10 @@
RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
RestrictNamespaces=yes
RestrictSUIDSGID=yes
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+RestrictRealtime=true
+# end of automatic additions
SystemCallArchitectures=native
SystemCallFilter=~@clock @debug @module @mount @raw-io @reboot @swap @privileged @resources @cpu-emulation @obsolete
++++++ harden_coturn.service.patch ++++++
Index: coturn-4.5.2/examples/etc/coturn.service
===================================================================
--- coturn-4.5.2.orig/examples/etc/coturn.service
+++ coturn-4.5.2/examples/etc/coturn.service
@@ -15,6 +15,18 @@ ExecStart=/usr/bin/turnserver -c /etc/tu
Restart=on-failure
InaccessibleDirectories=/home
PrivateTmp=yes
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=true
+ProtectHostname=true
+ProtectClock=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+# end of automatic additions
[Install]
WantedBy=multi-user.target
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grpc for openSUSE:Factory checked in at 2021-08-31 19:55:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grpc (Old)
and /work/SRC/openSUSE:Factory/.grpc.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grpc"
Tue Aug 31 19:55:29 2021 rev:38 rq:915134 version:1.39.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/grpc/grpc.changes 2021-07-28 19:21:42.939503628 +0200
+++ /work/SRC/openSUSE:Factory/.grpc.new.1899/grpc.changes 2021-08-31 19:56:24.102015285 +0200
@@ -1,0 +2,12 @@
+Mon Aug 30 18:56:29 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release 1.39.1
+ * Fix C# protoc plugin argument parsing on 1.39.x
+
+-------------------------------------------------------------------
+Mon Aug 30 17:52:56 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Remove cmake's build .log from grpc-source to make
+ build-compare happier.
+
+-------------------------------------------------------------------
Old:
----
v1.39.0.tar.gz
New:
----
v1.39.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grpc.spec ++++++
--- /var/tmp/diff_new_pack.eNY08G/_old 2021-08-31 19:56:24.826016192 +0200
+++ /var/tmp/diff_new_pack.eNY08G/_new 2021-08-31 19:56:24.830016196 +0200
@@ -20,7 +20,7 @@
%define lverp 1
%define src_install_dir /usr/src/%name
Name: grpc
-Version: 1.39.0
+Version: 1.39.1
Release: 0
Summary: HTTP/2-based Remote Procedure Call implementation
License: Apache-2.0
@@ -159,9 +159,10 @@
# Install sources
pushd %__builddir
+rm -fv CMakeFiles/*.log
make clean
-rm -f "b"
-find . -type f "(" -name "*.so" -o -name "*.o" -o -name ".git*" -o -name "*.bin" -o -name "*.out" ")" -exec rm -rf {} +
+find . -type f "(" -name "*.so" -o -name "*.o" -o -name ".git*" -o \
+ -name "*.bin" -o -name "*.out" ")" -exec rm -Rfv {} +
popd
# Don't include abseil-cpp in sources
rm -fr third_party/abseil-cpp/*
++++++ v1.39.0.tar.gz -> v1.39.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/grpc/v1.39.0.tar.gz /work/SRC/openSUSE:Factory/.grpc.new.1899/v1.39.1.tar.gz differ: char 13, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-typer for openSUSE:Factory checked in at 2021-08-31 19:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-typer (Old)
and /work/SRC/openSUSE:Factory/.python-typer.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-typer"
Tue Aug 31 19:55:28 2021 rev:3 rq:915137 version:0.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-typer/python-typer.changes 2021-07-23 23:41:47.161787316 +0200
+++ /work/SRC/openSUSE:Factory/.python-typer.new.1899/python-typer.changes 2021-08-31 19:56:22.558013353 +0200
@@ -1,0 +2,9 @@
+Mon Aug 30 19:31:17 UTC 2021 - Matthias Bach <marix(a)marix.org> - 0.4.0
+
+- Update to upstream version 0.4.0
+ * Add support for Click 8 while keeping compatibility with
+ Click 7.
+- Remove basic-click8-compat.patch as Click 8 compatibility is now
+ provided upstream.
+
+-------------------------------------------------------------------
Old:
----
basic-click8-compat.patch
typer-0.3.2.tar.gz
New:
----
typer-0.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-typer.spec ++++++
--- /var/tmp/diff_new_pack.XFwyff/_old 2021-08-31 19:56:23.118014054 +0200
+++ /var/tmp/diff_new_pack.XFwyff/_new 2021-08-31 19:56:23.122014058 +0200
@@ -19,7 +19,7 @@
%define skip_python2 1
Name: python-typer
-Version: 0.3.2
+Version: 0.4.0
Release: 0
Summary: Typer, build great CLIs. Easy to code. Based on Python type hints
License: MIT
@@ -27,7 +27,6 @@
URL: https://github.com/tiangolo/typer
Source: https://files.pythonhosted.org/packages/source/t/typer/typer-%{version}.tar…
Source1: %{name}-rpmlintrc
-Patch1: basic-click8-compat.patch
BuildRequires: %{python_module click}
BuildRequires: %{python_module coverage}
BuildRequires: %{python_module flit-core}
@@ -51,7 +50,6 @@
%prep
%setup -q -n typer-%{version}
-%patch1 -p1
%build
%python_build
++++++ typer-0.3.2.tar.gz -> typer-0.4.0.tar.gz ++++++
++++ 3568 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-s3transfer for openSUSE:Factory checked in at 2021-08-31 19:55:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-s3transfer (Old)
and /work/SRC/openSUSE:Factory/.python-s3transfer.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-s3transfer"
Tue Aug 31 19:55:28 2021 rev:19 rq:915032 version:0.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-s3transfer/python-s3transfer.changes 2021-08-12 09:00:57.950218038 +0200
+++ /work/SRC/openSUSE:Factory/.python-s3transfer.new.1899/python-s3transfer.changes 2021-08-31 19:56:23.474014499 +0200
@@ -4 +4 @@
-- Update 0.5.0:
+- Update 0.5.0: (bsc#1189649)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
1
0