August 2006 - openSUSE Commits - openSUSE Mailing Lists

commit gv
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package gv checked in at Wed Aug 2 16:03:22 CEST 2006. -------- --- gv/gv.changes 2006-02-28 15:51:10.000000000 +0100 +++ gv/gv.changes 2006-08-02 15:02:19.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 15:01:57 CEST 2006 - werner(a)suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gv.spec ++++++ --- /var/tmp/diff_new_pack.CzjzjA/_old 2006-08-02 15:58:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CzjzjA/_new 2006-08-02 15:58:59.000000000 +0200 @@ -23,7 +23,7 @@ URL: http://wwwthep.physik.uni-mainz.de/~plass/gv/ Summary: A Program to View PostScript Files Version: 3.5.8 -Release: 1146 +Release: 1156 Source0: gv-3.5.8.tar.bz2 Patch0: gv-3.5.8-deb.patch Patch1: gv-3.5.8.dif @@ -38,6 +38,16 @@ Patch6: settitle.patch Patch7: gv-3.5.8-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man +%define _x11data %{_exec_prefix}/lib/X11 +%define _appdefdir %{_x11data}/app-defaults +%else +%define _x11data %{_datadir}/X11 +%define _appdefdir %{_x11data}/app-defaults +%endif %description GV offers you an X Window System GUI for viewing PostScript files. This @@ -66,41 +76,41 @@ make CCOPTIONS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man -make DESTDIR=$RPM_BUILD_ROOT install.doc -install -m 0444 NOTE $RPM_BUILD_ROOT/%{_defaultdocdir}/gv/Copyright +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install.man +make DESTDIR=%{buildroot} install.doc +install -m 0444 NOTE %{buildroot}/%{_defaultdocdir}/gv/Copyright # add font settings to app-defaults: -for i in $(find $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ -type f -name "GV") +for i in $(find %{buildroot}%{_x11data} -type f -name "GV") do cat source/gv_font_res-I18N_mb.dat >> ${i} done # japanese app-defaults: -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults -mv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.eucJP/app-defaults/GV \ - $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV -iconv -f EUC-JP -t SJIS < $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.SJIS/app-defaults/GV -iconv -f EUC-JP -t UTF-8 < $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja/app-defaults/GV \ - > $RPM_BUILD_ROOT/usr/X11R6/lib/X11/ja_JP.UTF-8/app-defaults/GV +mkdir -p %{buildroot}%{_x11data}/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults +mv %{buildroot}%{_x11data}/ja_JP.eucJP/app-defaults/GV \ + %{buildroot}%{_x11data}/ja/app-defaults/GV +iconv -f EUC-JP -t SJIS < %{buildroot}%{_x11data}/ja/app-defaults/GV \ + > %{buildroot}%{_x11data}/ja_JP.SJIS/app-defaults/GV +iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \ + > %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV %suse_update_desktop_file -i gv Office Viewer -rm $RPM_BUILD_ROOT/usr/share/pixmaps/gv.png +rm %{buildroot}/usr/share/pixmaps/gv.png %files %defattr(-,root,root) /usr/share/applications/gv.desktop -%config /usr/X11R6/lib/X11/gv/gv_system.ad -%config /usr/X11R6/lib/X11/gv/gv_user.ad -%config /usr/X11R6/lib/X11/gv/gv_class.ad -%dir /usr/X11R6/lib/X11/gv/ -%config /usr/X11R6/lib/X11/app-defaults/GV -%dir /usr/X11R6/lib/X11/?? -%dir /usr/X11R6/lib/X11/??_* -%dir /usr/X11R6/lib/X11/*/app-defaults -%config /usr/X11R6/lib/X11/ja*/app-defaults/GV -/usr/X11R6/bin/gv -%doc /usr/X11R6/man/man1/gv.1x.gz +%dir %{_x11data}/gv/ +%config %{_x11data}/gv/gv_system.ad +%config %{_x11data}/gv/gv_user.ad +%config %{_x11data}/gv/gv_class.ad +%config %{_appdefdir}/GV +%dir %{_x11data}/?? +%dir %{_x11data}/??_* +%dir %{_x11data}/*/app-defaults +%config %{_x11data}/ja*/app-defaults/GV +%{_bindir}/gv +%doc %{_mandir}/man1/gv.1x.gz %docdir %{_defaultdocdir}/gv/ %{_defaultdocdir}/gv/Copyright %doc %{_defaultdocdir}/gv/gs.interface.gz @@ -126,6 +136,8 @@ %dir %{_defaultdocdir}/gv/ %changelog -n gv +* Wed Aug 02 2006 - werner(a)suse.de +- Make it build with X11R7 * Tue Feb 28 2006 - werner(a)suse.de - Fix range of array subscript (bug #154109) * Wed Jan 25 2006 - mls(a)suse.de ++++++ gv-3.5.8-I18N-mb.patch ++++++ --- /var/tmp/diff_new_pack.CzjzjA/_old 2006-08-02 15:58:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CzjzjA/_new 2006-08-02 15:58:59.000000000 +0200 @@ -94,10 +94,10 @@ + [ -f gv_nls_$$LNG.dat ] || continue; \ + cat $(GV_SYSTEM_AD) > GV_$$LNG.ad; \ + cat gv_nls_$$LNG.dat >> GV_$$LNG.ad; \ -+ [ -d $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults ] || \ -+ $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults; \ ++ [ -d $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults ] || \ ++ $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults; \ + $(INSTALL) $(INSTALLFLAGS) \ -+ GV_$$LNG.ad $(DESTDIR)$(LIBDIR)/$$LNG/app-defaults/GV; \ ++ GV_$$LNG.ad $(DESTDIR)$(SHAREDIR)/$$LNG/app-defaults/GV; \ + done + +clean:: ++++++ gv-3.5.8.dif ++++++ --- /var/tmp/diff_new_pack.CzjzjA/_old 2006-08-02 15:58:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CzjzjA/_new 2006-08-02 15:58:59.000000000 +0200 @@ -66,7 +66,7 @@ + * FAX: (608)262-9777 Madison, WI 53706 --- config.Unix +++ config.Unix 2006-02-28 15:49:27.000000000 +0100 -@@ -32,16 +32,21 @@ +@@ -32,16 +32,22 @@ XCOMM -------------------------------------------------------------------- XCOMM Destination directories. XCOMM -------------------------------------------------------------------- @@ -74,10 +74,11 @@ - GV_DOCDIR = /usr/local/doc/gv/ - GV_LIBDIR = /usr/local/lib/gv/ - GV_MANDIR = /usr/local/man/man1/ -+ GV_BINDIR = /usr/X11R6/bin/ ++ SHAREDIR ?= $(LIBDIR) ++ GV_BINDIR = $(BINDIR)/ + GV_DOCDIR = /usr/share/doc/packages/gv/ -+ GV_LIBDIR = /usr/X11R6/lib/X11/gv/ -+ GV_MANDIR = /usr/X11R6/man/man1/ ++ GV_LIBDIR = $(SHAREDIR)/gv/ ++ GV_MANDIR = $(MANPATH)/man1/ + +XCOMM -------------------------------------------------------------------- +XCOMM --- Don not use private functions of Xaw or Xaw3d @@ -93,7 +94,7 @@ XCOMM -------------------------------------------------------------------- XCOMM As far as the Xaw3d header files are concerned it is by -@@ -57,6 +62,7 @@ +@@ -57,6 +63,7 @@ XCOMM ln -s /home/aaa/Xaw3d Xaw3d XCOMM -------------------------------------------------------------------- XCOMM XAW3D_HEADERS = -I/home/aaa/Xaw3d @@ -101,7 +102,7 @@ XCOMM -------------------------------------------------------------------- XCOMM Print Command -@@ -100,7 +106,7 @@ +@@ -100,7 +107,7 @@ XCOMM -------------------------------------------------------------------- XCOMM --- Use gv's own Motif like scrollbar. XCOMM -------------------------------------------------------------------- @@ -110,7 +111,7 @@ XCOMM -------------------------------------------------------------------- XCOMM --- Compile style files into the executable. -@@ -121,6 +127,7 @@ +@@ -121,6 +128,7 @@ XCOMM CCOPTIONS = -ansi -pedantic -Wall XCOMM CDEBUGFLAGS = XCOMM LDPOSTLIB = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ghostview
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package ghostview checked in at Wed Aug 2 15:58:53 CEST 2006. -------- --- ghostview/ghostview.changes 2006-01-25 21:36:11.000000000 +0100 +++ ghostview/ghostview.changes 2006-08-02 15:22:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 15:21:51 CEST 2006 - werner(a)suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghostview.spec ++++++ --- /var/tmp/diff_new_pack.uOFjTd/_old 2006-08-02 15:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.uOFjTd/_new 2006-08-02 15:58:27.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package ghostview (Version 1.5) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -20,15 +20,25 @@ Conflicts: gs_serv gs_vga Autoreqprov: on Version: 1.5 -Release: 190 +Release: 202 Summary: Ghostview Source: ghostview-1.5.tar.bz2 Patch: ghostview-1.5.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man +%define _x11data %{_exec_prefix}/lib/X11 +%define _appdefdir %{_x11data}/app-defaults +%else +%define _x11data %{_datadir}/X11 +%define _appdefdir %{_x11data}/app-defaults +%endif %description -Ghostview offers you an X11 GUI for viewing PostScript files. This is -an X11 interface to ghostscript. +Ghostview offers an X11 GUI for viewing PostScript files. This is an +X11 interface to ghostscript. @@ -45,23 +55,25 @@ make CCOPTIONS="$RPM_OPT_FLAGS" %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -make install.man DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +make install.man DESTDIR=%{buildroot} %suse_update_desktop_file -i ghostview Office Viewer %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) /usr/share/applications/ghostview.desktop /usr/share/pixmaps/gv.png -/usr/X11R6/bin/ghostview -%config /usr/X11R6/lib/X11/app-defaults/Ghostview -%doc /usr/X11R6/man/man1/ghostview.1x.gz +%{_bindir}/ghostview +%config %{_appdefdir}/Ghostview +%doc %{_mandir}/man1/ghostview.1x.gz %changelog -n ghostview +* Wed Aug 02 2006 - werner(a)suse.de +- Make it build with X11R7 * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 05 2005 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit fuseiso
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package fuseiso checked in at Wed Aug 2 15:58:21 CEST 2006. -------- --- fuseiso/fuseiso.changes 2006-04-23 21:30:44.000000000 +0200 +++ fuseiso/fuseiso.changes 2006-08-02 13:43:20.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 2 13:42:31 CEST 2006 - cthiel(a)suse.de + +- update to 20060731 snapshot + * Fixed casting bug in isofs_parse_zisofs_header(). + * Parse SL RR entries with flag 3 as directory separator. + +------------------------------------------------------------------- Old: ---- fuseiso-20060107.tar.bz2 New: ---- fuseiso-20060731.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuseiso.spec ++++++ --- /var/tmp/diff_new_pack.9LFTge/_old 2006-08-02 15:58:11.000000000 +0200 +++ /var/tmp/diff_new_pack.9LFTge/_new 2006-08-02 15:58:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fuseiso (Version 20060107) +# spec file for package fuseiso (Version 20060731) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,16 +13,17 @@ Name: fuseiso BuildRequires: fuse-devel glib2-devel Summary: fuseiso is a FUSE module to mount ISO filesystem images -Version: 20060107 -Release: 2 +Version: 20060731 +Release: 1 License: GPL Group: System/Filesystems Source: %{name}-%{version}.tar.bz2 -URL: http://ubiz.ru/dm/ +URL: http://fuse.sourceforge.net/wiki/index.php/FuseIso BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -fuseiso is a FUSE module to mount ISO filesystem images +Mount ISO filesystem images as a non-root user. Currently supports +plain ISO9660 Level 1 and 2, Rock Ridge, Joliet, zisofs. @@ -51,5 +52,9 @@ %{_bindir}/* %changelog -n fuseiso +* Wed Aug 02 2006 - cthiel(a)suse.de +- update to 20060731 snapshot + * Fixed casting bug in isofs_parse_zisofs_header(). + * Parse SL RR entries with flag 3 as directory separator. * Sun Apr 23 2006 - cthiel(a)suse.de - initial package (version 20060107) ++++++ fuseiso-20060107.tar.bz2 -> fuseiso-20060731.tar.bz2 ++++++ ++++ 21795 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuseiso-20060107/ChangeLog new/fuseiso-20060731/ChangeLog --- old/fuseiso-20060107/ChangeLog 2006-01-07 05:23:55.000000000 +0100 +++ new/fuseiso-20060731/ChangeLog 2006-07-31 12:32:32.000000000 +0200 @@ -1,2 +1,5 @@ +2006-07-31 + * all: Fixed casting bug in isofs_parse_zisofs_header(). Parse SL RR entries with flag 3 as directory separator. + 2006-01-07 * all: Fixed problem with current directory after call to daemon() in libfuse. Thanks a lot to Jonathan Brandmeyer <jbrandmeyer at earthlink dot net> for bug hunting and provided patch. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuseiso-20060107/Makefile.am new/fuseiso-20060731/Makefile.am --- old/fuseiso-20060107/Makefile.am 2005-10-28 20:12:57.000000000 +0200 +++ new/fuseiso-20060731/Makefile.am 2006-02-16 21:14:20.000000000 +0100 @@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = src zAppRun -EXTRA_DIST = linux +EXTRA_DIST = linux fuseiso.spec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuseiso-20060107/configure.in new/fuseiso-20060731/configure.in --- old/fuseiso-20060107/configure.in 2006-01-07 05:19:50.000000000 +0100 +++ new/fuseiso-20060731/configure.in 2006-07-31 12:27:35.000000000 +0200 @@ -1,7 +1,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(fuseiso, 20060107) +AM_INIT_AUTOMAKE(fuseiso, 20060731) AC_LANG_C AC_PROG_CC diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuseiso-20060107/fuseiso.spec new/fuseiso-20060731/fuseiso.spec --- old/fuseiso-20060107/fuseiso.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/fuseiso-20060731/fuseiso.spec 2006-07-31 12:28:53.000000000 +0200 @@ -0,0 +1,56 @@ +%define reldate 20060731 +Name: fuseiso +Version: 1.1 +Release: 0.%{reldate}%{?dist} +Summary: Mount ISO filesystem images as a non-root user + +Group: System Environment/Base +License: GPL +URL: http://fuse.sourceforge.net/wiki/index.php/FuseIso +Source0: %{name}-%{reldate}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: fuse-devel >= 2.2 +BuildRequires: glib2-devel >= 2.2 +Requires: fuse >= 2.2 + +%description +Mount ISO filesystem images as a non-root user. Currently supports +plain ISO9660 Level 1 and 2, Rock Ridge, Joliet, zisofs. + +%prep +%setup -q -n %{name}-%{reldate} + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING INSTALL NEWS README TODO +%{_bindir}/* + + +%changelog +* Fri Feb 17 2006 Dmitry Morozhnikov <dmiceman(a)mail.ru> - 1.0-0.20060217 +- Update for 2006-07-31 snapshot. + +* Fri Feb 17 2006 Dmitry Morozhnikov <dmiceman(a)mail.ru> - 1.0-0.20060217 +- Update for 2006-02-17 snapshot. + +* Sun Jan 15 2006 Richard Dawe <rich(a)phekda.gotadsl.co.uk> - 1.0-0.20060107 +- Update to the 2006-01-07 snapshot. + +* Sat Jan 07 2006 Richard Dawe <rich(a)phekda.gotadsl.co.uk> - 1.0-0.20051029 +- Initial packaging. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuseiso-20060107/src/isofs.c new/fuseiso-20060731/src/isofs.c --- old/fuseiso-20060107/src/isofs.c 2006-01-07 05:17:57.000000000 +0100 +++ new/fuseiso-20060731/src/isofs.c 2006-07-31 12:26:54.000000000 +0200 @@ -539,7 +539,10 @@ (block_table_left < context.block_size - block_table_shift ? block_table_left : context.block_size - block_table_shift); - memcpy(inode->zf_blockptr + block_table_total, buf + block_table_shift, block_table_chunk); +/* printf("isofs_parse_sa: block_table_size: %d, block_table_left: %d, block_table_total %d, block_table_shift %d, block_table_chunk %d\n", + block_table_size, block_table_left, block_table_total, block_table_shift, block_table_chunk);*/ + + memcpy(((char *) inode->zf_blockptr) + block_table_total, buf + block_table_shift, block_table_chunk); block_table_left -= block_table_chunk; block_table_total += block_table_chunk; @@ -552,6 +555,9 @@ free(buf); return len; }; + +/* printf("isofs_parse_sa: block_num: %d, len: %d\n", + block_num, len);*/ }; /* printf("isofs_parse_zisofs_header: real size %d, header size %d, nblocks %d, block size %d\n", @@ -791,6 +797,12 @@ inode->sl[inode->sl_len] = '\0'; /* printf("parse_sa: SL PARENT component, sl_c_flags %d, sl_c_len %d, sl_len %d, sl %s\n", sl_c_len, inode->sl_len, inode->sl);*/ + } else if(sl_c_flags & (1 << 3)) { // ROOT component (?! does not documented at all) + inode->sl[inode->sl_len] = '/'; + inode->sl_len += 1; + inode->sl[inode->sl_len] = '\0'; +/* printf("parse_sa: SL ROOT component, sl_c_flags %d, sl_c_len %d, sl_len %d, sl %s\n", + sl_c_len, inode->sl_len, inode->sl);*/ } else { strncpy(inode->sl + inode->sl_len, comp->text, sl_c_len); inode->sl_len += sl_c_len; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dcraw
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package dcraw checked in at Wed Aug 2 15:58:06 CEST 2006. -------- --- dcraw/dcraw.changes 2006-03-26 16:01:08.000000000 +0200 +++ dcraw/dcraw.changes 2006-08-02 13:15:59.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 2 12:35:19 CEST 2006 - postadal(a)suse.cz + +- updated to RCS 1.338 + * added "-H 2" option for rudimentary highlight recovery + * new "-T" option provides TIFF output with metadata and ICC profile + * replaced "-r" and "-l" options with raw white balance + * added support for Imacon Ixpress 22-Mp, Leaf Aptus 75, Leica D-Lux 2, + Sony DSLR-A100, Minolta DiMAGE G530, Sinar 4080x4080, Samsung GX-1S + * fixed camera WB for Canon EOS 10D, 300D, and clones + * added camera WB for the Kodak DCS Pro SLR models, Imacon Ixpress, + Kodak P850/P880 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcraw.spec ++++++ --- /var/tmp/diff_new_pack.785vUf/_old 2006-08-02 15:40:00.000000000 +0200 +++ /var/tmp/diff_new_pack.785vUf/_new 2006-08-02 15:40:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dcraw (Version 1.319) +# spec file for package dcraw (Version 1.338) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: dcraw BuildRequires: libjpeg-devel liblcms-devel -Version: 1.319 +Version: 1.338 Release: 1 License: distributable, Other License(s), see package Group: Productivity/Graphics/Convertors @@ -77,6 +77,16 @@ %doc %_mandir/man*/* %changelog -n dcraw +* Wed Aug 02 2006 - postadal(a)suse.cz +- updated to RCS 1.338 + * added "-H 2" option for rudimentary highlight recovery + * new "-T" option provides TIFF output with metadata and ICC profile + * replaced "-r" and "-l" options with raw white balance + * added support for Imacon Ixpress 22-Mp, Leaf Aptus 75, Leica D-Lux 2, + Sony DSLR-A100, Minolta DiMAGE G530, Sinar 4080x4080, Samsung GX-1S + * fixed camera WB for Canon EOS 10D, 300D, and clones + * added camera WB for the Kodak DCS Pro SLR models, Imacon Ixpress, + Kodak P850/P880 * Sun Mar 26 2006 - postadal(a)suse.cz - updated to RCS 1.319 * new color matrix for the Nikon E700, E800, and E950 ++++++ README ++++++ --- dcraw/README 2006-03-26 15:53:46.000000000 +0200 +++ dcraw/README 2006-08-02 13:33:54.000000000 +0200 @@ -32,7 +32,7 @@ any operating system. That program is called [6]dcraw.c, and it's become a standard tool - within and without the Open Source world. It's small (about 6000 + within and without the Open Source world. It's small (about 7000 lines), portable (standard C libraries only), free (both "gratis" and "libre"), and when used skillfully, produces [7]better quality [8]output than the tools provided by the camera vendor. @@ -57,7 +57,7 @@ execute permission. * [10]dcraw.c -- decodes raw photos, extracts thumbnails, and displays metadata - Supports 205 cameras at last count. Compile with "gcc -o dcraw -O4 + Supports 221 cameras at last count. Compile with "gcc -o dcraw -O4 dcraw.c -lm -ljpeg -llcms" or "gcc -o dcraw -O4 dcraw.c -lm -DNO_JPEG -DNO_LCMS". Run with no arguments to see a usage message. Don't complain that 16-bit output is too dark -- read the @@ -65,39 +65,32 @@ * [11]rawphoto.c -- basic plugin for GIMP 1.2 & 2.0 After installing "dcraw", do "gimptool --install rawphoto.c". My plugin provides a simple dialog box for loading raw files into the - Gimp. [12]Pawel Jochym , [13]Udi Fuchs , and [14]Joseph Heled have - written much nicer plugins, with live preview, histograms, and - color curves. - * [15].badpixels -- my camera's "hot pixels" + Gimp. [12]Udi Fuchs and [13]Joseph Heled have written much nicer + plugins, with live preview, histograms, and color curves. + * [14].badpixels -- my camera's "hot pixels" This file tells dcraw which pixels have died and when, so that it can interpolate around them. - * [16]dcraw.1 -- UNIX manpage for dcraw + * [15]dcraw.1 -- UNIX manpage for dcraw Contains details and helpful hints not found elsewhere. - * [17]dcwrap -- example wrapper script - This is what I use with my PowerShot G2. - * [18]dcraw.c,v -- complete unabridged RCS file + * [16]dcraw.c,v -- complete unabridged RCS file This file contains the entire history of dcraw.c since its conception on February 23, 1997. If you don't have the RCS - toolkit, [19]download it here. - * [20]parse.c -- read image data structures + toolkit, [17]download it here. + * [18]parse.c -- read image data structures This program displays CIFF and TIFF data structures in a very cryptic format. - * [21]clean_crw.c -- clean Canon CRW files + * [19]clean_crw.c -- clean Canon CRW files Recovered or undeleted CRW files often have junk appended to them that makes them unreadable. This program safely cleans CRW files. - * [22]fixdates.c -- set time on Canon CRW files - This program has been superseded by "dcraw -z". - * [23]fujiturn.c -- rotate Fuji Super CCD images + * [20]fujiturn.c -- rotate Fuji Super CCD images An alternative to dcraw's built-in Fuji rotation. - * [24]fuji_green.c -- convert Fuji green pixels to PGM + * [21]fuji_green.c -- convert Fuji green pixels to PGM A side benefit of the Fuji Super CCD design is that its green pixels make nice black-and-white images. For hackers only: - * [25]decompress.c is a simple reference decompressor for CRW files. - * [26]pgm.c converts the decompressed data into an 8-bit grayscale - image. - * [27]sony_clear.c decrypts SRF files from the Sony DSC-F828. + * [22]decompress.c is a simple reference decompressor for CRW files. + * [23]sony_clear.c decrypts SRF files from the Sony DSC-F828. Other Raw Photo Decoders @@ -105,93 +98,113 @@ digital cameras in their applications. They can call dcraw from a graphical interface, paste pieces of dcraw.c into their code, or just use dcraw.c as the documentation that camera makers refuse to provide: - * [28]ACDSee - * [29]Adobe Photoshop - * [30]BR's PhotoArchiver by Baard Riiber - * [31]BreezeBrowser by Chris Breeze - * [32]Conceiva Lightbox - * [33]cPicture by Jürgen Eidt - * [34]Cumulus by Canto - * [35]dcRAW-X by Bryan Chang - * [36]DCRawUI by Sune Trudslev - * [37]Directory Opus Plugin by Leo Davidson(with C++ source code) - * [38]dpMagic by Mikhail Stolpner - * [39]EasyRaw Studio - * [40]GraphicConverter by Thorsten Lemke - * [41]GVBox from JCO Consulting - * [42]IrfanView by Irfan Skiljan - * [43]IRIS image processor for astronomers - * [44]KA Photoservice - * [45]Lightbox by Josh Anon - * [46]LightZone by Anton Kast - * [47]Photo Companion by Jeff Moore - * [48]Photo Jockey by Davie Lee Reed who also wrote a [49]dcraw + * [24]ACDSee + * [25]Adobe Photoshop + * [26]BR's PhotoArchiver by Baard Riiber + * [27]BreezeBrowser by Chris Breeze + * [28]Conceiva Lightbox + * [29]cPicture by Jürgen Eidt + * [30]Cumulus by Canto + * [31]dcRAW-X by Bryan Chang + * [32]DCRawUI by Sune Trudslev + * [33]Directory Opus Plugin by Leo Davidson(with C++ source code) + * [34]DeepSkyStacker by Luc Coiffier + * [35]dpMagic by Mikhail Stolpner + * [36]EasyRaw Studio + * [37]GraphicConverter by Thorsten Lemke + * [38]GVBox from JCO Consulting + * [39]IrfanView by Irfan Skiljan + * [40]IRIS image processor for astronomers + * [41]KA Photoservice + * [42]Lightbox by Josh Anon + * [43]LightZone by Anton Kast + * [44]Photo Companion by Jeff Moore + * [45]Photo Jockey by Davie Lee Reed who also wrote a [46]dcraw interface for Delphi programmers. - * [50]Photo Organizer by Balint Kis - * [51]PhotoReviewer by Ben Haller - * [52]Picasa from Google - * [53]Picture Arena by Felix Schwarz - * [54]PiXPO by How2Share Technologies - * [55]PolyView by Polybytes - * [56]PowerShovel-II by Luc Minnebo - * [57]RAW Developer by Iridient Digital - * [58]Raw Magick - * [59]RawConvert by Jason Swain - * [60]RawDrop by Frank Siegert - * [61]RawShooter from pixmantec - * [62]RawView by Jari Savolainen - * [63]Serif PhotoPlus, PanoramaPlus, and AlbumPlus - * [64]SharpRaw by Duane DeSieno - * [65]SilverFast DCPro by LaserSoft Imaging - * [66]StudioLine Photo by H&M Software - * [67]ViewIt by Zdzislaw Losvik - * [68]Viewer n5 by Dmitry Fedorov - * [69]VueScan by Ed Hamrick + * [47]Photo Organizer by Balint Kis + * [48]PhotoReviewer by Ben Haller + * [49]Picasa from Google + * [50]Picture Arena by Felix Schwarz + * [51]PiXPO by How2Share Technologies + * [52]PolyView by Polybytes + * [53]PowerShovel-II by Luc Minnebo + * [54]RAW Developer by Iridient Digital + * [55]Raw Magick + * [56]RawConvert by Jason Swain + * [57]RawDrop by Frank Siegert + * [58]RawShooter from pixmantec + * [59]RawView by Jari Savolainen + * [60]Serif PhotoPlus, PanoramaPlus, and AlbumPlus + * [61]SharpRaw by Duane DeSieno + * [62]SilverFast DCPro by LaserSoft Imaging + * [63]StudioLine Photo by H&M Software + * [64]ViewIt by Zdzislaw Losvik + * [65]Viewer n5 by Dmitry Fedorov + * [66]VueScan by Ed Hamrick Frequently Asked Questions I don't have a C compiler. Could you send me an executable? No, but Francisco Montilla provides Mac OS and Windows - executables [70]on his website. And Benjamin Lebsanft has - volunteered to maintain [71]Windows executables optimized for + executables [67]on his website. And Benjamin Lebsanft has + volunteered to maintain [68]Windows executables optimized for specific CPUs. If you're familiar with the DOS command line but don't know C, - you can install this [72]free C compiler for Windows and + you can install this [69]free C compiler for Windows and compile dcraw.c quite easily. How can I read the EXIF data (shutter speed, aperture, etc.)? - [73]Phil Harvey's ExifTool provides a unified Perl-based EXIF + [70]Phil Harvey's ExifTool provides a unified Perl-based EXIF reader (and editor!) for all cameras and file formats. "dcraw -i -v" is much faster, but provides less information. How can I read NEF files from Nikon scanners? - Dcraw only supports cameras. Try [74]this simple program for + Dcraw only supports cameras. Try [71]this simple program for scanners. + How can I read Nikon Dust Off images (NDF files)? + [72]Use this program. + Do you have any specifications describing raw photo formats? Yes, but they tend to omit important details, like how to decompress the raw image or decrypt private metadata. See the - [75]TIFF spec, the [76]TIFF/EP spec, the [77]Adobe DNG spec, - the [78]CIFF (CRW) spec, and the [79]X3F spec. + [73]TIFF spec, the [74]TIFF/EP spec, the [75]Adobe DNG spec, + the [76]CIFF (CRW) spec, and the [77]X3F spec. I'm designing a digital camera. How do I convert its raw photos into something that dcraw and Adobe Photoshop can open? - Download [80]LibTIFF v3.8.0 and apply [81]this patch. Then use - [82]this C program as a template for converting your photos to - valid [83]Adobe DNG files. + Download [78]LibTIFF v3.8.0 and apply [79]this patch. Then use + [80]this C program as a template for converting your photos to + valid [81]Adobe DNG files. + + I shot a raw photo with no light. Why does it appear all noisy, when + it should be solid black? + No matter how dark an image is, dcraw's auto-exposure stretches + it so that one percent of its pixels appear white. The "-b" + option adjusts this behavior, while "-4" (16-bit output) avoids + it entirely. + + I bracket plus/minus two stops, but all five shots look almost the + same in dcraw. Why? + See the previous question. - Why is 16-bit output dark / flattened / unreadable? + Why is 16-bit output dark / unreadable? If you want pretty pictures straight out of dcraw, stay with 8-bit output. 16-bit linear output is the best raw material for - professional image editors such as [84]Photoshop and - [85]CinePaint, but it's no good for most image viewers. + professional image editors such as [82]Photoshop and + [83]CinePaint, but it's no good for most image viewers. + + What does the "-f" (four color RGB) option do? + If you see patterns like [84]this or [85]this in your output + images, first try "dcraw -a". If these patterns persist, use + "dcraw -f" to get rid of them. Could you please add an option for TIFF / FITS / PNG / BMP / JPEG output? - No. Dcraw writes PPM only. To convert to other formats: + In versions 8.25 and later, "dcraw -T" writes TIFF output with + metadata. To write other formats: -dcraw -c crw_0001.crw | pnmtotiff -truecolor > crw_0001.tiff dcraw -c crw_0001.crw | pnmtofits > crw_0001.fits dcraw -c crw_0001.crw | pnmtopng > crw_0001.png dcraw -c crw_0001.crw | ppmtobmp > crw_0001.bmp @@ -215,10 +228,6 @@ Run it as a separate process. Eric Raymond [88]explains this technique here. - What does the "-f" option do? What's "four-color RGB"? - If you see [89]patterns like this in your output images, use - the "-f" option. Otherwise, don't. - Why are there false colors along edges within the image? Because of interpolation. This is a hard problem, easily defined: @@ -232,7 +241,7 @@ Variable Number of Gradients (VNG), and Adaptive Homogeneity-Directed (AHD). - [90]The Foveon X3 Capture chip requires a different kind of + [89]The Foveon X3 Capture chip requires a different kind of interpolation. Unlike CCD arrays, it captures three colors at every pixel location. But the colors are not well separated, so the raw data looks very gray. Much processing is needed to @@ -240,14 +249,14 @@ How do I get my camera to take raw photos? For some Nikon Coolpix cameras, you need to enable a - [91]special "DIAG RAW" mode. - For Casio cameras, see [92]Maurice Delaney's website or read - [93]this discussion on dpreview. - For the Minolta DiMAGE G400, G500, or G600, go [94]here (in - Russian) or [95]here (in English). + [90]special "DIAG RAW" mode. + For Casio cameras, see [91]Maurice Delaney's website or read + [92]this discussion on dpreview. + For the Minolta DiMAGE G400, G500, G530, or G600, go [93]here + (in Russian) or [94]here (in English). For the Minolta DiMAGE Z2 and Nikon Coolpix 2100/3100/3700, - [96]go here. - For SMaL cameras, see the [97]camerahacking Forum. + [95]go here. + For SMaL cameras, see the [96]camerahacking Forum. For other cameras, refer to the User's Manual. @@ -255,7 +264,7 @@ Most likely, yes. The cameras listed below are supported. If your camera is not on the list, try dcraw anyway. If it doesn't work, post a raw image to a website and e-mail me the URL. If - you don't have a website, use [98]Dropload or [99]YouSendIt. + you don't have a website, use [97]Dropload or [98]YouSendIt. Ideally, your sample image should show a standard white card or color chart in direct sunlight, with other colors in the @@ -290,11 +299,8 @@ + Canon EOS 10D + Canon EOS 20D + Canon EOS 30D - + Canon EOS 300D - + Canon EOS 350D - + Canon EOS Digital Rebel - + Canon EOS Digital Rebel XT - + Canon EOS Kiss Digital + + Canon EOS 300D / Digital Rebel / Kiss Digital + + Canon EOS 350D / Digital Rebel XT / Kiss Digital N + Canon EOS D2000C + Canon EOS-1D + Canon EOS-1DS @@ -334,12 +340,13 @@ + Fuji FinePix S9000/S9500 + Imacon Ixpress 16-megapixel + Imacon Ixpress 22-megapixel + + Imacon Ixpress 39-megapixel + ISG 2020x1520 - + Kodak DC20 (see [100]Oliver Hartman's page) - + Kodak DC25 (see [101]Jun-ichiro Itoh's page) + + Kodak DC20 (see [99]Oliver Hartman's page) + + Kodak DC25 (see [100]Jun-ichiro Itoh's page) + Kodak DC40 + Kodak DC50 - + Kodak DC120 (also try [102]kdc2tiff) + + Kodak DC120 (also try [101]kdc2tiff) + Kodak DCS315C + Kodak DCS330C + Kodak DCS420 @@ -371,11 +378,22 @@ + Konica KD-400Z + Konica KD-510Z + Leaf Aptus 17 + + Leaf Aptus 22 + + Leaf Aptus 65 + + Leaf Aptus 75 + + Leaf Cantare + + Leaf CatchLight + + Leaf CMost + + Leaf DCB2 + + Leaf Valeo 6 + Leaf Valeo 11 + + Leaf Valeo 17 + Leaf Valeo 22 + Leaf Volare + Leica Digilux 2 + + Leica D-Lux 2 + Logitech Fotoman Pixtura + + Micron 2010 + Minolta RD175 + Minolta DiMAGE 5 + Minolta DiMAGE 7 @@ -386,6 +404,7 @@ + Minolta DiMAGE A200 + Minolta DiMAGE G400 + Minolta DiMAGE G500 + + Minolta DiMAGE G530 + Minolta DiMAGE G600 + Minolta DiMAGE Z2 + Minolta Alpha/Dynax/Maxxum 5D @@ -433,6 +452,7 @@ + Olympus E-300 + Olympus E-330 + Olympus E-500 + + Olympus SP350 + Olympus SP500UZ + Panasonic DMC-FZ30 + Panasonic DMC-LC1 @@ -455,10 +475,13 @@ + Polaroid x530 + Rollei d530flex + RoverShot 3320af + + Samsung GX-1S + Sarnoff 4096x5440 + Sigma SD9 + Sigma SD10 + Sinar 3072x2048 + + Sinar 4080x4080 + + Sinar 4080x5440 + Sinar STI format + SMaL Ultra-Pocket 3 + SMaL Ultra-Pocket 4 @@ -466,6 +489,8 @@ + Sony DSC-F828 + Sony DSC-R1 + Sony DSC-V3 + + Sony DSLR-A100 + + Sony XCD-SX910CR + STV680 VGA _________________________________________________________________ @@ -482,94 +507,93 @@ 9. http://www.cybercom.net/~dcoffin/resume.html 10. http://www.cybercom.net/~dcoffin/dcraw/dcraw.c 11. http://www.cybercom.net/~dcoffin/dcraw/rawphoto.c - 12. http://ptj.rozeta.com.pl/Soft/RawPhoto/ - 13. http://ufraw.sourceforge.net/ - 14. http://pages.quicksilver.net.nz/pepe/ - 15. http://www.cybercom.net/~dcoffin/dcraw/.badpixels - 16. http://www.cybercom.net/~dcoffin/dcraw/dcraw.1 - 17. http://www.cybercom.net/~dcoffin/dcraw/dcwrap - 18. http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v - 19. http://www.cs.purdue.edu/homes/trinkle/RCS/ - 20. http://www.cybercom.net/~dcoffin/dcraw/parse.c - 21. http://www.cybercom.net/~dcoffin/dcraw/clean_crw.c - 22. http://www.cybercom.net/~dcoffin/dcraw/fixdates.c - 23. http://www.cybercom.net/~dcoffin/dcraw/fujiturn.c - 24. http://www.cybercom.net/~dcoffin/dcraw/fuji_green.c - 25. http://www.cybercom.net/~dcoffin/dcraw/decompress.c - 26. http://www.cybercom.net/~dcoffin/dcraw/pgm.c - 27. http://www.cybercom.net/~dcoffin/dcraw/sony_clear.c - 28. http://www.acdsystems.com/ - 29. http://www.adobe.com/products/photoshop/cameraraw.html - 30. http://www.br-software.com/ - 31. http://www.breezesys.com/ - 32. http://www.conceiva.com/ - 33. http://cpicture.net/en/t_raw.html - 34. http://www.canto.com/ - 35. http://frostyplace.com/dcraw/ - 36. http://www.tanis.dk/wiki/index.php/DCRawUI - 37. http://www.pretentiousname.com/jp2raw/ - 38. http://www.dpmagic.com/ - 39. http://www.easyraw.com/ - 40. http://www.lemkesoft.com/ - 41. http://jcoconsulting.com/index.asp?Section=GVOCX - 42. http://www.irfanview.com/ - 43. http://www.astrosurf.com/buil/us/iris/iris.htm - 44. http://www.kaorg.com/photoservice.asp - 45. http://www.lightboxsoftware.com/ - 46. http://sonic.net/~rat/lightcrafts/ - 47. http://www.wildcape.com/ - 48. http://photojockey.com/ - 49. http://smatters.com/dcraw/ - 50. http://www.k-i-s.net/ - 51. http://www.sticksoftware.com/software/PhotoReviewer.html - 52. http://www.picasa.com/ - 53. http://www.picturearena.com/ - 54. http://www.pixpo.com/ - 55. http://www.polybytes.com/ - 56. http://lens.liteserv.com/download/powershovel2.php - 57. http://www.iridientdigital.com/ - 58. http://www.rawmagick.com/ - 59. http://www.i-graph.com/ - 60. http://www.wizards.de/rawdrop - 61. http://www.pixmantec.com/ - 62. http://www.through-the-lens.net/ - 63. http://www.serif.com/ - 64. http://www.logicaldesigns.com/ - 65. http://www.silverfast.com/ - 66. http://www.studioline.net/ - 67. http://www.hexcat.com/viewit/ - 68. http://www.dimin.net/software/viewer/ - 69. http://www.hamrick.com/ - 70. http://www.insflug.org/raw/ - 71. http://www.lebsanft.org/blog/index.php?cat=9 - 72. http://www.delorie.com/djgpp/ - 73. http://www.sno.phy.queensu.ca/~phil/exiftool/ - 74. http://www.cybercom.net/~dcoffin/dcraw/scan.c - 75. http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf - 76. http://www.map.tu.chiba-u.ac.jp/IEC/100/TA2/recdoc/N4378.pdf - 77. http://www.adobe.com/products/dng/pdfs/dng_spec.pdf - 78. http://xyrion.org/ciff/ - 79. http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf - 80. http://dl.maptools.org/dl/libtiff/tiff-3.8.0.tar.gz - 81. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch - 82. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c - 83. http://www.adobe.com/products/dng/main.html - 84. http://www.adobe.com/products/photoshop/main.html - 85. http://cinepaint.sourceforge.net/ + 12. http://ufraw.sourceforge.net/ + 13. http://pages.quicksilver.net.nz/pepe/ + 14. http://www.cybercom.net/~dcoffin/dcraw/.badpixels + 15. http://www.cybercom.net/~dcoffin/dcraw/dcraw.1 + 16. http://www.cybercom.net/~dcoffin/dcraw/RCS/dcraw.c,v + 17. http://www.cs.purdue.edu/homes/trinkle/RCS/ + 18. http://www.cybercom.net/~dcoffin/dcraw/parse.c + 19. http://www.cybercom.net/~dcoffin/dcraw/clean_crw.c + 20. http://www.cybercom.net/~dcoffin/dcraw/fujiturn.c + 21. http://www.cybercom.net/~dcoffin/dcraw/fuji_green.c + 22. http://www.cybercom.net/~dcoffin/dcraw/decompress.c + 23. http://www.cybercom.net/~dcoffin/dcraw/sony_clear.c + 24. http://www.acdsystems.com/ + 25. http://www.adobe.com/products/photoshop/cameraraw.html + 26. http://www.br-software.com/ + 27. http://www.breezesys.com/ + 28. http://www.conceiva.com/ + 29. http://cpicture.net/en/t_raw.html + 30. http://www.canto.com/ + 31. http://frostyplace.com/dcraw/ + 32. http://www.tanis.dk/wiki/index.php/DCRawUI + 33. http://www.pretentiousname.com/jp2raw/ + 34. http://deepskystacker.free.fr/ + 35. http://www.dpmagic.com/ + 36. http://www.easyraw.com/ + 37. http://www.lemkesoft.com/ + 38. http://jcoconsulting.com/index.asp?Section=GVOCX + 39. http://www.irfanview.com/ + 40. http://www.astrosurf.com/buil/us/iris/iris.htm + 41. http://www.kaorg.com/photoservice.asp + 42. http://www.lightboxsoftware.com/ + 43. http://sonic.net/~rat/lightcrafts/ + 44. http://www.wildcape.com/ + 45. http://photojockey.com/ + 46. http://smatters.com/dcraw/ + 47. http://www.k-i-s.net/ + 48. http://www.sticksoftware.com/software/PhotoReviewer.html + 49. http://www.picasa.com/ + 50. http://www.picturearena.com/ + 51. http://www.pixpo.com/ + 52. http://www.polybytes.com/ + 53. http://lens.liteserv.com/download/powershovel2.php + 54. http://www.iridientdigital.com/ + 55. http://www.rawmagick.com/ + 56. http://www.i-graph.com/ + 57. http://www.wizards.de/rawdrop + 58. http://www.pixmantec.com/ + 59. http://www.through-the-lens.net/ + 60. http://www.serif.com/ + 61. http://www.logicaldesigns.com/ + 62. http://www.silverfast.com/ + 63. http://www.studioline.net/ + 64. http://www.hexcat.com/viewit/ + 65. http://www.dimin.net/software/viewer/ + 66. http://www.hamrick.com/ + 67. http://www.insflug.org/raw/ + 68. http://www.lebsanft.org/blog/index.php?cat=9 + 69. http://www.delorie.com/djgpp/ + 70. http://www.sno.phy.queensu.ca/~phil/exiftool/ + 71. http://www.cybercom.net/~dcoffin/dcraw/scan.c + 72. http://www.cybercom.net/~dcoffin/dcraw/read_ndf.c + 73. http://partners.adobe.com/asn/developer/PDFS/TN/TIFF6.pdf + 74. http://www.map.tu.chiba-u.ac.jp/IEC/100/TA2/recdoc/N4378.pdf + 75. http://www.adobe.com/products/dng/pdfs/dng_spec.pdf + 76. http://xyrion.org/ciff/ + 77. http://www.x3f.info/technotes/FileDocs/X3F_Format.pdf + 78. http://dl.maptools.org/dl/libtiff/tiff-3.8.0.tar.gz + 79. http://www.cybercom.net/~dcoffin/dcraw/libtiff.patch + 80. http://www.cybercom.net/~dcoffin/dcraw/elphel_dng.c + 81. http://www.adobe.com/products/dng/main.html + 82. http://www.adobe.com/products/photoshop/main.html + 83. http://cinepaint.sourceforge.net/ + 84. http://www.cybercom.net/~dcoffin/dcraw/ahd_maze.png + 85. http://www.cybercom.net/~dcoffin/dcraw/vng_grid.png 86. http://netpbm.sourceforge.net/ 87. http://www.imagemagick.org/ 88. http://www.faqs.org/docs/artu/multiprogramchapter.html - 89. http://www.cybercom.net/~dcoffin/dcraw/screendoor.png - 90. http://www.dpreview.com/news/0202/02021101foveonx3.asp - 91. http://e2500.narod.ru/raw_format_e.htm - 92. http://www.inweb.ch/foto/rawformat.html - 93. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779 - 94. http://myfototest.narod.ru/ - 95. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287 - 96. http://tester13.nm.ru/nikon/ - 97. http://www.camerahacking.com/ - 98. http://dropload.com/ - 99. http://yousendit.com/ - 100. http://www.planet-interkom.de/oliver.hartmann/dc20secr.htm - 101. http://www.itojun.org/diary/19961113/index.eng.html - 102. http://kdc2tiff.sourceforge.net/ + 89. http://www.dpreview.com/news/0202/02021101foveonx3.asp + 90. http://e2500.narod.ru/raw_format_e.htm + 91. http://www.inweb.ch/foto/rawformat.html + 92. http://forums.dpreview.com/forums/read.asp?forum=1015&message=4961779 + 93. http://myfototest.narod.ru/ + 94. http://forums.dpreview.com/forums/read.asp?forum=1024&message=11773287 + 95. http://tester13.nm.ru/nikon/ + 96. http://www.camerahacking.com/ + 97. http://dropload.com/ + 98. http://yousendit.com/ + 99. http://www.planet-interkom.de/oliver.hartmann/dc20secr.htm + 100. http://www.itojun.org/diary/19961113/index.eng.html + 101. http://kdc2tiff.sourceforge.net/ ++++++ dcraw.1 ++++++ --- dcraw/dcraw.1 2006-02-09 23:23:15.000000000 +0100 +++ dcraw/dcraw.1 2006-07-18 08:44:41.000000000 +0200 @@ -9,7 +9,7 @@ .\" dcoffin a cybercom o net .\" http://www.cybercom.net/~dcoffin .\" -.TH dcraw 1 "February 7, 2006" +.TH dcraw 1 "July 18, 2006" .LO 1 .SH NAME dcraw - command-line decoder for raw digital photos @@ -52,24 +52,23 @@ Show the raw data as a grayscale image with no interpolation. Good for photographing black-and-white documents. .TP +.B -D +Same as +.BR -d , +but totally raw (no color scaling). +.TP .B -h Output a half-size color image. Twice as fast as .BR -q\ 0 . .TP -.B -q [0-3] -Set the interpolation quality: - -.B \t0 -\ \ Bilinear (very fast, low quality) -.br -.B \t1 -\ \ Reserved -.br -.B \t2 -\ \ Variable Number of Gradients (VNG) -.br -.B \t3 -\ \ Adaptive Homogeneity-Directed (AHD) +.B -q 0 +Use high-speed, low-quality bilinear interpolation. +.TP +.B -q 2 +Use Variable Number of Gradients (VNG) interpolation. +.TP +.B -q 3 +Use Adaptive Homogeneity-Directed (AHD) interpolation. .TP .B -f Interpolate RGB as four colors. Use this if the output shows @@ -85,6 +84,24 @@ .B -B\ 2\ 4 to start. .TP +.B -b brightness +By default, +.B dcraw +writes 8-bit PGM/PPM/PAM with a BT.709 gamma curve and a +99th-percentile white point. If the result is too light or +too dark, +.B -b +lets you adjust it. Default is 1.0. +.TP +.B -4 +Write 16-bit linear pseudo-PGM/PPM/PAM with no gamma curve, +no white point, and no +.B -b +option. +.TP +.B -T +Write TIFF output (with metadata) instead of PGM/PPM/PAM. +.TP .B -k black Set the black point. Default depends on the camera. .TP @@ -96,25 +113,32 @@ Use the color balance specified by the camera. If this can't be found, print a warning and revert to the default. .TP -.B -r red_mul -l blue_mul -Customize the color balance by multiplying the red and blue -output channels by these values. Both default to 1.0. -.TP -.B -b brightness -Multiply all output channels by this value. Default is 1.0. -.TP -.B -n -By default, -.B dcraw -clips all colors to prevent pink highlights. Use -.B -n -b 0.25 -to leave the image data completely unclipped. +.B -r mul0 mul1 mul2 mul3 +Specify your own raw color balance. These multipliers can be cut +and pasted from the output of +.BR dcraw\ -v . +.TP +.B -H 0 +Clip all highlights to solid white (default). +.TP +.B -H 1 +Leave highlights unclipped in various shades of pink. +.TP +.B -H 2-9 +Reconstruct highlights. Low numbers favor whites; high numbers +favor colors. Try +.B -H 5 +as a compromise. If that's not good enough, do +.BR -H\ 9 , +cut out the non-white highlights, and paste them into an image +generated with +.BR -H\ 3 . .TP .B -m Same as .BR -o\ 0 . .TP -.B -o [0-4] +.B -o [0-5] Select the output colorspace when the .B -p option is not used: @@ -126,13 +150,13 @@ \ \ sRGB D65 (default) .br .B \t2 -\ \ Adobe 1998 D65 +\ \ Adobe RGB (1998) D65 .br .B \t3 -\ \ Wide Gamut D65 +\ \ Wide Gamut RGB D65 .br .B \t4 -\ \ Kodak ProPhoto D65 +\ \ Kodak ProPhoto RGB D65 .br .B \t5 \ \ XYZ @@ -140,8 +164,16 @@ .BR -p\ camera.icm \ [\ -o\ output.icm \ ] Use ICC profiles to define the camera's raw colorspace and the desired output colorspace (sRGB by default). +.TP .B -p embed -uses the ICC profile embedded in the raw photo. +Use the ICC profile embedded in the raw photo. +.TP +.B -t [0-7,90,180,270] +Flip the output image. By default, +.B dcraw +applies the flip specified by the camera. +.B -t 0 +disables all flipping. .TP .B -j For Fuji\ Super\ CCD cameras, show the image tilted 45 degrees, @@ -158,27 +190,6 @@ and .B -s are silently ignored. -.TP -.B -t [0-7,90,180,270] -Flip the output image. By default, -.B dcraw -applies the flip specified by the camera. -.B -t 0 -disables all flipping. -.TP -.B -2 -Write 8-bit PGM/PPM/PAM with a 99th-percentile white point and -the BT.709 gamma curve. Double one dimension if needed to -correct the aspect ratio. This is the default. -.TP -.B -4 -Write 16-bit linear pseudo-PGM/PPM/PAM. No white point, no gamma, -raw aspect ratio. -.TP -.B -3 -Same image as -.BR -4 , -written in Adobe PhotoShop format. .SH "SEE ALSO" .BR pgm (5), .BR ppm (5), @@ -189,14 +200,5 @@ .BR gphoto2 (1), .BR cjpeg (1), .BR djpeg (1) -.SH BUGS -The author stubbornly refuses to add more output formats. -.P -Don't expect -.B dcraw -to produce the same images as software provided by the camera -vendor. Often -.B dcraw -yields better results! .SH AUTHOR Written by David Coffin, dcoffin a cybercom o net ++++++ dcraw.c ++++++ ++++ 3591 lines (skipped) ++++ between dcraw.c ++++ and dcraw/dcraw.c ++++++ parse.c ++++++ --- dcraw/parse.c 2006-03-21 01:15:45.000000000 +0100 +++ dcraw/parse.c 2006-07-19 08:20:09.000000000 +0200 @@ -5,8 +5,8 @@ This program displays raw metadata for all raw photo formats. It is free for all uses. - $Revision: 1.57 $ - $Date: 2006/03/20 22:45:17 $ + $Revision: 1.61 $ + $Date: 2006/07/19 06:14:53 $ */ #include <stdio.h> @@ -78,6 +78,17 @@ return u.f; } +double get_double() +{ + union { char c[8]; double d; } u; + int i, rev; + + rev = 7 * ((order == 0x4949) == (ntohs(0x1234) == 0x1234)); + for (i=0; i < 8; i++) + u.c[i ^ rev] = fgetc(ifp); + return u.d; +} + void tiff_dump(int base, int tag, int type, int count, int level) { int save, j, num, den; @@ -89,6 +100,7 @@ save = ftell(ifp); printf("%*stag=0x%x %d, type=%d, count=%d, offset=%06x, data=", level*2, "", tag, tag, type, count, save); + if (tag == 34310) goto quit; if (type==2) putchar('\"'); for (j = 0; j < count && j < DLEN; j++) switch (type) { @@ -109,9 +121,11 @@ num = get4(); den = get4(); printf (" %d/%d", num, den); +// printf (" %lf", (double) num/den); break; } if (type==2) putchar('\"'); +quit: putchar('\n'); fseek (ifp, save, SEEK_SET); } @@ -298,7 +312,7 @@ FILE *sfp; entries = get2(); - if (entries > 255) return 1; + if (entries > 1024) return 1; while (entries--) { save = ftell(ifp); tag = get2(); @@ -329,6 +343,11 @@ case 29184: sony_offset = get4(); break; case 29185: sony_length = get4(); break; case 29217: sony_key = get4(); break; + case 33424: + puts("Kodak private data:"); + fseek (ifp, get4()+base, SEEK_SET); + parse_tiff_ifd (base, level+1); + break; case 34310: parse_mos(0); break; @@ -381,11 +400,6 @@ printf ("IFD #%d:\n", ifd++); if (parse_tiff_ifd (base, 0)) break; } - if (!strncmp(make,"Kodak",5) && !is_dng) { - fseek (ifp, 12+base, SEEK_SET); - puts ("\nSpecial Kodak image directory:"); - parse_tiff_ifd (base, 0); - } } void parse_minolta() @@ -414,6 +428,7 @@ { int tboff, nrecs, i, j, type, len, dlen, roff, aoff=0, save; char c, name[256]; + ushort key[2]; fseek (ifp, offset+length-4, SEEK_SET); tboff = get4() + offset; @@ -461,8 +476,14 @@ putchar('\"'); break; case 0x10: /* word values */ + key[0] = get2(); + fseek (ifp, -2, SEEK_CUR); + if (type == 0x1032 && key[0] == 1040) + key[1] = 17907; + else key[0] = key[1] = 0; for (j = 0; j < dlen; j+=2) - printf ("%c%5u",(j & 31) || dlen < 16 ? ' ':'\n', get2()); + printf ("%c%5u",(j & 31) || dlen < 16 ? ' ':'\n', + get2() ^ key[(j >> 1) & 1]); break; case 0x18: /* dword values */ for (j = 0; j < dlen; j+=4) @@ -538,13 +559,16 @@ save = ftell(ifp); while (1) { - fread (data, 1, 8, ifp); - if (strcmp(data,"PKTS")) break; - strcpy (model, "Valeo"); - printf ("%*s%s ", level, "", data); + if (get4() != 0x504b5453) break; + get4(); + printf ("%*sPKTS ", level, ""); fread (data, 1, 40, ifp); skip = get4(); printf ("%s %d bytes: ", data, skip); + if (!strcmp(data,"pattern_ratation_angle")) { + printf ("%d\n", get2()); + continue; + } if (!strcmp(data,"icc_camera_to_tone_matrix")) { for (i=0; i < skip/4; i++) printf ("%f ", int_to_float(get4())); @@ -787,8 +811,11 @@ len = get4(); data = get4(); save = ftell(ifp); - printf ("Phase One tag=0x%x, type=%d, len=%2d, data = 0x%x\n", + printf ("Phase One tag=0x%x, type=%d, len=%2d, data = 0x%x", tag, type, len, data); + if (type == 4 && len == 4 && data > 0xfffffff) + printf (" = %f", int_to_float(data)); + putchar ('\n'); if (tag == 0x110) meta = base+data; if (len > 4) fseek (ifp, base+data, SEEK_SET); @@ -819,37 +846,54 @@ save = ftell(ifp); printf ("Phase One meta tag=0x%x, len=%2d, offset = 0x%x, data = ", tag, len, data); - if (tag >> 2 != 0x101) putchar ('\n'); - if (len) { - fseek (ifp, meta+data, SEEK_SET); - if (tag >> 2 == 0x101 && len < 256) { - fread (str, 256, 1, ifp); - puts (str); - } else if (tag == 0x400) { + if (!((0x000801f4 >> (tag-0x400)) & 1)) putchar ('\n'); + fseek (ifp, meta+data, SEEK_SET); + switch (tag) { + case 0x400: for (i=0; i < len; i+=2) printf ("%5u%c", get2(), (i & 6) == 6 || i == len-2 ? '\n':' '); - } else if (tag == 0x401) { + break; + case 0x401: for (i=0; i < 16; i+=2) printf ("%6u%c", get2(), (i & 14) == 14 || i == len-2 ? '\n':' '); for (; i < len; i+=4) printf ("%9.6f%c", int_to_float(get4()), (i & 28) == 12 || i == len-4 ? '\n':' '); - } else if (tag == 0x412) { - for (i=0; i < 38; i+=2) { - printf ("%6u", j=get2()); + break; + case 0x402: + printf ("%f\n", int_to_float (data)); + break; + case 0x404: case 0x405: case 0x406: case 0x407: + fread (str, 256, 1, ifp); + puts (str); + break; + case 0x408: case 0x413: + printf ("%lf\n", get_double()); + break; + case 0x40b: case 0x410: case 0x416: + for (i=0; i < len; i+=2) + printf ("%6u%c", get2(), (i & 14) == 14 || i == len-2 ? '\n':' '); + break; + case 0x40f: case 0x418: case 0x419: case 0x41a: + for (i=0; i < 4; i++) + printf ("%02X%c", fgetc(ifp), i == 3 ? '\n':' '); + for (; i < len; i+=4) + printf ("%e%c", int_to_float(get4()), i == len-4 ? '\n':' '); + break; + case 0x412: + for (i=0; i < 36; i+=4) { + printf ("%u ", j=get4()); if (i == 4) wide = j; if (i == 12) high = j*2; } - putchar ('\n'); + printf ("%u\n", get2()); for (i=0; i < wide*high; i++) printf ("%9.6f%c", int_to_float(get4()), i % wide == wide-1 ? '\n':' '); for (i=0; i < wide*high; i++) printf ("%5u%c", get2(), i % wide == wide-1 ? '\n':' '); - } else if (tag == 0x40b || tag == 0x410 || tag == 0x416) - for (i=0; i < len; i+=2) - printf ("%6u%c", get2(), (i & 14) == 14 || i == len-2 ? '\n':' '); - else + break; + default: for (i=0; i < len; i++) printf ("%02X%c", fgetc(ifp), (i & 15) == 15 || i == len-1 ? '\n':' '); @@ -894,6 +938,8 @@ fseek (ifp, hlen, SEEK_SET); } else parse_tiff (0); + } else if (!memcmp (head,"NDF0",4)) { + parse_tiff (12); } else if (!memcmp (head,"\0MRM",4)) { parse_minolta(); } else if (!memcmp (head,"FUJIFILM",8)) { @@ -910,15 +956,7 @@ parse_rollei(); else if (!memcmp (head,"FOVb",4)) parse_foveon(); - fseek (ifp, 8, SEEK_SET); - parse_mos(0); - fseek (ifp, 3472, SEEK_SET); - parse_mos(0); parse_jpeg(0); - if (model[0] == 0) { - fprintf (stderr, "%s: unsupported file format.\n", fname); - return; - } } int main(int argc, char **argv) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aspell
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package aspell checked in at Wed Aug 2 15:39:54 CEST 2006. -------- --- aspell/aspell.changes 2006-06-30 14:56:48.000000000 +0200 +++ aspell/aspell.changes 2006-08-02 14:57:47.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 14:56:54 CEST 2006 - pnemec(a)suse.cz + +- fixed wrong parametr name in header file [#175555] + +------------------------------------------------------------------- New: ---- aspell-duplicate_name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aspell.spec ++++++ --- /var/tmp/diff_new_pack.Kcqpzi/_old 2006-08-02 15:39:04.000000000 +0200 +++ /var/tmp/diff_new_pack.Kcqpzi/_new 2006-08-02 15:39:04.000000000 +0200 @@ -20,12 +20,13 @@ PreReq: %install_info_prereq Autoreqprov: on Version: 0.60.4 -Release: 1 +Release: 2 Summary: A Free and Open Source Spell Checker URL: http://aspell.net/ Source: aspell-%{version}.tar.bz2 Patch: aspell-gcc-warning.patch Patch1: aspell-%{version}-strict-aliasing.patch +Patch2: aspell-duplicate_name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +60,7 @@ %setup -q %patch %patch1 +%patch2 %build %{suse_update_config} @@ -130,6 +132,8 @@ %{_libdir}/libpspell.so %changelog -n aspell +* Wed Aug 02 2006 - pnemec(a)suse.cz +- fixed wrong parametr name in header file [#175555] * Fri Jun 30 2006 - pnemec(a)suse.cz - updated to 0.60.4 primary a bug fix release ++++++ aspell-duplicate_name.patch ++++++ Index: aspell-0.60.4/modules/speller/default/affix.hpp =================================================================== --- modules/speller/default/affix.hpp.orig +++ modules/speller/default/affix.hpp @@ -107,7 +107,7 @@ namespace aspeller { { return expand(word,aff,buf,0); } - WordAff * expand_suffix(ParmString word, const unsigned char * new_aff, + WordAff * expand_suffix(ParmString word, const unsigned char * aff, ObjStack &, int limit = INT_MAX, unsigned char * new_aff = 0, WordAff * * * l = 0, ParmString orig_word = 0) const; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-firewall
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package yast2-firewall checked in at Wed Aug 2 12:54:40 CEST 2006. -------- --- yast2-firewall/yast2-firewall.changes 2006-07-18 13:32:58.000000000 +0200 +++ yast2-firewall/yast2-firewall.changes 2006-08-02 11:39:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 18 14:56:24 CEST 2006 - locilka(a)suse.cz + +- Summary informs whether the firewall service will be running or + stopped after the configuration gets written. +- 2.13.10 + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.13.9.tar.bz2 New: ---- yast2-firewall-2.13.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.QMQmDD/_old 2006-08-02 12:54:13.000000000 +0200 +++ /var/tmp/diff_new_pack.QMQmDD/_new 2006-08-02 12:54:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firewall (Version 2.13.9) +# spec file for package yast2-firewall (Version 2.13.10) # # 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-firewall -Version: 2.13.9 +Version: 2.13.10 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.13.9.tar.bz2 +Source0: yast2-firewall-2.13.10.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-installation yast2-testsuite Requires: yast2 @@ -39,7 +39,7 @@ Lukas Ocilka <locilka(a)suse.de> %prep -%setup -n yast2-firewall-2.13.9 +%setup -n yast2-firewall-2.13.10 %build %{prefix}/bin/y2tool y2autoconf @@ -72,6 +72,10 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog -n yast2-firewall +* Tue Jul 18 2006 - locilka(a)suse.cz +- Summary informs whether the firewall service will be running or + stopped after the configuration gets written. +- 2.13.10 * Mon Jul 17 2006 - locilka(a)suse.cz - Adding help for Additional Services dialog. - Checking port ranges for rightness. ++++++ yast2-firewall-2.13.9.tar.bz2 -> yast2-firewall-2.13.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/VERSION new/yast2-firewall-2.13.10/VERSION --- old/yast2-firewall-2.13.9/VERSION 2006-07-18 11:05:16.000000000 +0200 +++ new/yast2-firewall-2.13.10/VERSION 2006-08-02 11:39:31.000000000 +0200 @@ -1 +1 @@ -2.13.9 +2.13.10 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/configure new/yast2-firewall-2.13.10/configure --- old/yast2-firewall-2.13.9/configure 2006-07-18 13:51:14.000000000 +0200 +++ new/yast2-firewall-2.13.10/configure 2006-08-02 11:40:22.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-firewall 2.13.9. +# Generated by GNU Autoconf 2.59 for yast2-firewall 2.13.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.13.9' -PACKAGE_STRING='yast2-firewall 2.13.9' +PACKAGE_VERSION='2.13.10' +PACKAGE_STRING='yast2-firewall 2.13.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' 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-firewall 2.13.9 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.13.10 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-firewall 2.13.9:";; + short | recursive ) echo "Configuration of yast2-firewall 2.13.10:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.13.9 +yast2-firewall configure 2.13.10 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-firewall $as_me 2.13.9, which was +It was created by yast2-firewall $as_me 2.13.10, 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-firewall' - VERSION='2.13.9' + VERSION='2.13.10' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.9" +VERSION="2.13.10" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-firewall $as_me 2.13.9, which was +This file was extended by yast2-firewall $as_me 2.13.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firewall config.status 2.13.9 +yast2-firewall config.status 2.13.10 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-firewall-2.13.9/configure.in new/yast2-firewall-2.13.10/configure.in --- old/yast2-firewall-2.13.9/configure.in 2006-07-18 13:51:09.000000000 +0200 +++ new/yast2-firewall-2.13.10/configure.in 2006-08-02 11:40:19.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.13.9, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.13.10, http://bugs.opensuse.org/, yast2-firewall) 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.9" +VERSION="2.13.10" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/src/dialogs.ycp new/yast2-firewall-2.13.10/src/dialogs.ycp --- old/yast2-firewall-2.13.9/src/dialogs.ycp 2006-07-17 15:58:33.000000000 +0200 +++ new/yast2-firewall-2.13.10/src/dialogs.ycp 2006-07-18 14:57:44.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs and workflow * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 31903 2006-07-17 14:00:01Z locilka $ + * $Id: dialogs.ycp 31930 2006-07-18 12:59:16Z locilka $ * * Configuration dialogs and workflow. * Both Expert and Simple. @@ -34,7 +34,7 @@ // or // disabled + stop (after Write()) "set_service_auto_start" : SetEnableFirewall, - + // TRANSLATORS: Radio selection "start_auto_button" : _("&When Booting"), // TRANSLATORS: Radio selection diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/src/helps.ycp new/yast2-firewall-2.13.10/src/helps.ycp --- old/yast2-firewall-2.13.9/src/helps.ycp 2006-07-17 11:13:52.000000000 +0200 +++ new/yast2-firewall-2.13.10/src/helps.ycp 2006-08-02 11:26:25.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Firewall dialogs helps * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: helps.ycp 31892 2006-07-17 09:15:22Z locilka $ + * $Id: helps.ycp 32099 2006-08-02 09:27:58Z locilka $ * * File includes helps for yast2-firewall dialogs. */ @@ -170,7 +170,7 @@ // TRANSLATORS: Additional Services dialog help 5/6 // please, do not modify examples - _("Port range is a couples of numbers, with a colon in between, + _("Port range is a couple of numbers, with a colon in between, and it represents all numbers inside the range including the numbers themselves. The first port number must be lower than the second one, e.g. <tt>200:215</tt>.") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/src/subdialogs.ycp new/yast2-firewall-2.13.10/src/subdialogs.ycp --- old/yast2-firewall-2.13.9/src/subdialogs.ycp 2006-07-17 11:13:52.000000000 +0200 +++ new/yast2-firewall-2.13.10/src/subdialogs.ycp 2006-08-02 11:26:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration screens * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: subdialogs.ycp 31892 2006-07-17 09:15:22Z locilka $ + * $Id: subdialogs.ycp 32099 2006-08-02 09:27:58Z locilka $ * * Configuration dialogs divided into smaller logic groups. * Both Expert and Simple. @@ -258,6 +258,41 @@ return dialog; } + term ExpertAcceptRules () { + term dialog = `VBox( + `Left( `ComboBox(`id("allowed_services_zone"), `opt(`notify), + // TRANSLATORS: combo box + _("Expert Rules Services for Selected Zone"), GetZonesListedItems() ) + ), + + `VSpacing ( 1 ), + + `VBox ( + `Table ( + `id("table_expert_accept_rules"), + `header ( + // TRANSLATORS: table header item + _("Source Network"), + // TRANSLATORS: table header item + _("Protocol"), + // TRANSLATORS: table header item + _("Destination Port"), + // TRANSLATORS: table header item + _("Source Port") + ), [] + ), + `VSquash ( + `HBox ( + `PushButton(`id("add_redirect_to_masquerade"), Label::AddButton()), + `PushButton(`id("remove_redirect_to_masquerade"), Label::RemoveButton()) + ) + ) + ) + ); + + return dialog; + } + term AdditionalServices (string zone_name) { term dialog = `HBox ( // help text with a defined minimal size diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.13.9/src/summary.ycp new/yast2-firewall-2.13.10/src/summary.ycp --- old/yast2-firewall-2.13.9/src/summary.ycp 2006-07-12 09:40:53.000000000 +0200 +++ new/yast2-firewall-2.13.10/src/summary.ycp 2006-07-18 14:57:44.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Firewall configuration summary * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: summary.ycp 31784 2006-07-12 07:42:21Z locilka $ + * $Id: summary.ycp 31930 2006-07-18 12:59:16Z locilka $ * * Summary functions. */ @@ -195,14 +195,42 @@ // TRANSLATORS: UI Summary header ("<h2>" + _("Firewall Starting") + "</h2>") ) + "\n"; + + ret_message = ret_message + ul_start; + // Firewall is enabled/disabled in the boot process if (SuSEFirewall::GetEnableService()) { // TRANSLATORS: Summary text item - ret_message = ret_message + ul_start + li_start + _("Start firewall when booting") + li_end + ul_end + "\n\n"; + ret_message = ret_message + li_start + _("Start firewall when booting") + li_end + "\n\n"; } else { // TRANSLATORS: Summary text item - ret_message = ret_message + ul_start + li_start + _("Start firewall manually") + li_end + ul_end + "\n\n"; + ret_message = ret_message + li_start + _("Start firewall manually") + li_end + "\n\n"; } + + // Firewall should be running/stopped + if (SuSEFirewall::GetStartService()) { + // Is running and will be running again + if (SuSEFirewall::IsStarted()) { + // TRANSLATORS: Summary text item + ret_message = ret_message + li_start + _("Firewall will be running after the configuration gets written") + li_end + "\n"; + // Is stopped and will be running + } else { + // TRANSLATORS: Summary text item + ret_message = ret_message + li_start + _("Firewall will be started after the configuration gets written") + li_end + "\n"; + } + } else { + // Is running and will be stopped + if (SuSEFirewall::IsStarted()) { + // TRANSLATORS: Summary text item + ret_message = ret_message + li_start + _("Firewall will be stopped after the configuration gets written") + li_end + "\n"; + // Is not running and will not be running + } else { + // TRANSLATORS: Summary text item + ret_message = ret_message + li_start + _("Firewall will not be running after the configuration gets written") + li_end + "\n"; + } + } + + ret_message = ret_message + ul_end + "\n\n"; return ret_message; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-dhcp-server
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package yast2-dhcp-server checked in at Wed Aug 2 12:54:06 CEST 2006. -------- --- yast2-dhcp-server/yast2-dhcp-server.changes 2006-06-05 11:06:12.000000000 +0200 +++ yast2-dhcp-server/yast2-dhcp-server.changes 2006-08-02 11:35:07.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Aug 2 11:34:37 CEST 2006 - locilka(a)suse.cz + +- Limit displayed interface name to 40 characters. +- 2.13.6 + +------------------------------------------------------------------- +Tue Jul 18 15:43:26 CEST 2006 - locilka(a)suse.cz + +- Card selection dialog changed to provide buttons [Select] and + [Unselect] and table header item to Selected to better reflect + the status of the network interfaces that are selected for + DHCP Server to run on (#164242). +- These buttons are enabled or disabled by the current status of + the selected interface. Active interface can be deactivated only + and vice versa. +- Different help for expert and simple UI in the Card Selection + dialog. + +------------------------------------------------------------------- +Thu Jul 13 11:46:21 CEST 2006 - locilka(a)suse.cz + +- Do not complain about blank DHCPD_INTERFACE in case of + (auto)installation. All interfaces will be used instead + by the dhcpd (#173861). +- 2.13.5 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-2.13.4.tar.bz2 New: ---- yast2-dhcp-server-2.13.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.CyTcGa/_old 2006-08-02 12:53:59.000000000 +0200 +++ /var/tmp/diff_new_pack.CyTcGa/_new 2006-08-02 12:53:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dhcp-server (Version 2.13.4) +# spec file for package yast2-dhcp-server (Version 2.13.6) # # 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-dhcp-server -Version: 2.13.4 +Version: 2.13.6 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dhcp-server-2.13.4.tar.bz2 +Source0: yast2-dhcp-server-2.13.6.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2 perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent @@ -34,7 +34,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-dhcp-server-2.13.4 +%setup -n yast2-dhcp-server-2.13.6 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,24 @@ %doc %{prefix}/share/doc/packages/yast2-dhcp-server %changelog -n yast2-dhcp-server +* Wed Aug 02 2006 - locilka(a)suse.cz +- Limit displayed interface name to 40 characters. +- 2.13.6 +* Tue Jul 18 2006 - locilka(a)suse.cz +- Card selection dialog changed to provide buttons [Select] and + [Unselect] and table header item to Selected to better reflect + the status of the network interfaces that are selected for + DHCP Server to run on (#164242). +- These buttons are enabled or disabled by the current status of + the selected interface. Active interface can be deactivated only + and vice versa. +- Different help for expert and simple UI in the Card Selection + dialog. +* Thu Jul 13 2006 - locilka(a)suse.cz +- Do not complain about blank DHCPD_INTERFACE in case of + (auto)installation. All interfaces will be used instead + by the dhcpd (#173861). +- 2.13.5 * Mon Jun 05 2006 - locilka(a)suse.cz - Fixing UI visibility, especially Time Units ComboBox (#181146). - 2.13.4 ++++++ yast2-dhcp-server-2.13.4.tar.bz2 -> yast2-dhcp-server-2.13.6.tar.bz2 ++++++ ++++ 1950 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/VERSION new/yast2-dhcp-server-2.13.6/VERSION --- old/yast2-dhcp-server-2.13.4/VERSION 2006-06-05 11:00:30.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/VERSION 2006-08-02 11:35:13.000000000 +0200 @@ -1 +1 @@ -2.13.4 +2.13.6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/configure.in new/yast2-dhcp-server-2.13.6/configure.in --- old/yast2-dhcp-server-2.13.4/configure.in 2006-06-05 11:06:41.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/configure.in 2006-08-02 11:38:12.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dhcp-server dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dhcp-server, 2.13.4, http://www.suse.de/feedback, yast2-dhcp-server) +AC_INIT(yast2-dhcp-server, 2.13.6, http://bugs.opensuse.org/, yast2-dhcp-server) 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.4" +VERSION="2.13.6" RPMNAME="yast2-dhcp-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/src/DhcpServer.pm new/yast2-dhcp-server-2.13.6/src/DhcpServer.pm --- old/yast2-dhcp-server-2.13.4/src/DhcpServer.pm 2006-05-17 09:20:12.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/src/DhcpServer.pm 2006-07-19 10:15:52.000000000 +0200 @@ -1337,7 +1337,7 @@ return { "install" => ["dhcp-server"], - "remote" => [], + "remove" => [], } } @@ -1502,7 +1502,11 @@ if (scalar (@allowed_interfaces) == 0) { y2milestone ("No interface was set to listen to!"); - $was_configured = 0; + # Bugzilla 173861 + # Permit empty list of interfaces + if (!Mode->autoinst() && !Mode->installation()) { + $was_configured = 0; + } } if (scalar (keys (%{SCR->Read (".target.stat", Directory->vardir () . "/dhcp_server_done_once") || {}})) == 0) { @@ -1655,7 +1659,15 @@ Progress->NextStage (); SCR->Write (".sysconfig.dhcpd.DHCPD_RUN_CHROOTED", $chroot ? "yes" : "no"); + my $ifaces_list = join (" ", @allowed_interfaces); + # in (auto)installation only + if ((Mode->autoinst() || Mode->installation()) && scalar(@allowed_interfaces) == 0) { + # bug #173861 + # " " means ANY interface + y2warning("Activating \" \" for DHCPD_INTERFACE"); + $ifaces_list = " "; + } SCR->Write (".sysconfig.dhcpd.DHCPD_INTERFACE", $ifaces_list); SCR->Write (".sysconfig.dhcpd", undef); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/src/dialogs2.ycp new/yast2-dhcp-server-2.13.6/src/dialogs2.ycp --- old/yast2-dhcp-server-2.13.4/src/dialogs2.ycp 2006-06-05 11:01:29.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/src/dialogs2.ycp 2006-08-02 11:35:38.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Vladimír Bobek <vbobek(a)suse.cz> * - * $Id: dialogs2.ycp 31309 2006-06-05 09:01:23Z locilka $ + * $Id: dialogs2.ycp 32100 2006-08-02 09:37:08Z locilka $ */ { @@ -25,6 +25,7 @@ import "ProductFeatures"; import "NetworkDevices"; import "Report"; +import "Mode"; include "dhcp-server/helps.ycp"; include "dhcp-server/widgets.ycp"; @@ -119,9 +120,10 @@ `Left( `Label( _("Network Cards for DHCP Server") ) ), `Table ( `id("nic_selection"), + `opt(`notify, `immediate), `header ( // TRANSLATORS: table header item - _("Active"), + _("Selected"), // TRANSLATORS: table header item _("Interface Name"), // TRANSLATORS: table header item @@ -133,8 +135,10 @@ ) ), `HBox ( - `PushButton(`id("add"), Label::AddButton()), - `PushButton(`id("remove"), Label::RemoveButton()) + // TRANSLATORS: a push-button + `PushButton(`id("add"), _("&Select")), + // TRANSLATORS: a push-button + `PushButton(`id("remove"), _("&Unselect")) ), `VStretch() ); @@ -142,6 +146,20 @@ return dialog; } +void SetInterfacesTableButtons () { + string current_item = (string) UI::QueryWidget(`id("nic_selection"), `CurrentItem); + + // The currently selected item is active, can be deactivated + if ((boolean) DhcpServerUI::ifaces[current_item, "active"]:nil == true) { + UI::ChangeWidget(`id("add"), `Enabled, false); + UI::ChangeWidget(`id("remove"), `Enabled, true); + // and vice versa + } else { + UI::ChangeWidget(`id("add"), `Enabled, true); + UI::ChangeWidget(`id("remove"), `Enabled, false); + } +} + void RedrawInterfacesTable () { list <term> table_items = []; foreach (string iface, map <string, any> settings, DhcpServerUI::ifaces, { @@ -153,10 +171,13 @@ settings["ipaddr"]:"" )); }); + UI::ChangeWidget(`id("nic_selection"), `Items, table_items); if (current_item_iface != nil) { UI::ChangeWidget(`id("nic_selection"), `CurrentItem, current_item_iface); } + + SetInterfacesTableButtons(); } void CardSelectionInit (string key) @@ -165,8 +186,13 @@ foreach (string iface, NetworkDevices::List(""), { if (iface != "" && !issubstring(iface, "lo") && !issubstring(iface, "sit")) { + string device_name = NetworkDevices::GetValue(iface, "NAME"); + if (size(device_name) > 40) { + device_name = substring (device_name, 0, 37) + "..."; + } + DhcpServerUI::ifaces[iface] = $[ - "device" : NetworkDevices::GetValue(iface, "NAME"), + "device" : device_name, "ipaddr" : (NetworkDevices::GetValue(iface, "BOOTPROTO") == "dhcp" ? // TRANSLATORS: Table items; Informs that the IP is a DHCP Address _("DHCP address") @@ -201,6 +227,8 @@ symbol CardSelectionHandle (string key, map event) { string item_id = (string) UI::QueryWidget(`id("nic_selection"), `CurrentItem); + SetInterfacesTableButtons(); + current_item_iface = item_id; if (expert_ui) { @@ -220,6 +248,7 @@ DhcpServerUI::ifaces[item_id,"active"] = false; } } + RedrawInterfacesTable(); return nil; @@ -303,12 +332,12 @@ `Left( `HBox( // Textentry with default lease time of IP address from dhcp server - `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("Default &Lease Time")), + `HSquash(`TextEntry(`id("defaultleasetime"), _("Default &Lease Time"))), `HSpacing(0.1), `MinWidth( TimeComboLabelLength(), // Units for defaultleasetime - `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "", time_combo_items) + `HSquash(`ComboBox(`id("defaultleasetimeunits"), _("&Units"), time_combo_items)) ) ) ) @@ -634,13 +663,13 @@ `opt(`hstretch), `HWeight( // Textentry label - lease time for IPs in the range - 3, `TextEntry(`id("defaultleasetime"), `opt(`hsquash), _("&Default")) + 3, `TextEntry(`id("defaultleasetime"), _("&Default")) ), `HWeight( 2, `MinWidth( TimeComboLabelLength(), // Combobox - type of units for lease time - `ComboBox(`id("defaultleasetimeunits"), `opt(`hsquash), "", + `ComboBox(`id("defaultleasetimeunits"), _("&Units"), time_combo_items ) ) @@ -648,13 +677,13 @@ `HSpacing(1), `HWeight( // TextEntryLabel - max. time for leasing of IPs from the range - 3, `TextEntry(`id("maxleasetime"), `opt(`hsquash), _("&Maximum")) + 3, `TextEntry(`id("maxleasetime"), _("&Maximum")) ), `HWeight( 2, `MinWidth( TimeComboLabelLength(), // Combobox - type of units for max lease time - `ComboBox(`id("maxleasetimeunits"), `opt(`hsquash), "", + `ComboBox(`id("maxleasetimeunits"), `opt(`hsquash), _("Uni&ts"), time_combo_items ) ) @@ -1518,7 +1547,7 @@ "store" : CardSelectionStore, "validate_type" : `function, "validate_function" : CardSelectionValidate, - "help" : HELPS["card_selection"]:"", + "help" : (expert_ui ? HELPS["card_selection_expert"]:"" : HELPS["card_selection_simple"]:""), ], "global_settings" : $[ "widget" : `custom, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/src/helps.ycp new/yast2-dhcp-server-2.13.6/src/helps.ycp --- old/yast2-dhcp-server-2.13.4/src/helps.ycp 2006-04-28 10:23:42.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/src/helps.ycp 2006-07-19 09:10:01.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 24963 2005-08-16 09:47:20Z locilka $ + * $Id: helps.ycp 31946 2006-07-19 07:11:33Z locilka $ */ { @@ -128,8 +128,12 @@ their primary name server. If the name server runs on the same host as the DHCP server, you can leave the fields empty."), - // Wizard Installation - Step 1 - "card_selection" : _("<big>Network Card Selection</big> + // Wizard Installation - Step 1 (version for expert UI) + "card_selection_expert" : _("<big>Network Card Selection</big> +Select one or more of listed network cards to use for the DHCP server."), + + // Wizard Installation - Step 1 (version for simple UI) + "card_selection_simple" : _("<big>Network Card Selection</big> Select one of listed network cards to use for the DHCP server."), // Wizard Installation - Step 2 1/9 @@ -215,7 +219,7 @@ * @param possible list of declarations that can be selected * @return string the help */ - global define string getSelectDeclarationTypeHelp (list possible) ``{ + define string getSelectDeclarationTypeHelp (list possible) ``{ // help text 1/7 string ret = _("Select the type of declaration to add."); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-dhcp-server-2.13.4/src/widgets.ycp new/yast2-dhcp-server-2.13.6/src/widgets.ycp --- old/yast2-dhcp-server-2.13.4/src/widgets.ycp 2006-04-28 10:23:42.000000000 +0200 +++ new/yast2-dhcp-server-2.13.6/src/widgets.ycp 2006-07-19 09:10:01.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Widgets * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: widgets.ycp 24963 2005-08-16 09:47:20Z locilka $ + * $Id: widgets.ycp 31946 2006-07-19 07:11:33Z locilka $ */ { @@ -21,6 +21,7 @@ import "Popup"; import "TablePopup"; import "SuSEFirewall"; + import "Mode"; // pre-declarations ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11-libs
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package xorg-x11-libs checked in at Wed Aug 2 12:53:37 CEST 2006. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2006-07-31 14:46:55.000000000 +0200 +++ xorg-x11-libs/xorg-x11-libs.changes 2006-08-02 10:55:58.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 10:55:54 CEST 2006 - sndirsch(a)suse.de + +- added /usr/include/X11/pixmaps/ to filelist + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.y8EjRf/_old 2006-08-02 12:53:27.000000000 +0200 +++ /var/tmp/diff_new_pack.y8EjRf/_new 2006-08-02 12:53:27.000000000 +0200 @@ -15,7 +15,7 @@ Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 URL: http://xorg.freedesktop.org/ Version: 7.1 -Release: 6 +Release: 7 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -201,6 +201,7 @@ make install DESTDIR=$RPM_BUILD_ROOT popd done +mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/ %clean rm -rf "$RPM_BUILD_ROOT" @@ -214,6 +215,7 @@ %files %defattr(-,root,root) /usr/include/X11/bitmaps/ +/usr/include/X11/pixmaps/ /usr/%{_lib}/*.so.* %files -n xorg-x11-devel @@ -235,6 +237,8 @@ %{_mandir}/man3/* %changelog -n xorg-x11-libs +* Wed Aug 02 2006 - sndirsch(a)suse.de +- added /usr/include/X11/pixmaps/ to filelist * Mon Jul 31 2006 - sndirsch(a)suse.de - moved bitmap directory from -devel to main package * Fri Jul 28 2006 - sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Wed Aug 2 12:53:35 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-08-01 18:42:12.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-08-02 12:09:40.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 2 12:09:03 CEST 2006 - sndirsch(a)suse.de + +- removed /usr/include/X11/bitmaps directory from filelist; now + belongs to xorg-x11-libs + +------------------------------------------------------------------- +Tue Aug 1 21:19:09 CEST 2006 - sndirsch(a)suse.de + +- fixed previous change + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.ZjWjzV/_old 2006-08-02 12:53:20.000000000 +0200 +++ /var/tmp/diff_new_pack.ZjWjzV/_new 2006-08-02 12:53:20.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.1 -Release: 7 +Release: 8 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -352,7 +352,7 @@ /usr/sbin/mkcomposecache /usr/sbin/rcxfs /usr/bin/* -/usr/include/X11/bitmaps/ +/usr/include/X11/bitmaps/* /usr/%{_lib}/libxrx* /usr/share/X11/ /usr/share/icons/* @@ -364,6 +364,11 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Wed Aug 02 2006 - sndirsch(a)suse.de +- removed /usr/include/X11/bitmaps directory from filelist; now + belongs to xorg-x11-libs +* Tue Aug 01 2006 - sndirsch(a)suse.de +- fixed previous change * Tue Aug 01 2006 - sndirsch(a)suse.de - fixed path for BackGround and other helpers in xdm configuration * Sat Jul 29 2006 - sndirsch(a)suse.de ++++++ xdm.diff ++++++ --- /var/tmp/diff_new_pack.ZjWjzV/_old 2006-08-02 12:53:22.000000000 +0200 +++ /var/tmp/diff_new_pack.ZjWjzV/_new 2006-08-02 12:53:22.000000000 +0200 @@ -14,15 +14,6 @@ no_exit_on_failed_exec=1 type shopt &> /dev/null && shopt -s execfail -@@ -57,7 +57,7 @@ - chooser=${BINDIR}/chooser - xmessage=${BINDIR}/xmessage - xrdb=${BINDIR}/xrdb -- backprg=${BINDIR}/BackGround -+ backprg=/usr/X11R6/bin/BackGround - - # - # Check if kdm is running and does its own background diff -u -r ../xdm.orig/Xreset ./Xreset --- ../xdm.orig/Xreset 2004-08-19 15:27:48.000000000 +0200 +++ ./Xreset 2006-07-12 21:28:33.000000000 +0200 @@ -90,15 +81,6 @@ no_exit_on_failed_exec=1 type shopt &> /dev/null && shopt -s execfail -@@ -56,7 +56,7 @@ - xconsole=${BINDIR}/xconsole - xmessage=${BINDIR}/xmessage - xrdb=${BINDIR}/xrdb -- backprg=${BINDIR}/BackGround -+ backprg=/usr/X11R6/bin/BackGround - halporp=/usr/bin/hal-find-by-property - xvkbd=${BINDIR}/xvkbd - glxinfo=${BINDIR}/glxinfo diff -u -r ../xdm.orig/Xstartup ./Xstartup --- ../xdm.orig/Xstartup 2006-03-31 11:54:52.000000000 +0200 +++ ./Xstartup 2006-07-12 21:33:49.000000000 +0200 ++++++ xdm.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/RunChooser new/RunChooser --- old/RunChooser 2006-08-01 18:39:50.000000000 +0200 +++ new/RunChooser 2006-08-01 21:14:08.000000000 +0200 @@ -10,7 +10,7 @@ LIBDIR=/usr/X11R6/lib/X11 ETCDIR=/etc/X11 XDMDIR=${ETCDIR}/xdm - BINDIR=/usr/bin + BINDIR=/usr/X11R6/bin no_exit_on_failed_exec=1 type shopt &> /dev/null && shopt -s execfail diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xsetup new/Xsetup --- old/Xsetup 2006-08-01 18:41:00.000000000 +0200 +++ new/Xsetup 2006-08-01 21:14:32.000000000 +0200 @@ -10,7 +10,7 @@ LIBDIR=/usr/X11R6/lib/X11 ETCDIR=/etc/X11 XDMDIR=${ETCDIR}/xdm - BINDIR=/usr/bin + BINDIR=/usr/X11R6/bin no_exit_on_failed_exec=1 type shopt &> /dev/null && shopt -s execfail ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xkeyboard-config
by root＠suse.de 02 Aug '06

02 Aug '06

Hello community, here is the log from the commit of package xkeyboard-config checked in at Wed Aug 2 12:53:22 CEST 2006. -------- --- xkeyboard-config/xkeyboard-config.changes 2006-07-28 14:43:41.000000000 +0200 +++ xkeyboard-config/xkeyboard-config.changes 2006-08-01 20:55:29.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 1 20:55:23 CEST 2006 - sndirsch(a)suse.de + +- added xorg-x11 to Requires/BuildRequires to fix build +- cleanup + +------------------------------------------------------------------- Old: ---- README.SuSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.rYSWqf/_old 2006-08-02 12:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.rYSWqf/_new 2006-08-02 12:53:15.000000000 +0200 @@ -11,22 +11,18 @@ # norootforbuild Name: xkeyboard-config -#!BuildIgnore: xorg-modular BuildRequires: intltool perl-XML-Parser xorg-x11 xorg-x11-devel URL: http://www.freedesktop.org/Software/XKeyboardConfig -%define REPLACE_XORG_XKB_FILES 1 License: GPL, LGPL Group: System/X11/Utilities -%if REPLACE_XORG_XKB_FILES +Requires: xorg-x11 Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us -%endif PreReq: /bin/ln /bin/rm Autoreqprov: on Version: 0.8 -Release: 9 +Release: 10 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 -Source1: README.SuSE Patch: p_suse.diff Patch1: ibm_space_saver.diff Patch4: p_macintosh-kb.diff @@ -63,20 +59,13 @@ %patch7 %patch8 %patch9 -%if !%{REPLACE_XORG_XKB_FILES} -cp $RPM_SOURCE_DIR/README.SuSE . -%endif %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" intltoolize --force autoreconf -fi ./configure --with-xkb-rules-symlink=xfree86,xorg \ -%if %REPLACE_XORG_XKB_FILES --with-xkb-base=/usr/share/X11/xkb \ -%else - --with-xkb-base=/usr/share/X11/xkeyboard-config \ -%endif --enable-compat_rules \ --disable-xkbcomp-symlink make @@ -84,30 +73,21 @@ %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/var/lib/xkb -%if %REPLACE_XORG_XKB_FILES ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp -%else -ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkeyboard-config/xkbcomp -%endif %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%if %REPLACE_XORG_XKB_FILES %doc AUTHORS COPYING README docs/HOWTO.* docs/README.* -%else -%doc AUTHORS COPYING README docs/HOWTO.* docs/README.* README.SuSE -%endif %dir /var/lib/xkb -%if %REPLACE_XORG_XKB_FILES /usr/share/X11/xkb/ -%else -/usr/share/X11/xkeyboard-config/ -%endif %changelog -n xkeyboard-config +* Tue Aug 01 2006 - sndirsch(a)suse.de +- added xorg-x11 to Requires/BuildRequires to fix build +- cleanup * Fri Jul 28 2006 - sndirsch(a)suse.de - use "-fno-strict-aliasing" * Thu Jul 27 2006 - sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0