Mailinglist Archive: opensuse-commit (941 mails)
| < Previous | Next > |
commit yast2-country for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 02 Apr 2012 10:43:31 +0200
- Message-id: <20120402084331.F18FE20227@hilbert.suse.de>
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at 2012-04-02 10:43:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country", Maintainer is "jsuchome@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes
2012-01-19 09:45:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes
2012-04-02 10:43:30.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 29 14:24:10 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofed texts
+- 2.22.5
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.22.4.tar.bz2
New:
----
yast2-country-2.22.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.Vrwxjx/_old 2012-04-02 10:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Vrwxjx/_new 2012-04-02 10:43:31.000000000 +0200
@@ -15,24 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-country
-Version: 2.22.4
+Version: 2.22.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-country-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0
#policy files for YaPI dbus interface
Source1: org.opensuse.yast.modules.yapi.time.policy
Source2: org.opensuse.yast.modules.yapi.language.policy
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-perl-bindings yast2-testsuite
+BuildRequires: perl-XML-Writer
BuildRequires: polkit-devel
-Requires: yast2-trans-stats yast2-perl-bindings timezone yast2-packager
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-perl-bindings
+BuildRequires: yast2-testsuite
+Requires: timezone
+Requires: yast2-packager
+Requires: yast2-perl-bindings
+Requires: yast2-trans-stats
# XVersion.ycp
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
@@ -53,8 +57,12 @@
Obsoletes: yast2-config-keyboard
Obsoletes: yast2-config-language
Obsoletes: yast2-config-timezone
-Provides: yast2-db-country yast2-db-keyboard yast2-db-timezone
-Obsoletes: yast2-db-country yast2-db-keyboard yast2-db-timezone
+Provides: yast2-db-country
+Provides: yast2-db-keyboard
+Provides: yast2-db-timezone
+Obsoletes: yast2-db-country
+Obsoletes: yast2-db-keyboard
+Obsoletes: yast2-db-timezone
Provides: yast2-trans-inst-keyboard
Obsoletes: yast2-trans-inst-keyboard
Provides: yast2-trans-inst-language
@@ -73,6 +81,8 @@
Obsoletes: y2t_inst-environment
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
+License: GPL-2.0
+Group: System/YaST
%description
Country specific data and configuration modules (language, keyboard,
@@ -89,7 +99,6 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
@@ -112,7 +121,6 @@
rm -rf "$RPM_BUILD_ROOT"
# common
-
%files
%defattr(-,root,root)
%doc %{_prefix}/share/doc/packages/yast2-country
++++++ yast2-country-2.22.4.tar.bz2 -> yast2-country-2.22.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-2.22.4/VERSION
new/yast2-country-2.22.5/VERSION
--- old/yast2-country-2.22.4/VERSION 2012-01-12 15:22:56.000000000 +0100
+++ new/yast2-country-2.22.5/VERSION 2012-03-29 14:24:18.000000000 +0200
@@ -1 +1 @@
-2.22.4
+2.22.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp
new/yast2-country-2.22.5/language/src/proposal/language_proposal.ycp
--- old/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp
2012-01-12 09:37:18.000000000 +0100
+++ new/yast2-country-2.22.5/language/src/proposal/language_proposal.ycp
2012-03-29 14:23:43.000000000 +0200
@@ -120,9 +120,9 @@
ret =
$[
// label text
- "rich_text_title" : _( "Language" ),
+ "rich_text_title" : _("Language"),
// menue label text
- "menu_title" : _( "&Language" ),
+ "menu_title" : _("&Language"),
"id" : "language_stuff"
];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-2.22.4/language/src/select_language.ycp
new/yast2-country-2.22.5/language/src/select_language.ycp
--- old/yast2-country-2.22.4/language/src/select_language.ycp 2012-01-12
09:37:18.000000000 +0100
+++ new/yast2-country-2.22.5/language/src/select_language.ycp 2012-03-29
14:23:43.000000000 +0200
@@ -375,7 +375,7 @@
{
// help text, continued
help_text = help_text + _("<p>
-You can select <b>Abort Installation</b> at any time to abort the
+You can select <b>Abort</b> at any time to abort the
installation process.
</p>
");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-2.22.4/timezone/src/dialogs.ycp
new/yast2-country-2.22.5/timezone/src/dialogs.ycp
--- old/yast2-country-2.22.4/timezone/src/dialogs.ycp 2012-01-12
15:22:05.000000000 +0100
+++ new/yast2-country-2.22.5/timezone/src/dialogs.ycp 2012-03-29
14:23:43.000000000 +0200
@@ -31,7 +31,7 @@
* Summary:
* Dialogs for timeone and time configuration.
*
- * $Id: dialogs.ycp 67149 2012-01-12 08:37:15Z jsuchome $
+ * $Id: dialogs.ycp 67162 2012-01-12 14:28:37Z jsuchome $
*/
{
textdomain "country";
@@ -132,7 +132,7 @@
string ntp_help_text = (string) ntp_call("ui_help_text", $[]);
// help text for set time dialog
- string htext = _("<p>The current system time and date are displayed. If
required change them to the correct values manually, or use Network Time
Protocol (NTP).</p>") +
+ string htext = _("<p>The current system time and date are displayed. If
required, change them to the correct values manually or use Network Time
Protocol (NTP).</p>") +
// help text, cont.
_("<p>Press <b>Accept</b> to save your changes.</p>") +
@@ -601,7 +601,7 @@
term hwclock_term = `VBox (
`CheckBox (`id (`hwclock), `opt(`hstretch, `notify),
// check box label
- _("&Hardware Clock Set To UTC"), hwclock == "-u"
+ _("&Hardware Clock Set to UTC"), hwclock == "-u"
),
textmode ? `Label ("") : `Empty ()
);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at 2012-04-02 10:43:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country", Maintainer is "jsuchome@xxxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes
2012-01-19 09:45:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes
2012-04-02 10:43:30.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 29 14:24:10 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofed texts
+- 2.22.5
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.22.4.tar.bz2
New:
----
yast2-country-2.22.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.Vrwxjx/_old 2012-04-02 10:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Vrwxjx/_new 2012-04-02 10:43:31.000000000 +0200
@@ -15,24 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-country
-Version: 2.22.4
+Version: 2.22.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-country-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0
#policy files for YaPI dbus interface
Source1: org.opensuse.yast.modules.yapi.time.policy
Source2: org.opensuse.yast.modules.yapi.language.policy
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-perl-bindings yast2-testsuite
+BuildRequires: perl-XML-Writer
BuildRequires: polkit-devel
-Requires: yast2-trans-stats yast2-perl-bindings timezone yast2-packager
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-perl-bindings
+BuildRequires: yast2-testsuite
+Requires: timezone
+Requires: yast2-packager
+Requires: yast2-perl-bindings
+Requires: yast2-trans-stats
# XVersion.ycp
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
@@ -53,8 +57,12 @@
Obsoletes: yast2-config-keyboard
Obsoletes: yast2-config-language
Obsoletes: yast2-config-timezone
-Provides: yast2-db-country yast2-db-keyboard yast2-db-timezone
-Obsoletes: yast2-db-country yast2-db-keyboard yast2-db-timezone
+Provides: yast2-db-country
+Provides: yast2-db-keyboard
+Provides: yast2-db-timezone
+Obsoletes: yast2-db-country
+Obsoletes: yast2-db-keyboard
+Obsoletes: yast2-db-timezone
Provides: yast2-trans-inst-keyboard
Obsoletes: yast2-trans-inst-keyboard
Provides: yast2-trans-inst-language
@@ -73,6 +81,8 @@
Obsoletes: y2t_inst-environment
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
+License: GPL-2.0
+Group: System/YaST
%description
Country specific data and configuration modules (language, keyboard,
@@ -89,7 +99,6 @@
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
@@ -112,7 +121,6 @@
rm -rf "$RPM_BUILD_ROOT"
# common
-
%files
%defattr(-,root,root)
%doc %{_prefix}/share/doc/packages/yast2-country
++++++ yast2-country-2.22.4.tar.bz2 -> yast2-country-2.22.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-2.22.4/VERSION
new/yast2-country-2.22.5/VERSION
--- old/yast2-country-2.22.4/VERSION 2012-01-12 15:22:56.000000000 +0100
+++ new/yast2-country-2.22.5/VERSION 2012-03-29 14:24:18.000000000 +0200
@@ -1 +1 @@
-2.22.4
+2.22.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp
new/yast2-country-2.22.5/language/src/proposal/language_proposal.ycp
--- old/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp
2012-01-12 09:37:18.000000000 +0100
+++ new/yast2-country-2.22.5/language/src/proposal/language_proposal.ycp
2012-03-29 14:23:43.000000000 +0200
@@ -120,9 +120,9 @@
ret =
$[
// label text
- "rich_text_title" : _( "Language" ),
+ "rich_text_title" : _("Language"),
// menue label text
- "menu_title" : _( "&Language" ),
+ "menu_title" : _("&Language"),
"id" : "language_stuff"
];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-2.22.4/language/src/select_language.ycp
new/yast2-country-2.22.5/language/src/select_language.ycp
--- old/yast2-country-2.22.4/language/src/select_language.ycp 2012-01-12
09:37:18.000000000 +0100
+++ new/yast2-country-2.22.5/language/src/select_language.ycp 2012-03-29
14:23:43.000000000 +0200
@@ -375,7 +375,7 @@
{
// help text, continued
help_text = help_text + _("<p>
-You can select <b>Abort Installation</b> at any time to abort the
+You can select <b>Abort</b> at any time to abort the
installation process.
</p>
");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-2.22.4/timezone/src/dialogs.ycp
new/yast2-country-2.22.5/timezone/src/dialogs.ycp
--- old/yast2-country-2.22.4/timezone/src/dialogs.ycp 2012-01-12
15:22:05.000000000 +0100
+++ new/yast2-country-2.22.5/timezone/src/dialogs.ycp 2012-03-29
14:23:43.000000000 +0200
@@ -31,7 +31,7 @@
* Summary:
* Dialogs for timeone and time configuration.
*
- * $Id: dialogs.ycp 67149 2012-01-12 08:37:15Z jsuchome $
+ * $Id: dialogs.ycp 67162 2012-01-12 14:28:37Z jsuchome $
*/
{
textdomain "country";
@@ -132,7 +132,7 @@
string ntp_help_text = (string) ntp_call("ui_help_text", $[]);
// help text for set time dialog
- string htext = _("<p>The current system time and date are displayed. If
required change them to the correct values manually, or use Network Time
Protocol (NTP).</p>") +
+ string htext = _("<p>The current system time and date are displayed. If
required, change them to the correct values manually or use Network Time
Protocol (NTP).</p>") +
// help text, cont.
_("<p>Press <b>Accept</b> to save your changes.</p>") +
@@ -601,7 +601,7 @@
term hwclock_term = `VBox (
`CheckBox (`id (`hwclock), `opt(`hstretch, `notify),
// check box label
- _("&Hardware Clock Set To UTC"), hwclock == "-u"
+ _("&Hardware Clock Set to UTC"), hwclock == "-u"
),
textmode ? `Label ("") : `Empty ()
);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |