openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2006
- 2 participants
- 169 discussions
Hello community,
here is the log from the commit of package yast2-vm
checked in at Wed Mar 29 16:57:19 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-03-28 15:54:29.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-03-29 15:37:35.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 15:27:15 CEST 2006 - lslezak(a)suse.cz
+
+- use "Xen" term only in the texts (#161737)
+- 2.13.30
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.29.tar.bz2
New:
--…
[View More]--
yast2-vm-2.13.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.Ri1Tr1/_old 2006-03-29 16:56:54.000000000 +0200
+++ /var/tmp/diff_new_pack.Ri1Tr1/_new 2006-03-29 16:56:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.29)
+# spec file for package yast2-vm (Version 2.13.30)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.29
+Version: 2.13.30
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.29.tar.bz2
+Source0: yast2-vm-2.13.30.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak <lslezak(a)suse.cz>
%prep
-%setup -n yast2-vm-2.13.29
+%setup -n yast2-vm-2.13.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,9 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Wed Mar 29 2006 - lslezak(a)suse.cz
+- use "Xen" term only in the texts (#161737)
+- 2.13.30
* Tue Mar 28 2006 - lslezak(a)suse.cz
- x86_64 arch: use x86_64 packages, not i386 (#161267)
- 2.13.29
++++++ yast2-vm-2.13.29.tar.bz2 -> yast2-vm-2.13.30.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.29/VERSION new/yast2-vm-2.13.30/VERSION
--- old/yast2-vm-2.13.29/VERSION 2006-03-28 15:47:19.000000000 +0200
+++ new/yast2-vm-2.13.30/VERSION 2006-03-29 15:28:24.000000000 +0200
@@ -1 +1 @@
-2.13.29
+2.13.30
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.29/src/dom0_setup.ycp new/yast2-vm-2.13.30/src/dom0_setup.ycp
--- old/yast2-vm-2.13.29/src/dom0_setup.ycp 2006-03-27 09:54:30.000000000 +0200
+++ new/yast2-vm-2.13.30/src/dom0_setup.ycp 2006-03-29 15:35:38.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Configure domain0 (Xen management domain)
*
- * $Id: dom0_setup.ycp 29389 2006-03-26 05:40:23Z mgfritch $
+ * $Id: dom0_setup.ycp 29513 2006-03-29 13:32:51Z lslezak $
*/
{
@@ -47,7 +47,7 @@
// xen domain0 installation help text - 3/4
_("<p>GRUB is needed because it supports the multiboot standard required
-to boot the Xen hypervisor and Linux kernel.</p>
+to boot Xen and Linux kernel.</p>
") +
// xen domain0 installation help text - 4/4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed Mar 29 16:56:48 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-03-29 13:34:26.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2006-03-29 16:33:49.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 16:32:59 CEST 2006 - fehr(a)suse.de
+
+- fix problems of EVMS non-EVMS coexistence
+- version 2.13.42
+
+-------------------------------------------------------------------
Old:
----
…
[View More]yast2-storage-2.13.41.tar.bz2
New:
----
yast2-storage-2.13.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.qqKlMY/_old 2006-03-29 16:56:21.000000000 +0200
+++ /var/tmp/diff_new_pack.qqKlMY/_new 2006-03-29 16:56:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.41)
+# spec file for package yast2-storage (Version 2.13.42)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.13.41
+Version: 2.13.42
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.41.tar.bz2
+Source0: yast2-storage-2.13.42.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-storage-2.13.41
+%setup -n yast2-storage-2.13.42
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,6 +165,9 @@
%changelog -n yast2-storage
* Wed Mar 29 2006 - fehr(a)suse.de
+- fix problems of EVMS non-EVMS coexistence
+- version 2.13.42
+* Wed Mar 29 2006 - fehr(a)suse.de
- fix logging initialisation in inst-sys
- version 2.13.41
* Tue Mar 28 2006 - fehr(a)suse.de
++++++ yast2-storage-2.13.41.tar.bz2 -> yast2-storage-2.13.42.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/VERSION new/yast2-storage-2.13.42/VERSION
--- old/yast2-storage-2.13.41/VERSION 2006-03-29 13:33:41.000000000 +0200
+++ new/yast2-storage-2.13.42/VERSION 2006-03-29 16:33:52.000000000 +0200
@@ -1 +1 @@
-2.13.41
+2.13.42
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Disk.cc new/yast2-storage-2.13.42/libstorage/src/Disk.cc
--- old/yast2-storage-2.13.41/libstorage/src/Disk.cc 2006-03-28 13:46:24.000000000 +0200
+++ new/yast2-storage-2.13.42/libstorage/src/Disk.cc 2006-03-29 16:18:20.000000000 +0200
@@ -1634,7 +1634,6 @@
{
getStorage()->showInfoCb( setDiskLabelText(true) );
}
- getStorage()->removeDmMapsTo( device()+".*" );
removePresentPartitions();
system_stderr.erase();
std::ostringstream cmd_line;
@@ -1890,7 +1889,6 @@
{
getStorage()->showInfoCb( p->createText(true) );
}
- getStorage()->removeDmMapsTo( device()+".*" );
system_stderr.erase();
y2milestone( "doCreate container %s name %s", name().c_str(),
p->name().c_str() );
@@ -2060,10 +2058,10 @@
{
getStorage()->showInfoCb( p->removeText(true) );
}
- getStorage()->removeDmMapsTo( device()+".*" );
system_stderr.erase();
y2milestone( "doRemove container %s name %s", name().c_str(),
p->name().c_str() );
+ getStorage()->removeDmMapsTo( getPartName(p->OrigNr()) );
ret = v->prepareRemove();
if( ret==0 && !p->created() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Dm.cc new/yast2-storage-2.13.42/libstorage/src/Dm.cc
--- old/yast2-storage-2.13.41/libstorage/src/Dm.cc 2006-02-07 18:50:49.000000000 +0100
+++ new/yast2-storage-2.13.42/libstorage/src/Dm.cc 2006-03-29 15:37:10.000000000 +0200
@@ -128,7 +128,8 @@
bool Dm::removeTable()
{
- SystemCmd c( "dmsetup remove " + tname );
+ string cmd = "dmsetup remove " + tname;
+ SystemCmd c( cmd );
bool ret = c.retcode()==0;
y2milestone( "ret:%d", ret );
return( ret );
@@ -395,6 +396,7 @@
s << p.shortPrintedName() << " ";
s << *(Volume*)&p;
s << " LE:" << p.num_le;
+ s << " Table:" << p.tname;
if( p.inactiv>1 )
{
s << " inactive";
@@ -452,6 +454,7 @@
stripe = rhs.stripe;
stripe_size = rhs.stripe_size;
inactiv = rhs.inactiv;
+ tname = rhs.tname;
pe_map = rhs.pe_map;
return( *this );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Volume.cc new/yast2-storage-2.13.42/libstorage/src/Volume.cc
--- old/yast2-storage-2.13.41/libstorage/src/Volume.cc 2006-03-28 19:23:25.000000000 +0200
+++ new/yast2-storage-2.13.42/libstorage/src/Volume.cc 2006-03-29 15:51:08.000000000 +0200
@@ -619,6 +619,10 @@
{
ret = checkDevice();
}
+ if( ret==0 )
+ {
+ cont->getStorage()->removeDmTableTo( *this );
+ }
if( ret==0 &&
(Storage::arch().find( "sparc" )!=0 || encryption!=ENC_NONE ))
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package ufraw
checked in at Wed Mar 29 16:55:51 CEST 2006.
--------
--- ufraw/ufraw.changes 2006-03-27 00:23:41.000000000 +0200
+++ ufraw/ufraw.changes 2006-03-29 15:30:01.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Mar 29 15:19:23 CEST 2006 - postadal(a)suse.cz
+
+- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch)
+- updated dcraw to 8.10 (1.320) (wb.patch)
+ * better support the Imacon Ixpress 22-Mp
+ * added WB support for …
[View More]Olympus C5060WZ and C8080WZ
+
+-------------------------------------------------------------------
@@ -4 +12 @@
-- fixed converting old config [ufraw#1456944] (config.patch)
+- fixed converting old config [ufraw#1456944] (config.patch)
New:
----
ufraw-0.7-config2.patch
ufraw-0.7-wb.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ufraw.spec ++++++
--- /var/tmp/diff_new_pack.WoAelJ/_old 2006-03-29 16:55:00.000000000 +0200
+++ /var/tmp/diff_new_pack.WoAelJ/_new 2006-03-29 16:55:00.000000000 +0200
@@ -25,12 +25,14 @@
Suggests: dcraw-gnome
%endif
Version: 0.7.020060326
-Release: 2
+Release: 3
%define vversion 0.7
Summary: The Unidentified Flying Raw
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-0.6-desktop.patch
Patch1: %{name}-0.7-config.patch
+Patch2: %{name}-0.7-config2.patch
+Patch3: %{name}-0.7-wb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -67,6 +69,8 @@
%setup -q -n %{name}
%patch
%patch1
+%patch2
+%patch3
%build
%{suse_update_config -f}
@@ -106,6 +110,11 @@
%_gimpplugindir/plug-ins/
%changelog -n ufraw
+* Wed Mar 29 2006 - postadal(a)suse.cz
+- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch)
+- updated dcraw to 8.10 (1.320) (wb.patch)
+ * better support the Imacon Ixpress 22-Mp
+ * added WB support for Olympus C5060WZ and C8080WZ
* Mon Mar 27 2006 - postadal(a)suse.cz
- fixed converting old config [ufraw#1456944] (config.patch)
* Sun Mar 26 2006 - postadal(a)suse.cz
++++++ ufraw-0.7-config2.patch ++++++
--- ufraw_conf.c
+++ ufraw_conf.c
@@ -878,6 +880,10 @@
dst->temperature = src->temperature;
dst->green = src->green;
for (i=0; i<4; i++) dst->chanMul[i] = src->chanMul[i];
+ /* make and model are 'part of' ChanMul,
+ * since on different make and model ChanMul are meaningless */
+ g_strlcpy(dst->make, src->make, max_name);
+ g_strlcpy(dst->model, src->model, max_name);
dst->exposure = src->exposure;
dst->saturation = src->saturation;
dst->black = src->black;
--- dcraw_api.c
+++ dcraw_api.c
@@ -398,7 +398,7 @@
if (interpolation==dcraw_ahd_interpolation && h->colors > 3)
interpolation = dcraw_vng_interpolation;
f4 = h->fourColorFilters;
- if (rgbWB[3]==0) rgbWB[3] = rgbWB[1];
+ if (h->colors==3) rgbWB[3] = rgbWB[1];
for(r=0; r<h->height; r++)
for(c=0; c<h->width; c++)
f->image[r*f->width+c][FC(ff,r,c)] = MIN( MAX( (gint64)
++++++ ufraw-0.7-wb.patch ++++++
--- dcraw.c
+++ dcraw.c
@@ -19,8 +19,8 @@
copy them from an earlier, non-GPL Revision of dcraw.c, or (c)
purchase a license from the author.
- $Revision: 1.319 $
- $Date: 2006/03/24 07:03:04 $
+ $Revision: 1.320 $
+ $Date: 2006/03/29 02:44:05 $
*/
#define _GNU_SOURCE
@@ -3898,8 +3898,11 @@
case 46275:
strcpy (make, "Imacon");
data_offset = ftell(ifp);
- raw_width = 4090;
- raw_height = len / raw_width / 2;
+ break;
+ case 46279:
+ fseek (ifp, 78, SEEK_CUR);
+ raw_width = get4();
+ raw_height = get4();
break;
case 50454: /* Sinar tag */
case 50455:
@@ -5568,12 +5571,14 @@
model[0] = 0;
}
} else if (!strcmp(make,"Imacon")) {
- height = raw_height - 6;
- width = raw_width - 10;
- data_offset += 6 + raw_width*12;
- flip = height > width+10 ? 5:3;
sprintf (model, "Ixpress %d-Mp", height*width/1000000);
- filters = 0x61616161;
+ if (raw_width < 4096) {
+ data_offset += 6 + raw_width*12;
+ height = raw_height - 6;
+ width = raw_width - 10;
+ filters = 0x61616161;
+ flip = height > width+10 ? 5:3;
+ }
load_raw = unpacked_load_raw;
maximum = 0xffff;
pre_mul[0] = 1.963;
@@ -6177,7 +6182,7 @@
if (argc == 1)
{
fprintf (stderr,
- "\nRaw Photo Decoder \"dcraw\" v8.09"
+ "\nRaw Photo Decoder \"dcraw\" v8.10"
"\nby Dave Coffin, dcoffin a cybercom o net"
"\n\nUsage: %s [options] file1 file2 ...\n"
"\nValid options:"
--- nikon_curve.c
+++ nikon_curve.c
@@ -28,6 +28,7 @@
#include "ufraw.h"
#else
#define MAX(a,b) ((a) > (b) ? (a) : (b))
+ #define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/*************************************************
@@ -941,7 +942,7 @@
**********************************************/
int CurveDataSample(CurveData *curve, CurveSample *sample)
{
- unsigned int i = 0, n;
+ int i = 0, n;
double x[20];
double y[20];
@@ -965,7 +966,7 @@
}
else
{
- for(i = 0; i < (unsigned int)curve->m_numAnchors; i++)
+ for(i = 0; i < curve->m_numAnchors; i++)
{
x[i] = curve->m_anchors[i].x*box_width + curve->m_min_x;
y[i] = curve->m_anchors[i].y*box_height + curve->m_min_y;
@@ -987,7 +988,7 @@
double yppval = 0;
//Now build a table
- double val = 0;
+ int val;
double res = 1.0/(double)sample->m_samplingRes;
//allocate enough space for the samples
@@ -995,46 +996,41 @@
sample->m_samplingRes*sizeof(int));
DEBUG_PRINT("DEBUG: SAMPLING OUTPUT RANGE: 0 -> %u\n", sample->m_outputRes);
- //release old sample allocation if it exists
- if (sample->m_Samples!=NULL)
- {
- free(sample->m_Samples);
- }
- sample->m_Samples = (unsigned int *)calloc(sample->m_samplingRes, sizeof(int));
+ sample->m_Samples = (unsigned int *)realloc(sample->m_Samples,
+ sample->m_samplingRes * sizeof(int));
- for(i = 0; i < sample->m_samplingRes; i++)
+ int firstPointX = curve->m_anchors[0].x * sample->m_samplingRes;
+ int firstPointY = pow(curve->m_anchors[0].y, gamma) *
+ sample->m_outputRes;
+ int lastPointX = curve->m_anchors[curve->m_numAnchors-1].x *
+ sample->m_samplingRes;
+ int lastPointY = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma) *
+ sample->m_outputRes;
+ int maxY = curve->m_max_y * sample->m_outputRes;
+ int minY = curve->m_min_y * sample->m_outputRes;
+
+ for(i = 0; i < (int)sample->m_samplingRes; i++)
{
//get the value of the curve at a point
//take into account that curves may not necessarily begin at x = 0.0
//nor end at x = 1.0
//Before the first point and after the last point, take a strait line
- if (i*res < curve->m_anchors[0].x) {
- val = pow(curve->m_anchors[0].y, gamma);
- } else if (i*res > curve->m_anchors[curve->m_numAnchors-1].x) {
- val = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma);
+ if (i < firstPointX) {
+ sample->m_Samples[i] = firstPointY;
+ } else if (i > lastPointX) {
+ sample->m_Samples[i] = lastPointY;
} else {
//within range, we can sample the curve
- val = spline_cubic_val ( n, x, i*res, y,
- ypp, &ypval, &yppval );
+ if (gamma==1.0)
+ val = spline_cubic_val( n, x, i*res, y,
+ ypp, &ypval, &yppval ) * sample->m_outputRes;
+ else
+ val = pow(spline_cubic_val( n, x, i*res, y,
+ ypp, &ypval, &yppval ), gamma) * sample->m_outputRes;
- //Compensate for gamma.
- val = pow(val,gamma);
-
- //cap at the high end of the range
- if (val > curve->m_max_y)
- {
- val = curve->m_max_y;
- }
- //cap at the low end of the range
- else if (val < curve->m_min_y)
- {
- val = curve->m_min_y;
- }
+ sample->m_Samples[i] = MIN(MAX(val,minY),maxY);
}
-
- //save the sample
- sample->m_Samples[i] = (unsigned int)floor(val*sample->m_outputRes);
}
free(ypp);
--- wb_presets.c
+++ wb_presets.c
@@ -393,6 +393,170 @@
{ "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */
{ "NIKON", "D70", "Shade", 3, { 2.394531, 1, 1.375000, 0 } },
+ { "OLYMPUS", "C5060WZ", "Shade", 0, { 1.949219, 1, 1.195312, 0 } },
+ { "OLYMPUS", "C5060WZ", "Cloudy", 0, { 1.621094, 1, 1.410156, 0 } },
+ { "OLYMPUS", "C5060WZ", "Sunny", 0, { 1.511719, 1, 1.500000, 0 } },
+ { "OLYMPUS", "C5060WZ", "Evening", 0, { 1.636719, 1, 1.496094, 0 } },
+ { "OLYMPUS", "C5060WZ", "Fluorescent1", 0, { 1.734375, 1, 1.343750, 0 } },
+ { "OLYMPUS", "C5060WZ", "Fluorescent2", 0, { 1.457031, 1, 1.691406, 0 } },
+ { "OLYMPUS", "C5060WZ", "Fluorescent3", 0, { 1.417969, 1, 2.230469, 0 } },
+ { "OLYMPUS", "C5060WZ", "Fluorescent4", 0, { 1, 1.103448, 3.422414, 0 } },
+ { "OLYMPUS", "C5060WZ", "Incandescent", 0, { 1, 1.153153, 3.662162, 0 } },
+ { "OLYMPUS", "C5060WZ", "Flash/Auto", 0, { 1.850000, 1, 1.308044, 0 } },
+
+ // Olympus C8080WZ - firmware 757-78
+ { "OLYMPUS", "C8080WZ", "Shadows", -7, { 1.515625, 1.000000, 1.773438, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -6, { 1.671875, 1.000000, 1.691406, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -5, { 1.832031, 1.000000, 1.605469, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -4, { 1.988281, 1.000000, 1.523438, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -3, { 2.144531, 1.000000, 1.441406, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -2, { 2.300781, 1.000000, 1.355469, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", -1, { 2.457031, 1.000000, 1.273438, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 0, { 2.617188, 1.000000, 1.191406, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 1, { 2.929688, 1.000000, 1.117188, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 2, { 3.242188, 1.000000, 1.046875, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 3, { 3.644000, 1.024000, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 4, { 4.290043, 1.108225, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 5, { 5.032864, 1.201878, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 6, { 5.907692, 1.312821, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Shadows", 7, { 7.000000, 1.454545, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -7, { 1.277344, 1.000000, 2.164062, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -6, { 1.406250, 1.000000, 2.062500, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -5, { 1.539062, 1.000000, 1.960938, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -4, { 1.671875, 1.000000, 1.859375, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -3, { 1.804688, 1.000000, 1.757812, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -2, { 1.937500, 1.000000, 1.656250, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", -1, { 2.070312, 1.000000, 1.554688, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 0, { 2.203125, 1.000000, 1.453125, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 1, { 2.464844, 1.000000, 1.363281, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 2, { 2.730469, 1.000000, 1.277344, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 3, { 2.996094, 1.000000, 1.191406, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 4, { 3.257812, 1.000000, 1.101562, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 5, { 3.523438, 1.000000, 1.015625, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 6, { 4.075630, 1.075630, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Cloudy day", 7, { 4.823256, 1.190698, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -7, { 1.234375, 1.000000, 2.343750, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -6, { 1.359375, 1.000000, 2.234375, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -5, { 1.488281, 1.000000, 2.125000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -4, { 1.617188, 1.000000, 2.011719, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -3, { 1.742188, 1.000000, 1.902344, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -2, { 1.871094, 1.000000, 1.792969, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", -1, { 2.000000, 1.000000, 1.683594, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 0, { 2.128906, 1.000000, 1.574219, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 1, { 2.382812, 1.000000, 1.476562, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 2, { 2.636719, 1.000000, 1.382812, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 3, { 2.894531, 1.000000, 1.289062, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 4, { 3.148438, 1.000000, 1.195312, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 5, { 3.406250, 1.000000, 1.101562, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 6, { 3.660156, 1.000000, 1.003906, 0 } },
+ { "OLYMPUS", "C8080WZ", "Sunny day", 7, { 4.300429, 1.098712, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -7, { 1.308594, 1.000000, 2.199219, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -6, { 1.445312, 1.000000, 2.093750, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -5, { 1.582031, 1.000000, 1.992188, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -4, { 1.718750, 1.000000, 1.886719, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -3, { 1.851562, 1.000000, 1.785156, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -2, { 1.988281, 1.000000, 1.679688, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", -1, { 2.125000, 1.000000, 1.578125, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 0, { 2.261719, 1.000000, 1.476562, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 1, { 2.531250, 1.000000, 1.386719, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 2, { 2.800781, 1.000000, 1.296875, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 3, { 3.074219, 1.000000, 1.207031, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 4, { 3.343750, 1.000000, 1.121094, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 5, { 3.617188, 1.000000, 1.031250, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 6, { 4.128631, 1.062241, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Evening sunlight", 7, { 4.863014, 1.168950, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -7, { 1.488281, 1.000000, 2.214844, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -6, { 1.652344, 1.000000, 2.105469, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -5, { 1.812500, 1.000000, 1.992188, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -4, { 1.976562, 1.000000, 1.882812, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -3, { 2.117188, 1.000000, 1.773438, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -2, { 2.253906, 1.000000, 1.675781, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -1, { 2.425781, 1.000000, 1.585938, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 0, { 2.570312, 1.000000, 1.468750, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 1, { 2.890625, 1.000000, 1.386719, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 2, { 3.199219, 1.000000, 1.308594, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 3, { 3.500000, 1.000000, 1.214844, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 4, { 3.820312, 1.000000, 1.125000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 5, { 4.128906, 1.000000, 1.039062, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 6, { 4.711934, 1.053498, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 7, { 5.450450, 1.153153, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -7, { 1.425781, 1.000000, 2.097656, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -6, { 1.574219, 1.000000, 2.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -5, { 1.722656, 1.000000, 1.902344, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -4, { 1.867188, 1.000000, 1.804688, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -3, { 2.015625, 1.000000, 1.703125, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -2, { 2.164062, 1.000000, 1.605469, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -1, { 2.312500, 1.000000, 1.507812, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 0, { 2.460938, 1.000000, 1.410156, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 1, { 2.753906, 1.000000, 1.324219, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 2, { 3.050781, 1.000000, 1.238281, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 3, { 3.343750, 1.000000, 1.156250, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 4, { 3.640625, 1.000000, 1.070312, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 5, { 4.000000, 1.015873, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 6, { 4.688312, 1.108225, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 7, { 5.545455, 1.224880, 1.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -7, { 1.195312, 1.000000, 2.589844, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -6, { 1.316406, 1.000000, 2.464844, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -5, { 1.441406, 1.000000, 2.343750, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -4, { 1.566406, 1.000000, 2.222656, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -3, { 1.687500, 1.000000, 2.101562, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -2, { 1.812500, 1.000000, 1.980469, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -1, { 1.937500, 1.000000, 1.859375, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 0, { 2.062500, 1.000000, 1.738281, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 1, { 2.308594, 1.000000, 1.632812, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 2, { 2.554688, 1.000000, 1.527344, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 3, { 2.804688, 1.000000, 1.421875, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 4, { 3.050781, 1.000000, 1.320312, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 5, { 3.296875, 1.000000, 1.214844, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 6, { 3.546875, 1.000000, 1.109375, 0 } },
+ { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 7, { 3.792969, 1.000000, 1.007812, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -7, { 1.109375, 1.000000, 3.257812, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -6, { 1.226562, 1.000000, 3.105469, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -5, { 1.339844, 1.000000, 2.953125, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -4, { 1.457031, 1.000000, 2.796875, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -3, { 1.570312, 1.000000, 2.644531, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -2, { 1.687500, 1.000000, 2.492188, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -1, { 1.800781, 1.000000, 2.339844, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 0, { 1.917969, 1.000000, 2.187500, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 1, { 2.144531, 1.000000, 2.054688, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 2, { 2.375000, 1.000000, 1.921875, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 3, { 2.605469, 1.000000, 1.792969, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 4, { 2.835938, 1.000000, 1.660156, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 5, { 3.066406, 1.000000, 1.531250, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 6, { 3.296875, 1.000000, 1.398438, 0 } },
+ { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 7, { 3.527344, 1.000000, 1.265625, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -7, { 1.000000, 1.347368, 5.963158, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -6, { 1.000000, 1.224880, 5.167464, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -5, { 1.000000, 1.117904, 4.484716, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -4, { 1.000000, 1.028112, 3.911647, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -3, { 1.046875, 1.000000, 3.593750, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -2, { 1.125000, 1.000000, 3.386719, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -1, { 1.203125, 1.000000, 3.179688, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 0, { 1.281250, 1.000000, 2.972656, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 1, { 1.433594, 1.000000, 2.792969, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 2, { 1.585938, 1.000000, 2.613281, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 3, { 1.742188, 1.000000, 2.437500, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 4, { 1.894531, 1.000000, 2.257812, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 5, { 2.046875, 1.000000, 2.078125, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 6, { 2.203125, 1.000000, 1.902344, 0 } },
+ { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 7, { 2.355469, 1.000000, 1.722656, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -7, { 1.000000, 1.488372, 6.988372, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -6, { 1.000000, 1.347368, 6.026316, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -5, { 1.000000, 1.230769, 5.235577, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -4, { 1.000000, 1.132743, 4.566372, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -3, { 1.000000, 1.049180, 4.000000, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -2, { 1.023438, 1.000000, 3.589844, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", -1, { 1.093750, 1.000000, 3.371094, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 0, { 1.164062, 1.000000, 3.152344, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 1, { 1.300781, 1.000000, 2.960938, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 2, { 1.441406, 1.000000, 2.773438, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 3, { 1.582031, 1.000000, 2.582031, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 4, { 1.722656, 1.000000, 2.394531, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 5, { 1.722656, 1.000000, 2.394531, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 6, { 2.000000, 1.000000, 2.015625, 0 } },
+ { "OLYMPUS", "C8080WZ", "3000K Tungsten", 7, { 2.140625, 1.000000, 1.828125, 0 } },
+// Fin ajout
+
{ "OLYMPUS", "E-1", "3000K Tungsten", -7, { 1.015625, 1, 1.867188, 0 } },
{ "OLYMPUS", "E-1", "3000K Tungsten", -6, { 1.007812, 1, 1.875000, 0 } },
{ "OLYMPUS", "E-1", "3000K Tungsten", -5, { 1, 1, 1.890625, 0 } },
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Mar 29 16:55:21 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-03-28 17:43:06.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-03-29 12:21:45.000000000 +0200
@@ -1,0 +2,16 @@
+Wed Mar 29 11:46:29 CEST 2006 - locilka(a)suse.cz
+
+- Merged proofread texts for SignatureCheckDialogs
+- Adjusted dialogs for SignatureCheckDialogs to show informative
+ icons/images (warning/…
[View More]error/question).
+- Improved SignatureCheckDialogs UI
+- Stopping ZMD after the Sync is done when is wasn't running before
+ (#161279)
+- 2.13.55
+
+-------------------------------------------------------------------
+Wed Mar 29 08:59:34 CEST 2006 - locilka(a)suse.cz
+
+- Moving ZMD sync from pkg_finish to SourceManager module (#161279)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.54.tar.bz2
New:
----
yast2-packager-2.13.55.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.SfVI2Q/_old 2006-03-29 16:53:58.000000000 +0200
+++ /var/tmp/diff_new_pack.SfVI2Q/_new 2006-03-29 16:53:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.54)
+# spec file for package yast2-packager (Version 2.13.55)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.13.54
+Version: 2.13.55
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.54.tar.bz2
+Source0: yast2-packager-2.13.55.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.13.54
+%setup -n yast2-packager-2.13.55
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,16 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Mar 29 2006 - locilka(a)suse.cz
+- Merged proofread texts for SignatureCheckDialogs
+- Adjusted dialogs for SignatureCheckDialogs to show informative
+ icons/images (warning/error/question).
+- Improved SignatureCheckDialogs UI
+- Stopping ZMD after the Sync is done when is wasn't running before
+ (#161279)
+- 2.13.55
+* Wed Mar 29 2006 - locilka(a)suse.cz
+- Moving ZMD sync from pkg_finish to SourceManager module (#161279)
* Tue Mar 28 2006 - locilka(a)suse.cz
- Added the first implementation of SignatureCheckDialogs module.
- 2.13.54
++++++ yast2-packager-2.13.54.tar.bz2 -> yast2-packager-2.13.55.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/VERSION new/yast2-packager-2.13.55/VERSION
--- old/yast2-packager-2.13.54/VERSION 2006-03-28 13:41:14.000000000 +0200
+++ new/yast2-packager-2.13.55/VERSION 2006-03-29 12:21:19.000000000 +0200
@@ -1 +1 @@
-2.13.54
+2.13.55
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/configure new/yast2-packager-2.13.55/configure
--- old/yast2-packager-2.13.54/configure 2006-03-28 17:45:55.000000000 +0200
+++ new/yast2-packager-2.13.55/configure 2006-03-29 14:10:19.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.54.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.55.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.54'
-PACKAGE_STRING='yast2-packager 2.13.54'
+PACKAGE_VERSION='2.13.55'
+PACKAGE_STRING='yast2-packager 2.13.55'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.13.54 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.55 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.54:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.55:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.54
+yast2-packager configure 2.13.55
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.13.54, which was
+It was created by yast2-packager $as_me 2.13.55, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.54'
+ VERSION='2.13.55'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.54"
+VERSION="2.13.55"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.54, which was
+This file was extended by yast2-packager $as_me 2.13.55, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.54
+yast2-packager config.status 2.13.55
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/configure.in new/yast2-packager-2.13.55/configure.in
--- old/yast2-packager-2.13.54/configure.in 2006-03-28 17:45:50.000000000 +0200
+++ new/yast2-packager-2.13.55/configure.in 2006-03-29 14:10:14.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.54, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.55, http://www.suse.de/feedback, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.54"
+VERSION="2.13.55"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/clients/pkg_finish.ycp new/yast2-packager-2.13.55/src/clients/pkg_finish.ycp
--- old/yast2-packager-2.13.54/src/clients/pkg_finish.ycp 2006-03-28 13:42:10.000000000 +0200
+++ new/yast2-packager-2.13.55/src/clients/pkg_finish.ycp 2006-03-29 09:09:51.000000000 +0200
@@ -7,9 +7,8 @@
*
* Authors:
* Jiri Srain <jsrain(a)suse.cz>
- * Lukas Ocilka <locilka(a)suse.cz>
*
- * $Id: pkg_finish.ycp 29461 2006-03-28 11:42:01Z locilka $
+ * $Id: pkg_finish.ycp 29493 2006-03-29 07:09:43Z locilka $
*
*/
@@ -18,169 +17,11 @@
textdomain "packager";
import "Installation";
-import "Report";
-import "Message";
any ret = nil;
string func = "";
map param = $[];
- // ------------------------------------------------------------------------------------------------------
- // adding YaST installation source into the ZMD
-
- /**
- * Runs a bash command with timeout.
- * @struct Returns map $[
- * "exit" : int_return_code,
- * "stdout" : [ "script", "stdout", "lines" ],
- * "stderr" : [ "script", "stderr", "lines" ],
- * ]
- *
- * @param string command
- * @param integer timeout in sec.
- * @return map with out, err and ret_code
- */
- map RunCommandWithTimeout (string run_command, integer script_time_out) {
- y2milestone("Running command \"%1\" in background...", run_command);
-
- boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
- if (!started) {
- y2error("Cannot run '%1'", run_command);
- return nil;
- }
-
- list<string> script_out = [];
- list<string> script_err = [];
- integer time_spent = 0;
- integer return_code = nil;
- boolean cont_loop = true;
- integer sleep_step = 20;
- script_time_out = script_time_out * 1000;
-
- // while continuing is needed and while it is possible
- while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
- // time-out
- if (time_spent >= script_time_out) {
- y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
- cont_loop = false;
- }
-
- time_spent = time_spent + sleep_step;
- sleep(sleep_step);
- }
- y2milestone("Time spent: %1 msec", time_spent);
-
- // fetching the return code if not timed-out
- if (cont_loop) {
- script_out = (list<string>) SCR::Read(.background.newout);
- script_err = (list<string>) SCR::Read(.background.newerr);
- return_code = (integer) SCR::Read(.background.status);
- }
- SCR::Execute(.background.kill, "");
-
- map command_ret = $[
- "exit" : return_code,
- "stdout" : script_out,
- "stderr" : script_err,
- ];
- return command_ret;
- }
-
- /**
- * Returns count of services matching the pattern. Returns 'nil'
- * if something fails.
- *
- * @param string grep_pattern to match the ZYPP service
- * @return integer count of matching lines
- */
- integer CountOfZMDServicesMatching (string grep_pattern) {
- map ret = RunCommandWithTimeout(
- sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
- 60
- );
- if (ret != nil && ret["stdout"]:nil != nil) {
- list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
- return regexpmatch(one_line, grep_pattern);
- });
- return size(matching);
- } else {
- y2error("Counting of services failed, returned %1", ret);
- return nil;
- }
- }
-
- /* Adds a ZYPP service into ZMD */
- boolean AddZYPPServiceIntoZMD () {
- map ret = RunCommandWithTimeout(
- "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
- 60
- );
- if (ret != nil && ret["exit"]:nil == 0) {
- return true;
- } else {
- y2error("Adding ZYPP service failed, returned %1", ret);
- return false;
- }
- }
-
- /**
- * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
- * in the ZMD services, adds one if it is missing.
- * Everything is done via the .background agent with timeout (number in seconds).
- */
- boolean SyncYaSTInstSourceWithZMD () {
- // Notes for maintainer:
- // - using .background agent because of ZMD/rug call that can stuck
- // - using 'exit $?' that work well with ZMD/rug and .background together
- // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
-
- y2milestone("--- Syncing YaST inst source with ZMD ---");
- string zmd_service_name = "/etc/init.d/novell-zmd";
- string rug_command = "/usr/bin/rug";
-
- // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- // Starting the service
- map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
- y2milestone("ZMD start: %1", zmd_start);
- // Checking the status after start
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- Report::Error(Message::CannotStartService(zmd_service_name));
- y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
- y2milestone("--- Syncing finished ---");
- return false;
- }
- }
-
- // Check whether the ZYPP service is already in zmd db or not
- integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
- if (count_of_services == nil) {
- y2warning("Cannot get list of services...");
- } else if (count_of_services > 0) {
- y2milestone("ZYPP service already presented (%1)", count_of_services);
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // Count of services were 'nil' or '0'
- if (AddZYPPServiceIntoZMD()) {
- y2milestone("Adding ZYPP service succeeded");
- } else {
- Report::Error(Message::CannotWriteSettingsTo("ZMD"));
- y2error("Adding ZYPP service failed");
- }
-
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // adding YaST installation source into the ZMD
- // ------------------------------------------------------------------------------------------------------
-
/* Check arguments */
if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
func = (string)WFM::Args(0);
@@ -203,9 +44,6 @@
}
else if (func == "Write")
{
- // Bug 156030 + 161299 - YaST installation sources must be synced with ZMD
- boolean sync_ret = SyncYaSTInstSourceWithZMD();
-
Pkg::SourceCacheCopyTo (Installation::destdir);
// disable all sources and finish target
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp 2006-03-28 17:31:05.000000000 +0200
+++ new/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp 2006-03-29 13:47:33.000000000 +0200
@@ -16,22 +16,39 @@
import "Popup";
// Defining icons for dialogs
- term error_icon = `Empty();
- term warning_icon = `Empty();
- term question_icon = `Empty();
-
-// TODO: support icons
-// /**
-// * Module constructor
-// */
-// global void InitDialogs () {
-// map ui_capabilities = UI::GetDisplayInfo();
-// if (ui_capabilities["HasLocalImageSupport"]:false) {
-// error_icon = `HBox(`Image("error", ""), `HSpacing(1));
-// warning_icon = `HBox(`Image("warning", ""), `HSpacing(1));
-// question_icon = `HBox(`Image("question", ""), `HSpacing(1));
-// }
-// }
+ map <string, string> msg_icons = $[
+ "error" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_error.png",
+ "warning" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_warning.png",
+ "question" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_warning.png",
+ ];
+
+ // UI can show images
+ boolean has_local_image_support = nil;
+
+ /**
+ * Returns term with message icon
+ *
+ * @param string message type "error", "warning" or "question"
+ * @return term `Image(...) with margins
+ */
+ term MessageIcon (string msg_type) {
+ // lazy loading
+ if (has_local_image_support == nil) {
+ map ui_capabilities = UI::GetDisplayInfo();
+ has_local_image_support = ui_capabilities["HasLocalImageSupport"]:false;
+ }
+
+ // UI can show images
+ if (has_local_image_support) {
+ if (msg_icons[msg_type]:nil == nil) {
+ y2warning("Message type %1 not defined", msg_type);
+ return `Empty();
+ }
+ return `MarginBox(1, 0.5, `Image(msg_icons[msg_type]:"", "[!]"));
+ } else {
+ return `Empty();
+ }
+ }
/**
* Returns term of yes/no buttons
@@ -127,30 +144,30 @@
global boolean UseUnsignedItem (symbol item_type, string item_name) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name
- _("The package '%1' is not digitally signed. This means that the origin
-of the integrity of the package can not be verified. Installing the package
+ _("The package %1 is not digitally signed. This means that the origin
+and integrity of the package cannot be verified. Installing the package
may put the integrity of your system at risk.
-Do you want to install it anyway?")
+Install it anyway?")
:
// popup question, %1 stands for the filename
- _("The file '%1' is not digitally signed. This means that the origin
-of the integrity of the file can not be verified. Using the file
-may put the integrity of your system at risk.
+ _("The file %1 is not digitally signed. This means that the origin
+and integrity of the file cannot be verified. Using the file may put
+the integrity of your system at risk.
-Do you want to use it anyway?")
+Use it anyway?")
), item_name);
UI::OpenDialog(
`opt(`decorated),
`VBox(
`HBox (
- `VCenter(warning_icon),
+ `VCenter(MessageIcon("warning")),
// popup heading
`VCenter(`Heading( _("Signature Check Failed"))),
`HStretch()
),
- `Label(description_text),
+ `MarginBox(0.5, 0.5, `Label(description_text)),
YesNoButtons(`no)
)
);
@@ -174,20 +191,20 @@
global boolean UseCorruptedItem (symbol item_type, string item_name) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name
- _("The integrity check for package '%1' failed. This means that
+ _("The integrity check for package %1 failed. This means that
the package has been changed by accident or by an attacker
-since the repository creator has signed it. Installing it
+since the repository creator signed it. Installing it
is a big risk for the integrity and security of your system.
-Do you want to install it anyway?")
+Install it anyway?")
:
// popup question, %1 stands for the filename
- _("The integrity check for file '%1' failed. This means that
+ _("The integrity check for file %1 failed. This means that
the file has been changed by accident or by an attacker
-since the repository creator has signed it. Installing it
+since the repository creator signed it. Installing it
is a big risk for the integrity and security of your system.
-Do you want to use it anyway?")
+Use it anyway?")
), item_name);
UI::OpenDialog(
@@ -195,11 +212,11 @@
`VBox(
// popup heading
`HBox (
- `VCenter(error_icon),
+ `VCenter(MessageIcon("error")),
`VCenter(`Heading( _("Validation Check Failed"))),
`HStretch()
),
- `Label(description_text),
+ `MarginBox(0.5, 0.5, `Label(description_text)),
YesNoButtons(`no)
)
);
@@ -223,30 +240,34 @@
global symbol ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) {
string description_text = sformat((item_type == `package ?
// popup question, %1 stands for the package name, %2 for the key ID
- _("The package '%1' is digitally signed with an unknown GnuPG key '%2'
-and we cannot find that key. This means that a trust relationship to the creator of the package
-can not be established. Installing the package may put the integrity of your system at risk.
+ _("The package %1 is digitally signed with an unknown
+GnuPG key '%2'.
+This means that a trust relationship to the creator of the package
+cannot be established. Installing the package may put the integrity
+of your system at risk.
-Do you want to install it anyway?")
+Install it anyway?")
:
// popup question, %1 stands for the filename, %2 for the key ID
- _("The file '%1' is digitally signed with an unknown GnuPG key '%2'
-and we cannot find that key. This means that a trust relationship to the creator of the file
-can not be established. Using the file may put the integrity of your system at risk.
+ _("The file %1 is digitally signed with an unknown
+GnuPG key '%2'.
+This means that a trust relationship to the creator of the file
+cannot be established. Using the file may put the integrity
+of your system at risk.
-Do you want to use it anyway?")
+Use it anyway?")
), item_name, key_id);
UI::OpenDialog(
`opt(`decorated),
`VBox(
`HBox (
- `VCenter(warning_icon),
+ `VCenter(MessageIcon("warning")),
// popup heading
- `VCenter(`Heading( _("Uknown GnuPG Key"))),
+ `VCenter(`Heading( _("Unknown GnuPG Key"))),
`HStretch()
),
- `Label(description_text),
+ `MarginBox(0.5, 0.5, `Label(description_text)),
YesNoButtons(`no)
)
);
@@ -274,40 +295,46 @@
*/
global symbol ItemSignedWithPublicSignature (symbol item_type, string item_name, string key_id, string key_name) {
string description_text = sformat((item_type == `package ?
- // popup question, %1 stands for the package name
- _("The package '%1' is digitally signed
+ // popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
+ _("The package %1 is digitally signed
with key '%2 (%3)'.
-There is no trust relationship to the owner of the key. You may chose to import
-the key into your set of trusted keys in the Import dialog and then proceed
-with the installation. You can also chose just to install the package anyway,
-but be aware that packages from untrusted sources can put the integrity
-of your system at risk.")
+
+There is no trust relationship to the owner of the key.
+If you trust the owner, import the key into your set
+of trusted keys then proceed with the installation.
+Installing a package from an unknown source can put
+the integrity of your system at risk. It is safest
+to skip the package.")
:
- // popup question, %1 stands for the filename
+ // popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
_("The file '%1' is digitally signed
with key '%2 (%3)'.
-There is no trust relationship to the owner of the key. You may chose to import
-the key into your set of trusted keys in the Import dialog and then proceed
-with the installation. You can also chose just to use the file anyway,
-but be aware that packages from untrusted sources can put the integrity
-of your system at risk.")
+
+There is no trust relationship to the owner of the key.
+If you trust the owner, import the key into your set
+of trusted keys then proceed with the installation.
+Installing a file from an unknown source can put
+the integrity of your system at risk. It is safest
+to skip it.")
), item_name, key_id, key_name);
UI::OpenDialog(
`opt(`decorated),
`VBox(
`HBox (
- `VCenter(warning_icon),
+ `VCenter(MessageIcon("warning")),
// popup heading
`VCenter(`Heading( _("Signed with Untrusted Public Key"))),
`HStretch()
),
- `Label(description_text),
+ `MarginBox(0.5, 0.5, `Label(description_text)),
`HBox (
// push button
- `PushButton(`id(`key_import), _("Key &Import Dialog")),
+ `PushButton(`id(`key_import), _("&Import Key")),
+ `HSpacing(1),
// push button
`PushButton(`id(`install), _("Install &Anyway")),
+ `HSpacing(1),
// push button
`PushButton(`id(`skip), _("&Skip Package"))
)
@@ -332,42 +359,68 @@
* @return symbol
*/
global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string key_detailed_description) {
- // FIXME: add somewhere this additional text
- // additional warning text (kind of help)
- string warning_text = sformat(_("The owner of the key may distribute updates, packages and package repositories
-that will be considered trusted by your system and which will be offered for installation
-and update without any further warning. Importing the key thus allows the key owner
-to have a certain amount of control over the software on your system and you should
-only do this if you trust her/him. YaST comes up with a warning dialog for every
-package that's not signed by a trusted (imported) key; this will happen to packages
-by the package creator with key '%1' if you chose not to import."), key_id);
+ // additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID
+ string warning_text = sformat(_("<p>The owner of the key may distribute updates,
+packages, and package repositories that your system will trust and offer
+for installation and update without any further warning. In this way,
+importing the key allows the key owner to have a certain amount of control
+over the software on your system.</p>
+
+<p>Only trust a key if you are confident that the owner can be trusted.
+A warning dialog opens for every package that is not signed by a trusted (imported) key.
+If you do not import the key, packages created by the owner of key '%1'
+show this warning.</p>"), key_id);
+
+ // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
+ string dialog_text = sformat(_("The GnuPG key '%1 (%2)'
+has been found at '%3'.
+
+You can choose to import it into your keyring of trusted
+public keys, meaning that you trust the owner of the key.
+You should be sure that you can trust the owner and that
+the key really belongs to that owner before importing it."),
+ key_id, key_name, key_location);
UI::OpenDialog(
`opt(`decorated),
- `VBox(
- `HBox (
- `VCenter(question_icon),
- // popup heading
- `VCenter(`Heading(_("Import Public GnuPG Key"))),
- `HStretch()
- ),
- `Label(sformat(
- // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
- _("The GnuPG key '%1 (%2)' has been found
-on location '%3'.
-
-You can chose to import it into your keyring of trusted public keys - that means
-you trust the owner of the key. You should be sure that you can trust the owner
-and that the key really belongs to that owner before considering to import it."),
- key_id, key_name, key_location
- )),
`HBox (
- // push button
- `PushButton(`id(`import), _("&Import")),
- // push button
- `PushButton(`id(`details), _("&Details")),
- // push button
- `PushButton(`id(`dont_import), _("Do &Not Import"))
+ `VSpacing(19),
+ // left-side help
+ `HWeight(3,
+ `VBox (
+ `RichText(warning_text)
+ )
+ ),
+ `HSpacing(1.5),
+ // dialog
+ `HWeight(5,
+ `VBox(
+ `Top (
+ `VBox (
+ `HBox (
+ `VCenter(MessageIcon("question")),
+ // popup heading
+ `VCenter(`Heading(_("Import Public GnuPG Key"))),
+ `HStretch()
+ ),
+ // dialog message
+ `MarginBox(0.5, 0.5, `Label(dialog_text))
+ )
+ ),
+ // dialog buttons
+ `Bottom(
+ `HBox (
+ // push button
+ `PushButton(`id(`import), _("&Import")),
+ `HSpacing(1),
+ // push button
+ `PushButton(`id(`details), _("&Details")),
+ `HSpacing(1),
+ // push button
+ `PushButton(`id(`dont_import), _("Do &Not Import"))
+ )
+ )
+ )
)
)
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/modules/SourceManager.ycp new/yast2-packager-2.13.55/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.54/src/modules/SourceManager.ycp 2006-03-28 15:51:57.000000000 +0200
+++ new/yast2-packager-2.13.55/src/modules/SourceManager.ycp 2006-03-29 11:52:17.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Anas Nashif <nashif(a)suse.de>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 29470 2006-03-28 12:11:22Z visnov $
+ * $Id: SourceManager.ycp 29499 2006-03-29 09:52:14Z locilka $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -681,5 +681,205 @@
return source_overview;
}
+ // ------------------------------------------------------------------------------------------------------
+ // adding YaST installation source into the ZMD
+
+ /**
+ * Runs a bash command with timeout.
+ * @struct Returns map $[
+ * "exit" : int_return_code,
+ * "stdout" : [ "script", "stdout", "lines" ],
+ * "stderr" : [ "script", "stderr", "lines" ],
+ * ]
+ *
+ * @param string command
+ * @param integer timeout in sec.
+ * @return map with out, err and ret_code
+ */
+ map RunCommandWithTimeout (string run_command, integer script_time_out) {
+ y2milestone("Running command \"%1\" in background...", run_command);
+
+ boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
+ if (!started) {
+ y2error("Cannot run '%1'", run_command);
+ return nil;
+ }
+
+ list<string> script_out = [];
+ list<string> script_err = [];
+ integer time_spent = 0;
+ integer return_code = nil;
+ boolean cont_loop = true;
+ integer sleep_step = 20;
+ script_time_out = script_time_out * 1000;
+
+ // while continuing is needed and while it is possible
+ while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
+ // time-out
+ if (time_spent >= script_time_out) {
+ y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
+ cont_loop = false;
+ }
+
+ time_spent = time_spent + sleep_step;
+ sleep(sleep_step);
+ }
+ y2milestone("Time spent: %1 msec", time_spent);
+
+ // fetching the return code if not timed-out
+ if (cont_loop) {
+ script_out = (list<string>) SCR::Read(.background.newout);
+ script_err = (list<string>) SCR::Read(.background.newerr);
+ return_code = (integer) SCR::Read(.background.status);
+ }
+ SCR::Execute(.background.kill, "");
+
+ map command_ret = $[
+ "exit" : return_code,
+ "stdout" : script_out,
+ "stderr" : script_err,
+ ];
+ return command_ret;
+ }
+
+ /**
+ * Returns count of services matching the pattern. Returns 'nil'
+ * if something fails.
+ *
+ * @param string grep_pattern to match the ZYPP service
+ * @return integer count of matching lines
+ */
+ integer CountOfZMDServicesMatching (string grep_pattern) {
+ map ret = RunCommandWithTimeout(
+ sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
+ 60
+ );
+ if (ret != nil && ret["stdout"]:nil != nil) {
+ list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
+ return regexpmatch(one_line, grep_pattern);
+ });
+ return size(matching);
+ } else {
+ y2error("Counting of services failed, returned %1", ret);
+ return nil;
+ }
+ }
+
+ /* Adds a ZYPP service into ZMD */
+ boolean AddZYPPServiceIntoZMD () {
+ map ret = RunCommandWithTimeout(
+ "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
+ 60
+ );
+ if (ret != nil && ret["exit"]:nil == 0) {
+ return true;
+ } else {
+ y2error("Adding ZYPP service failed, returned %1", ret);
+ return false;
+ }
+ }
+
+ /* ZMD service name - used for starting and stopping ZMD */
+ string zmd_service_name = "/etc/init.d/novell-zmd";
+
+ /**
+ * Stops zmd when it 'was not running'.
+ * It's expected that ZMD is running.
+ *
+ * @param boolean was_running
+ * @return boolean true if successful
+ */
+ boolean StopZMDIfItWasNotRunning (boolean was_running) {
+ // It was running, nothing to change
+ if (was_running) return true;
+
+ y2milestone("Stopping service ZMD %1", zmd_service_name);
+ map zmd_stop = RunCommandWithTimeout(sformat("TERM=dumb %1 stop; exit $?", zmd_service_name), 60);
+ y2milestone("ZMD stop: %1", zmd_stop);
+ if (zmd_stop == nil || zmd_stop["exit"]:nil != 0) {
+ y2error("Cannot stop service %1", zmd_service_name);
+ Report::Error(Message::CannotStopService(zmd_service_name));
+ }
+
+ y2milestone("ZMD stopped");
+ return true;
+ }
+
+ /**
+ * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
+ * in the ZMD services, adds one if it is missing.
+ * Everything is done via the .background agent with timeout (number in seconds).
+ *
+ * @return boolean whether the syncing succeeds
+ */
+ global boolean SyncYaSTInstSourceWithZMD () {
+ // Notes for maintainer:
+ // - using .background agent because of ZMD/rug call that can stuck
+ // - using 'exit $?' that work well with ZMD/rug and .background together
+ // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
+ // - when the function finishes, it must leave ZMD in the same status (running/stopped)
+ // as it was when the function started
+ //
+ // WARNIG: this function starts ZMD and expects that LIBZYPP has no lock over
+ // the RPM database. You can run it only when the RPM is not locked
+ // otherwise the ZMD will block itself!
+
+ y2milestone("--- Syncing YaST inst source with ZMD ---");
+ string rug_command = "/usr/bin/rug";
+
+ // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ // If the ZMD wasn't running, we will try to start it and then we will have to stop it at the end
+ boolean zmd_was_running = ((integer)zmd_status["exit"]:nil==0 ? true:false);
+
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ // Starting the service
+ map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
+ y2milestone("ZMD start: %1", zmd_start);
+ // Checking the status after start
+ map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
+ y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
+ if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
+ y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
+ Report::Error(Message::CannotStartService(zmd_service_name));
+
+ // In case of timeout
+ if (zmd_status == nil) StopZMDIfItWasNotRunning(zmd_was_running);
+ y2milestone("--- Syncing finished ---");
+ return false;
+ }
+ }
+
+ // Check whether the ZYPP service is already in zmd db or not
+ integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
+ if (count_of_services == nil) {
+ y2warning("Cannot get list of services...");
+ } else if (count_of_services > 0) {
+ y2milestone("ZYPP service already presented (%1)", count_of_services);
+
+ // Stop ZMD if needed
+ StopZMDIfItWasNotRunning(zmd_was_running);
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ // Count of services were 'nil' or '0'
+ if (AddZYPPServiceIntoZMD()) {
+ y2milestone("Adding ZYPP service succeeded");
+ } else {
+ Report::Error(Message::CannotWriteSettingsTo("ZMD"));
+ y2error("Adding ZYPP service failed");
+ }
+
+ // Stop ZMD if needed
+ StopZMDIfItWasNotRunning(zmd_was_running);
+ y2milestone("--- Syncing finished ---");
+ return true;
+ }
+
+ // adding YaST installation source into the ZMD
+ // ------------------------------------------------------------------------------------------------------
+
/* EOF */
-}
+}
\ No newline at end of file
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package istanbul
checked in at Wed Mar 29 16:54:56 CEST 2006.
--------
--- GNOME/istanbul/istanbul.changes 2006-03-07 00:30:10.000000000 +0100
+++ istanbul/istanbul.changes 2006-03-29 14:13:32.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 14:13:25 CEST 2006 - sbrabec(a)suse.cz
+
+- Fixed dependencies.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
…
[View More]
Other differences:
------------------
++++++ istanbul.spec ++++++
--- /var/tmp/diff_new_pack.vDAZLF/_old 2006-03-29 16:53:25.000000000 +0200
+++ /var/tmp/diff_new_pack.vDAZLF/_new 2006-03-29 16:53:25.000000000 +0200
@@ -13,11 +13,13 @@
Name: istanbul
BuildRequires: gnutls-devel gstreamer-plugins-devel gstreamer-plugins-excess intltool krb5 libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser python-devel python-gstreamer update-desktop-files
Version: 0.1.1
-Release: 8
+Release: 13
License: GPL
Group: Productivity/Other
Autoreqprov: on
-Requires: python-gnome python-gnome-extras
+Requires: python-gnome python-gnome-extras python-gstreamer
+# For theora codec:
+Requires: gstreamer-plugins-extra
Summary: Istanbul desktop session recorder
URL: http://live.gnome.org/Istanbul
Source: %{name}-%{version}.tar.bz2
@@ -63,6 +65,8 @@
%{_datadir}/pixmaps/istanbul.png
%changelog -n istanbul
+* Wed Mar 29 2006 - sbrabec(a)suse.cz
+- Fixed dependencies.
* Tue Mar 07 2006 - gekker(a)suse.de
- remove python-cairo From BuildRequires, required by gtk-python
* Mon Mar 06 2006 - gekker(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Wed Mar 29 16:53:53 CEST 2006.
--------
--- yast2-ncurses/yast2-ncurses.changes 2006-03-28 13:48:08.000000000 +0200
+++ yast2-ncurses/yast2-ncurses.changes 2006-03-29 14:46:07.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Mar 29 14:44:34 CEST 2006 - gs(a)suse.de
+
+- Show/set correct status information for packages in versions view
+ (available packages)
+- 2.13.16
+
+----------------------------------------------…
[View More]---------------------
Old:
----
yast2-ncurses-2.13.15.tar.bz2
New:
----
yast2-ncurses-2.13.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.vK0mpn/_old 2006-03-29 16:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.vK0mpn/_new 2006-03-29 16:53:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.13.15)
+# spec file for package yast2-ncurses (Version 2.13.16)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.13.15
+Version: 2.13.16
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.13.15.tar.bz2
+Source0: yast2-ncurses-2.13.16.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -40,7 +40,7 @@
%prep
-%setup -n yast2-ncurses-2.13.15
+%setup -n yast2-ncurses-2.13.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog -n yast2-ncurses
+* Wed Mar 29 2006 - gs(a)suse.de
+- Show/set correct status information for packages in versions view
+ (available packages)
+- 2.13.16
* Tue Mar 28 2006 - gs(a)suse.de
- YOU patch installation: avoid duplicate entries in package list,
show download size, show scripts
++++++ yast2-ncurses-2.13.15.tar.bz2 -> yast2-ncurses-2.13.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.15/VERSION new/yast2-ncurses-2.13.16/VERSION
--- old/yast2-ncurses-2.13.15/VERSION 2006-03-28 13:25:59.000000000 +0200
+++ new/yast2-ncurses-2.13.16/VERSION 2006-03-29 14:44:17.000000000 +0200
@@ -1 +1 @@
-2.13.15
+2.13.16
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.15/src/ObjectStatStrategy.cc new/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc
--- old/yast2-ncurses-2.13.15/src/ObjectStatStrategy.cc 2006-03-15 17:25:00.000000000 +0100
+++ new/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc 2006-03-29 13:56:18.000000000 +0200
@@ -485,6 +485,7 @@
return false;
}
+#ifdef OLD_CODE
// ok = slbPtr->set_status( newstatus );
ok = slbPtr->set_status( S_Update ); // FIXME only works for installed
if ( ok )
@@ -495,6 +496,21 @@
slbPtr->setLicenceConfirmed (false);
NCMIL << "Set user candidate returns: " << (ret?"true":"false") << endl;
}
+#endif
+
+ // this package is the candidate now
+ ok = slbPtr->setCandidate( objPtr );
+ NCMIL << "Set user candidate returns: " << (ok?"true":"false") << endl;
+
+ if ( ok )
+ {
+ // set new package status
+ ok = slbPtr->set_status( newstatus );
+
+ // the new candidate can have a different one
+ slbPtr->setLicenceConfirmed (false);
+ }
+
NCMIL << "Set status of: " << slbPtr->name() << " to: "
<< newstatus << " returns: " << (ok?"true":"false") << endl;
@@ -518,6 +534,7 @@
return retStatus;
}
+#ifdef OLD_CODE
// ZyppStatus status = slbPtr->status();
if (objPtr == slbPtr->candidateObj())
@@ -525,23 +542,28 @@
else if (slbPtr->hasInstalledObj() &&
slbPtr->installedObj()->edition() == objPtr->edition() )
retStatus = S_Del;
-/*
- if ( slbPtr->hasInstalledObj()
- && slbPtr->edition() == slbPtr->getInstalledObj()->edition() )
+#endif
+
+ ZyppStatus status = slbPtr->status();
+ NCDBG << "STATUS of " << slbPtr->name() << ": " << slbPtr->status() << endl;
+
+ if (slbPtr->hasInstalledObj() &&
+ slbPtr->installedObj()->edition() == objPtr->edition() )
{
// installed package: show status S_KeepInstalled or S_Delete
if ( status == S_KeepInstalled
|| status == S_Del )
- retStatus = status;
+ retStatus = status;
+
}
- else if ( slbPtr->isCandidateObj() )
+ else if ( objPtr == slbPtr->candidateObj() )
{
if ( status != S_KeepInstalled
- && status != S_Del )
- retStatus = status;
+ && status != S_Del )
+ retStatus = status;
}
// else show S_NoInst
-*/
+
return retStatus;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package vlan
checked in at Wed Mar 29 16:53:34 CEST 2006.
--------
--- vlan/vlan.changes 2006-01-25 21:42:41.000000000 +0100
+++ vlan/vlan.changes 2006-03-29 13:58:36.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 13:58:02 CEST 2006 - poeml(a)suse.de
+
+- updated README for usage of hardware descriptions for ETHERDEVICE
+ [#150771]
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++…
[View More]++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vlan.spec ++++++
--- /var/tmp/diff_new_pack.COJEJP/_old 2006-03-29 16:53:00.000000000 +0200
+++ /var/tmp/diff_new_pack.COJEJP/_new 2006-03-29 16:53:00.000000000 +0200
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -14,7 +14,7 @@
BuildRequires: gcc-c++
URL: http://www.candelatech.com/~greear/vlan.html
Version: 1.8
-Release: 28
+Release: 34
Summary: 802.1q VLAN Implementation for Linux
License: GPL
Group: Productivity/Networking/Other
@@ -55,6 +55,9 @@
%attr(555,root,root) %{_sbindir}/vconfig
%changelog -n vlan
+* Wed Mar 29 2006 - poeml(a)suse.de
+- updated README for usage of hardware descriptions for ETHERDEVICE
+ [#150771]
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 15 2006 - schwab(a)suse.de
++++++ README.SuSE ++++++
--- vlan/README.SuSE 2006-01-15 21:04:10.000000000 +0100
+++ vlan/README.SuSE 2006-03-29 13:57:44.000000000 +0200
@@ -10,7 +10,7 @@
The file should contain something like this:
- ETHERDEVICE=eth0
+ ETHERDEVICE="eth-id-xx:xx:xx:xx:xx:xx"
IPADDR=10.11.1.1
NETMASK=255.255.255.0
NETWORK=10.11.1.0
@@ -18,9 +18,13 @@
STARTMODE=onboot
The ETHERDEVICE variable specifies to which ethernet interface the
-VLAN interface should be attached. All the other variables are standard
-for configuring an IP interface (STARTMODE defines whether the interface
-is automatically brought up at system boot time - this is usually of
-concern for hotplugging devices, or interfaces that need to be brought
-up manually. Setting it to onboot should be the right thing for VLAN
-interfaces).
+VLAN interface should be attached. Also refer to `man ifcfg-vlan`. It
+could be a simple as "eth0", but in case that more than one interface
+is present it is wise to use the hardware description instead, as
+shown above.
+
+All the other variables are standard for configuring an IP interface
+(STARTMODE defines whether the interface is automatically brought up
+at system boot time - this is usually of concern for hotplugging
+devices, or interfaces that need to be brought up manually. Setting it
+to onboot should be the right thing for VLAN interfaces).
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package util-linux
checked in at Wed Mar 29 16:52:55 CEST 2006.
--------
--- util-linux/util-linux.changes 2006-03-28 17:54:13.000000000 +0200
+++ util-linux/util-linux.changes 2006-03-29 13:55:09.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 13:54:32 CEST 2006 - olh(a)suse.de
+
+- clearify comments about mac disk label handling in fdisk
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++…
[View More]++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.0nLaQM/_old 2006-03-29 16:52:07.000000000 +0200
+++ /var/tmp/diff_new_pack.0nLaQM/_new 2006-03-29 16:52:07.000000000 +0200
@@ -20,7 +20,7 @@
Group: System/Base
Autoreqprov: on
Version: 2.12r
-Release: 23
+Release: 24
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2
Source2: nologin.c
@@ -577,6 +577,8 @@
%endif
%changelog -n util-linux
+* Wed Mar 29 2006 - olh(a)suse.de
+- clearify comments about mac disk label handling in fdisk
* Tue Mar 28 2006 - hvogel(a)suse.de
- more fixes for the fdiskwrap patch [#160822]
* Tue Mar 21 2006 - okir(a)suse.de
++++++ util-linux-2.11q-fs_mac.diff ++++++
--- /var/tmp/diff_new_pack.0nLaQM/_old 2006-03-29 16:52:09.000000000 +0200
+++ /var/tmp/diff_new_pack.0nLaQM/_new 2006-03-29 16:52:09.000000000 +0200
@@ -31,9 +31,9 @@
+mac_info( void ) {
+ puts(
+ _("\n\tThere is a valid Mac label on this disk.\n"
-+ "\tUnfortunately Linux cannot handle these\n"
-+ "\tdisks at the moment. Nevertheless some\n"
-+ "\tadvice:\n"
++ "\tUnfortunately fdisk(1) cannot handle these disks.\n"
++ "\tUse either pdisk or parted to modify the partition table.\n"
++ "\tNevertheless some advice:\n"
+ "\t1. fdisk will destroy its contents on write.\n"
+ "\t2. Be sure that this disk is NOT a still vital\n"
+ "\t part of a volume group. (Otherwise you may\n"
@@ -225,7 +225,7 @@
}
+
+ if (mac_label) {
-+ printf(_("\tSorry - this fdisk cannot handle MAC disk labels."
++ printf(_("\tSorry - this fdisk cannot handle Mac disk labels."
+ "\n\tIf you want to add DOS-type partitions, create"
+ "\n\ta new empty DOS partition table first. (Use o.)"
+ "\n\tWARNING: "
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package ttf-arphic
checked in at Wed Mar 29 16:52:04 CEST 2006.
--------
--- ttf-arphic/ttf-arphic.changes 2006-02-28 11:39:09.000000000 +0100
+++ ttf-arphic/ttf-arphic.changes 2006-03-29 15:59:42.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 15:59:23 CEST 2006 - mfabian(a)suse.de
+
+- add zh_SG to the provides for zh_CN and zh_HK to the provides
+ for zh_TW.
+
+-------------------------------------------------------------------
+++++++++++++…
[View More]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ttf-arphic.spec ++++++
--- /var/tmp/diff_new_pack.tpRWLP/_old 2006-03-29 16:50:09.000000000 +0200
+++ /var/tmp/diff_new_pack.tpRWLP/_new 2006-03-29 16:50:09.000000000 +0200
@@ -16,7 +16,7 @@
PreReq: %suseconfig_fonts_prereq
Autoreqprov: on
Version: 20001125
-Release: 593
+Release: 597
URL: http://www.arphic.com.tw/
# ttf files have been downloaded from debian.
Source0: ttf-arphic.tar.bz2
@@ -43,7 +43,7 @@
%package -n ttf-arphic-bkai00mp
Group: System/X11/Fonts
Provides: scalable-font-zh-TW
-Provides: locale(zh_TW)
+Provides: locale(zh_TW;zh_HK)
Requires: ttf-arphic
Summary: AR PL KaitiM Big5 Chinese TrueType font by Arphic Technology
@@ -61,7 +61,7 @@
%package -n ttf-arphic-bsmi00lp
Group: System/X11/Fonts
Provides: scalable-font-zh-TW
-Provides: locale(zh_TW)
+Provides: locale(zh_TW;zh_HK)
Requires: ttf-arphic
Summary: AR PL Mingti2L Big5 Chinese TrueType font by Arphic Technology
@@ -79,7 +79,7 @@
%package -n ttf-arphic-gkai00mp
Group: System/X11/Fonts
Provides: scalable-font-zh-CN
-Provides: locale(zh_CN)
+Provides: locale(zh_CN;zh_SG)
Requires: ttf-arphic
Summary: AR PL KaitiM GB Chinese TrueType font by Arphic Technology
@@ -97,7 +97,7 @@
%package -n ttf-arphic-gbsn00lp
Group: System/X11/Fonts
Provides: scalable-font-zh-CN
-Provides: locale(zh_CN)
+Provides: locale(zh_CN;zh_SG)
Requires: ttf-arphic
Summary: AR PL SungtiL GB Chinese TrueType font by Arphic Technology
@@ -181,6 +181,9 @@
%config /usr/X11R6/lib/X11/fonts/truetype/fonts.scale.gbsn00lp
%changelog -n ttf-arphic
+* Wed Mar 29 2006 - mfabian(a)suse.de
+- add zh_SG to the provides for zh_CN and zh_HK to the provides
+ for zh_TW.
* Tue Feb 28 2006 - zsu(a)suse.de
- add Provides: locale(zh_CN) or locale(zh_TW) to each sub package.
* Wed Jan 25 2006 - mls(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0
Hello community,
here is the log from the commit of package suseRegister
checked in at Wed Mar 29 16:52:00 CEST 2006.
--------
--- suseRegister/suseRegister.changes 2006-03-29 11:03:05.000000000 +0200
+++ suseRegister/suseRegister.changes 2006-03-29 15:25:41.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 29 15:24:52 CEST 2006 - mc(a)suse.de
+
+- start zmd as soon as possible
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++…
[View More]++++++++++++++++++
Other differences:
------------------
++++++ suseRegister.spec ++++++
--- /var/tmp/diff_new_pack.YlLHKx/_old 2006-03-29 16:51:36.000000000 +0200
+++ /var/tmp/diff_new_pack.YlLHKx/_new 2006-03-29 16:51:36.000000000 +0200
@@ -12,7 +12,7 @@
Name: suseRegister
Version: 1.0
-Release: 33
+Release: 34
Summary: Registration tool
Group: Productivity/Other
License: GPL
@@ -57,6 +57,8 @@
%changelog -n suseRegister
* Wed Mar 29 2006 - mc(a)suse.de
+- start zmd as soon as possible
+* Wed Mar 29 2006 - mc(a)suse.de
- set accept=mandatory if auto-args are send back
* Tue Mar 28 2006 - mc(a)suse.de
- add --ignore-failure to rug sa command [#160069]
++++++ suseRegister-1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register
--- old/suseRegister-1.0/suse_register 2006-03-29 10:58:55.000000000 +0200
+++ new/suseRegister-1.0/suse_register 2006-03-29 16:07:11.000000000 +0200
@@ -1154,6 +1154,8 @@
$msg = `$zmdInit start 2>&1`;
$code = ($?>>8);
+ sleep 2;
+
foreach my $cnt (1..10)
{
if(-e $GUID_FILE)
@@ -1168,7 +1170,7 @@
if($code != 0)
{
- logPrintExit("Cannot start zmd: ".($msg?$msg:""), 7);
+ logPrintExit("Cannot start zmd: ".($msg?$msg:"").($msg2?$msg2."($code)":"($code)"), 7);
}
}
return $code;
@@ -2062,6 +2064,9 @@
}
openlog("suse_register", "ndelay,pid", 'user');
+# call this as soon as possible.
+rugStart();
+
if (defined $logfile && $logfile ne "")
{
open($LOGDESCR, ">> $logfile") or do {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
[View Less]
1
0