June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit Mesa
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package Mesa checked in at Wed Jun 21 17:49:40 CEST 2006. -------- --- Mesa/Mesa.changes 2006-05-23 09:34:18.000000000 +0200 +++ Mesa/Mesa.changes 2006-06-19 10:48:28.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Jun 19 10:47:49 CEST 2006 - sndirsch(a)suse.de + +- added missing manual pages (Bug #185707) + +------------------------------------------------------------------- +Fri Jun 16 15:00:25 CEST 2006 - dreveman(a)suse.de + +- Fix issue in copy-sub-buffer patch. Extension was not + enabled on all radeon cards. (bnc 174839) +- Add radeon large texture patch (back port from latest stable + release of Mesa). (bnc 174839) + +------------------------------------------------------------------- Old: ---- mesa-6.4.2-dri-copy-sub-buffer-1.patch New: ---- Mesa-radeon-large-textures-1.diff manual-pages.tar.bz2 mesa-6.4.2-dri-copy-sub-buffer-2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.RHZ4fP/_old 2006-06-21 17:48:36.000000000 +0200 +++ /var/tmp/diff_new_pack.RHZ4fP/_new 2006-06-21 17:48:36.000000000 +0200 @@ -20,12 +20,13 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 6.4.2 -Release: 21 +Release: 22 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: Mesa-%{version}.tar.bz2 Source1: missing-headers.tar.bz2 Source2: glidelibs-i386.tar.gz Source3: README.updates +Source4: manual-pages.tar.bz2 Patch: Mesa-%{version}.diff Patch1: Mesa-glx-x11-render-texture-2.diff Patch2: missing-headers.diff @@ -35,8 +36,9 @@ Patch6: Mesa_945GM.patch Patch7: glxext-sgi-hyperpipe.patch Patch8: mesa-6.4.2-scissor-fix-1.patch -Patch9: mesa-6.4.2-dri-copy-sub-buffer-1.patch +Patch9: mesa-6.4.2-dri-copy-sub-buffer-2.patch Patch10: licensefix.patch +Patch11: Mesa-radeon-large-textures-1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -109,7 +111,7 @@ %if !%{USE_EXTERNAL_MESA} %setup -n %name -a1 %else -%setup -n %name +%setup -n %name -b4 %endif # cleanup find . -name CVS | xargs rm -rf @@ -117,6 +119,7 @@ rm -rf src/glut progs/{demos,redbook,samples,xdemos} # we use freeglut rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h} +%patch11 %patch %patch1 %if !%{USE_EXTERNAL_MESA} @@ -138,6 +141,12 @@ popd %build +for dir in ../xc/doc/man/{GL,GLU}; do +pushd $dir + xmkmf -a + make +popd +done %ifarch %ix86 ppc x86_64 %ifarch %ix86 make linux-dri-x86 OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DDEFAULT_DRIVER_DIR='\"'/usr/X11R6/%{_lib}/modules/dri/updates:/usr/X11R6/%{_lib}/modules/dri'\"'" @@ -163,6 +172,11 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr +for dir in ../xc/doc/man/{GL,GLU}; do +pushd $dir + make install.man DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_mandir} LIBMANSUFFIX=3gl +popd +done make install DESTDIR=$RPM_BUILD_ROOT/usr if [ "%{_lib}" != "lib" ]; then mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/%{_lib} @@ -235,6 +249,7 @@ /usr/%{_lib}/libGLU.so /usr/%{_lib}/libGLw.so /usr/%{_lib}/libOSMesa.so +%{_mandir}/man3/* %files devel-static %defattr(-,root,root) @@ -242,6 +257,13 @@ /usr/%{_lib}/libMesaGL.a %changelog -n Mesa +* Mon Jun 19 2006 - sndirsch(a)suse.de +- added missing manual pages (Bug #185707) +* Fri Jun 16 2006 - dreveman(a)suse.de +- Fix issue in copy-sub-buffer patch. Extension was not + enabled on all radeon cards. (bnc 174839) +- Add radeon large texture patch (back port from latest stable + release of Mesa). (bnc 174839) * Tue May 23 2006 - sndirsch(a)suse.de - no longer remove NVIDIA installer in %%pre * Mon May 22 2006 - sndirsch(a)suse.de ++++++ Mesa-radeon-large-textures-1.diff ++++++ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/common/texmem.c ./src/mesa/drivers/dri/common/texmem.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/common/texmem.c 2005-02-14 10:27:38.000000000 +0100 +++ ./src/mesa/drivers/dri/common/texmem.c 2006-06-12 14:35:24.000000000 +0200 @@ -1032,6 +1032,69 @@ SET_MAX_RECT( MaxTextureRectSize, 3 ); } +void +driCalculateMaxTextureLevels2( driTexHeap * const * heaps, + unsigned nr_heaps, + struct gl_constants * limits, + unsigned max_bytes_per_texel, + unsigned max_2D_size, + unsigned max_3D_size, + unsigned max_cube_size, + unsigned max_rect_size, + unsigned mipmaps_at_once, + int all_textures_one_heap, + int allow_larger_textures ) +{ + struct maps_per_heap max_textures[8]; + unsigned i; + const unsigned dimensions[4] = { 2, 3, 2, 2 }; + const unsigned faces[4] = { 1, 1, 6, 1 }; + unsigned max_sizes[4]; + unsigned mipmaps[4]; + + + max_sizes[0] = max_2D_size; + max_sizes[1] = max_3D_size; + max_sizes[2] = max_cube_size; + max_sizes[3] = max_rect_size; + + mipmaps[0] = mipmaps_at_once; + mipmaps[1] = mipmaps_at_once; + mipmaps[2] = mipmaps_at_once; + mipmaps[3] = 1; + + + /* Calculate the maximum number of texture levels in two passes. The + * first pass determines how many textures of each power-of-two size + * (including all mipmap levels for that size) can fit in each texture + * heap. The second pass finds the largest texture size that allows + * a texture of that size to be bound to every texture unit. + */ + + for ( i = 0 ; i < 4 ; i++ ) { + if ( (allow_larger_textures != 2) && (max_sizes[ i ] != 0) ) { + fill_in_maximums( heaps, nr_heaps, max_bytes_per_texel, + max_sizes[ i ], mipmaps[ i ], + dimensions[ i ], faces[ i ], + max_textures ); + + max_sizes[ i ] = get_max_size( nr_heaps, + allow_larger_textures == 1 ? + 1 : limits->MaxTextureUnits, + max_sizes[ i ], + all_textures_one_heap, + max_textures ); + } + else if (max_sizes[ i ] != 0) { + max_sizes[ i ] += 1; + } + } + + SET_MAX( MaxTextureLevels, 0 ); + SET_MAX( Max3DTextureLevels, 1 ); + SET_MAX( MaxCubeTextureLevels, 2 ); + SET_MAX_RECT( MaxTextureRectSize, 3 ); +} diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/common/texmem.h ./src/mesa/drivers/dri/common/texmem.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/common/texmem.h 2005-02-03 22:40:21.000000000 +0100 +++ ./src/mesa/drivers/dri/common/texmem.h 2006-06-12 14:35:19.000000000 +0200 @@ -294,6 +294,19 @@ int all_textures_one_heap ); void +driCalculateMaxTextureLevels2( driTexHeap * const * heaps, + unsigned nr_heaps, + struct gl_constants * limits, + unsigned max_bytes_per_texel, + unsigned max_2D_size, + unsigned max_3D_size, + unsigned max_cube_size, + unsigned max_rect_size, + unsigned mipmaps_at_once, + int all_textures_one_heap, + int allow_larger_textures ); + +void driSetTextureSwapCounterLocation( driTexHeap * heap, unsigned * counter ); #define DRI_TEXMGR_DO_TEXTURE_1D 0x0001 diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r128/r128_context.c ./src/mesa/drivers/dri/r128/r128_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r128/r128_context.c 2005-07-28 02:29:52.000000000 +0200 +++ ./src/mesa/drivers/dri/r128/r128_context.c 2006-06-12 15:20:39.000000000 +0200 @@ -196,16 +196,17 @@ ctx->Const.MaxTextureImageUnits = 2; ctx->Const.MaxTextureCoordUnits = 2; - driCalculateMaxTextureLevels( rmesa->texture_heaps, - rmesa->nr_heaps, - & ctx->Const, - 4, - 10, /* max 2D texture size is 1024x1024 */ - 0, /* 3D textures unsupported. */ - 0, /* cube textures unsupported. */ - 0, /* texture rectangles unsupported. */ - 11, - GL_FALSE ); + driCalculateMaxTextureLevels2( rmesa->texture_heaps, + rmesa->nr_heaps, + & ctx->Const, + 4, + 11, /* max 2D texture size is 2048x2048 */ + 8, /* 256^3 */ + 9, /* \todo: max cube texture size seems to be 512x512(x6) */ + 11, /* max rect texture size is 2048x2048. */ + 12, + GL_FALSE, + 1 ); /* No wide points. */ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.c ./src/mesa/drivers/dri/r200/r200_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.c 2005-09-10 18:44:26.000000000 +0200 +++ ./src/mesa/drivers/dri/r200/r200_context.c 2006-06-12 14:45:27.000000000 +0200 @@ -370,27 +370,17 @@ ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits; - driCalculateMaxTextureLevels( rmesa->texture_heaps, - rmesa->nr_heaps, - & ctx->Const, - 4, - 11, /* max 2D texture size is 2048x2048 */ -#if ENABLE_HW_3D_TEXTURE - 8, /* max 3D texture size is 256^3 */ -#else - 0, /* 3D textures unsupported */ -#endif - 11, /* max cube texture size is 2048x2048 */ - 11, /* max texture rectangle size is 2048x2048 */ - 12, - GL_FALSE ); - - /* adjust max texture size a bit. Hack, but I really want to use larger textures - which will work just fine in 99.999999% of all cases, especially with texture compression... */ - if (driQueryOptionb( &rmesa->optionCache, "texture_level_hack" )) - { - if (ctx->Const.MaxTextureLevels < 12) ctx->Const.MaxTextureLevels += 1; - } + driCalculateMaxTextureLevels2( rmesa->texture_heaps, + rmesa->nr_heaps, + & ctx->Const, + 4, + 11, /* max 2D texture size is 2048x2048 */ + 8, /* 256^3 */ + 9, /* \todo: max cube texture size seems to be 512x512(x6) */ + 11, /* max rect texture size is 2048x2048. */ + 12, + GL_FALSE, + 1 ); ctx->Const.MaxTextureMaxAnisotropy = 16.0; diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.c ./src/mesa/drivers/dri/radeon/radeon_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.c 2005-07-28 02:29:52.000000000 +0200 +++ ./src/mesa/drivers/dri/radeon/radeon_context.c 2006-06-12 14:41:38.000000000 +0200 @@ -330,23 +330,17 @@ ctx->Const.MaxTextureImageUnits = 2; ctx->Const.MaxTextureCoordUnits = 2; - driCalculateMaxTextureLevels( rmesa->texture_heaps, - rmesa->nr_heaps, - & ctx->Const, - 4, - 11, /* max 2D texture size is 2048x2048 */ - 0, /* 3D textures unsupported. */ - 0, /* cube textures unsupported. */ - 11, /* max rect texture size is 2048x2048. */ - 12, - GL_FALSE ); - - /* adjust max texture size a bit. Hack, but I really want to use larger textures - which will work just fine in 99.999999% of all cases, especially with texture compression... */ - if (driQueryOptionb( &rmesa->optionCache, "texture_level_hack" )) - { - if (ctx->Const.MaxTextureLevels < 12) ctx->Const.MaxTextureLevels += 1; - } + driCalculateMaxTextureLevels2( rmesa->texture_heaps, + rmesa->nr_heaps, + & ctx->Const, + 4, + 11, /* max 2D texture size is 2048x2048 */ + 8, /* 256^3 */ + 9, /* \todo: max cube texture size seems to be 512x512(x6) */ + 11, /* max rect texture size is 2048x2048. */ + 12, + GL_FALSE, + 1 ); ctx->Const.MaxTextureMaxAnisotropy = 16.0; ++++++ mesa-6.4.2-dri-copy-sub-buffer-1.patch -> mesa-6.4.2-dri-copy-sub-buffer-2.patch ++++++ --- Mesa/mesa-6.4.2-dri-copy-sub-buffer-1.patch 2006-04-03 22:29:51.000000000 +0200 +++ Mesa/mesa-6.4.2-dri-copy-sub-buffer-2.patch 2006-06-16 14:56:58.000000000 +0200 @@ -1,6 +1,6 @@ diff -ur ../Mesa-6.4.2/include/GL/internal/dri_interface.h ./include/GL/internal/dri_interface.h --- ../Mesa-6.4.2/include/GL/internal/dri_interface.h 2005-11-30 00:01:57.000000000 +0100 -+++ ./include/GL/internal/dri_interface.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./include/GL/internal/dri_interface.h 2006-06-13 10:45:30.000000000 +0200 @@ -472,6 +472,9 @@ * \since Internal API version 20030317. */ @@ -13,7 +13,7 @@ #endif diff -ur ../Mesa-6.4.2/src/glx/x11/glxcmds.c ./src/glx/x11/glxcmds.c --- ../Mesa-6.4.2/src/glx/x11/glxcmds.c 2005-08-11 16:18:53.000000000 +0200 -+++ ./src/glx/x11/glxcmds.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/glx/x11/glxcmds.c 2006-06-13 10:45:30.000000000 +0200 @@ -2569,18 +2569,69 @@ return 0; } @@ -94,7 +94,7 @@ { diff -ur ../Mesa-6.4.2/src/glx/x11/glxextensions.c ./src/glx/x11/glxextensions.c --- ../Mesa-6.4.2/src/glx/x11/glxextensions.c 2005-08-11 16:18:53.000000000 +0200 -+++ ./src/glx/x11/glxextensions.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/glx/x11/glxextensions.c 2006-06-13 10:45:30.000000000 +0200 @@ -79,7 +79,7 @@ { GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N }, { GLX(MESA_agp_offset), VER(0,0), N, N, N, Y }, /* Deprecated */ @@ -106,7 +106,7 @@ { GLX(MESA_set_3dfx_mode), VER(0,0), N, N, N, N }, /* Deprecated */ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/common/dri_util.c ./src/mesa/drivers/dri/common/dri_util.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/common/dri_util.c 2005-11-30 00:01:57.000000000 +0100 -+++ ./src/mesa/drivers/dri/common/dri_util.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/common/dri_util.c 2006-06-13 10:45:30.000000000 +0200 @@ -545,6 +545,13 @@ remainder ); } @@ -131,7 +131,7 @@ * default value when the drawable is first bound to a direct diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/common/dri_util.h ./src/mesa/drivers/dri/common/dri_util.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/common/dri_util.h 2005-11-30 00:01:57.000000000 +0100 -+++ ./src/mesa/drivers/dri/common/dri_util.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/common/dri_util.h 2006-06-13 10:45:30.000000000 +0200 @@ -189,6 +189,8 @@ int64_t (*SwapBuffersMSC)( __DRIdrawablePrivate *priv, int64_t target_msc, int64_t divisor, int64_t remainder ); @@ -143,7 +143,7 @@ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_batchbuffer.c ./src/mesa/drivers/dri/i915/intel_batchbuffer.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_batchbuffer.c 2005-05-04 22:11:37.000000000 +0200 -+++ ./src/mesa/drivers/dri/i915/intel_batchbuffer.c 2006-03-12 17:17:26.000000000 +0100 ++++ ./src/mesa/drivers/dri/i915/intel_batchbuffer.c 2006-06-13 10:45:30.000000000 +0200 @@ -318,7 +318,8 @@ /* * Copy the back buffer to the front buffer. @@ -204,7 +204,7 @@ if (intel->sarea->pf_current_page == 0) diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_batchbuffer.h ./src/mesa/drivers/dri/i915/intel_batchbuffer.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_batchbuffer.h 2004-06-18 12:54:48.000000000 +0200 -+++ ./src/mesa/drivers/dri/i915/intel_batchbuffer.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/i915/intel_batchbuffer.h 2006-06-13 10:45:30.000000000 +0200 @@ -74,7 +74,8 @@ extern GLuint *intelEmitInlinePrimitiveLocked(intelContextPtr intel, int primitive, int dwords, @@ -217,7 +217,7 @@ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_context.c ./src/mesa/drivers/dri/i915/intel_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_context.c 2005-09-10 18:44:26.000000000 +0200 -+++ ./src/mesa/drivers/dri/i915/intel_context.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/i915/intel_context.c 2006-06-13 10:45:30.000000000 +0200 @@ -617,7 +617,7 @@ if ( 0 /*intel->doPageFlip*/ ) { /* doPageFlip is never set !!! */ intelPageFlip( dPriv ); @@ -259,7 +259,7 @@ { diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_screen.c ./src/mesa/drivers/dri/i915/intel_screen.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_screen.c 2005-08-15 08:59:24.000000000 +0200 -+++ ./src/mesa/drivers/dri/i915/intel_screen.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/i915/intel_screen.c 2006-06-13 10:45:30.000000000 +0200 @@ -202,6 +202,7 @@ if (glx_enable_extension != NULL) { (*glx_enable_extension)( psc, "GLX_SGI_make_current_read" ); @@ -280,7 +280,7 @@ diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_screen.h ./src/mesa/drivers/dri/i915/intel_screen.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/i915/intel_screen.h 2004-10-08 01:30:29.000000000 +0200 -+++ ./src/mesa/drivers/dri/i915/intel_screen.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/i915/intel_screen.h 2006-06-13 10:45:30.000000000 +0200 @@ -98,4 +98,7 @@ extern void intelSwapBuffers( __DRIdrawablePrivate *dPriv); @@ -291,7 +291,7 @@ #endif diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.c ./src/mesa/drivers/dri/r200/r200_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.c 2005-09-10 18:44:26.000000000 +0200 -+++ ./src/mesa/drivers/dri/r200/r200_context.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r200/r200_context.c 2006-06-13 10:45:30.000000000 +0200 @@ -625,7 +625,7 @@ r200PageFlip( dPriv ); } @@ -334,7 +334,7 @@ * buffer `b'. diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.h ./src/mesa/drivers/dri/r200/r200_context.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_context.h 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/r200/r200_context.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r200/r200_context.h 2006-06-13 10:45:30.000000000 +0200 @@ -960,6 +960,8 @@ __DRIcontextPrivate *driContextPriv, void *sharedContextPrivate); @@ -346,7 +346,7 @@ __DRIdrawablePrivate *driReadPriv ); diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_ioctl.c ./src/mesa/drivers/dri/r200/r200_ioctl.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_ioctl.c 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/r200/r200_ioctl.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r200/r200_ioctl.c 2006-06-13 10:45:30.000000000 +0200 @@ -429,7 +429,8 @@ /* Copy the back color buffer to the front color buffer. @@ -436,7 +436,7 @@ void r200PageFlip( const __DRIdrawablePrivate *dPriv ) diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_ioctl.h ./src/mesa/drivers/dri/r200/r200_ioctl.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_ioctl.h 2005-02-01 00:40:06.000000000 +0100 -+++ ./src/mesa/drivers/dri/r200/r200_ioctl.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r200/r200_ioctl.h 2006-06-13 10:45:30.000000000 +0200 @@ -96,7 +96,8 @@ struct r200_dma_region *region, const char *caller ); @@ -447,9 +447,30 @@ extern void r200PageFlip( const __DRIdrawablePrivate *drawable ); extern void r200Flush( GLcontext *ctx ); extern void r200Finish( GLcontext *ctx ); +diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_screen.c ./src/mesa/drivers/dri/r200/r200_screen.c +--- ../Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_screen.c 2005-11-29 23:36:02.000000000 +0100 ++++ ./src/mesa/drivers/dri/r200/r200_screen.c 2006-06-13 10:48:32.000000000 +0200 +@@ -483,6 +483,7 @@ + + (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" ); + (*glx_enable_extension)( psc, "GLX_MESA_allocate_memory" ); ++ (*glx_enable_extension)( psc, "GLX_MESA_copy_sub_buffer" ); + } + + sPriv->psc->allocateMemory = (void *) r200AllocateMemoryMESA; +@@ -640,7 +641,8 @@ + .GetMSC = driGetMSC32, + .WaitForMSC = driWaitForMSC32, + .WaitForSBC = NULL, +- .SwapBuffersMSC = NULL ++ .SwapBuffersMSC = NULL, ++ .CopySubBuffer = r200CopySubBuffer + }; + + diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_context.c ./src/mesa/drivers/dri/r300/radeon_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_context.c 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/r300/radeon_context.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r300/radeon_context.c 2006-06-13 10:45:30.000000000 +0200 @@ -229,7 +229,7 @@ if (radeon->doPageFlip) { radeonPageFlip(dPriv); @@ -493,7 +514,7 @@ * buffer `b'. diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_context.h ./src/mesa/drivers/dri/r300/radeon_context.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_context.h 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/r300/radeon_context.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r300/radeon_context.h 2006-06-13 10:45:30.000000000 +0200 @@ -208,6 +208,8 @@ #define RADEON_CONTEXT(glctx) ((radeonContextPtr)(ctx->DriverCtx)) @@ -505,7 +526,7 @@ const __GLcontextModes * glVisual, diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_ioctl.c ./src/mesa/drivers/dri/r300/radeon_ioctl.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_ioctl.c 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/r300/radeon_ioctl.c 2006-03-12 17:23:57.000000000 +0100 ++++ ./src/mesa/drivers/dri/r300/radeon_ioctl.c 2006-06-13 10:45:30.000000000 +0200 @@ -142,7 +142,8 @@ /* Copy the back color buffer to the front color buffer. @@ -601,7 +622,7 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv) diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_ioctl.h ./src/mesa/drivers/dri/r300/radeon_ioctl.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_ioctl.h 2005-07-20 23:35:27.000000000 +0200 -+++ ./src/mesa/drivers/dri/r300/radeon_ioctl.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/r300/radeon_ioctl.h 2006-06-13 10:45:30.000000000 +0200 @@ -44,7 +44,8 @@ #include "r200_context.h" #include "radeon_drm.h" @@ -612,9 +633,30 @@ extern void radeonPageFlip(const __DRIdrawablePrivate * drawable); extern void radeonFlush(GLcontext * ctx); extern void radeonFinish(GLcontext * ctx); +diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_screen.c ./src/mesa/drivers/dri/r300/radeon_screen.c +--- ../Mesa-6.4.2/src/mesa/drivers/dri/r300/radeon_screen.c 2005-11-29 23:36:02.000000000 +0100 ++++ ./src/mesa/drivers/dri/r300/radeon_screen.c 2006-06-13 10:48:20.000000000 +0200 +@@ -601,6 +601,7 @@ + } + + (*glx_enable_extension) (psc, "GLX_MESA_swap_frame_usage"); ++ (*glx_enable_extension)( psc, "GLX_MESA_copy_sub_buffer" ); + } + + #if R200_MERGED +@@ -787,7 +788,8 @@ + .GetMSC = driGetMSC32, + .WaitForMSC = driWaitForMSC32, + .WaitForSBC = NULL, +- .SwapBuffersMSC = NULL ++ .SwapBuffersMSC = NULL, ++ .CopySubBuffer = radeonCopySubBuffer + }; + + diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.c ./src/mesa/drivers/dri/radeon/radeon_context.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.c 2005-07-28 02:29:52.000000000 +0200 -+++ ./src/mesa/drivers/dri/radeon/radeon_context.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/radeon/radeon_context.c 2006-06-13 10:45:30.000000000 +0200 @@ -565,7 +565,7 @@ radeonPageFlip( dPriv ); } @@ -658,7 +700,7 @@ * buffer `b'. diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.h ./src/mesa/drivers/dri/radeon/radeon_context.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_context.h 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/radeon/radeon_context.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/radeon/radeon_context.h 2006-06-13 10:45:30.000000000 +0200 @@ -835,6 +835,8 @@ __DRIcontextPrivate *driContextPriv, void *sharedContextPrivate); @@ -670,7 +712,7 @@ __DRIdrawablePrivate *driReadPriv ); diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_ioctl.c ./src/mesa/drivers/dri/radeon/radeon_ioctl.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_ioctl.c 2005-07-26 04:44:02.000000000 +0200 -+++ ./src/mesa/drivers/dri/radeon/radeon_ioctl.c 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/radeon/radeon_ioctl.c 2006-06-13 10:45:30.000000000 +0200 @@ -882,7 +882,8 @@ /* Copy the back color buffer to the front color buffer. @@ -756,7 +798,7 @@ void radeonPageFlip( const __DRIdrawablePrivate *dPriv ) diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_ioctl.h ./src/mesa/drivers/dri/radeon/radeon_ioctl.h --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_ioctl.h 2005-02-01 00:40:06.000000000 +0100 -+++ ./src/mesa/drivers/dri/radeon/radeon_ioctl.h 2006-03-12 17:11:43.000000000 +0100 ++++ ./src/mesa/drivers/dri/radeon/radeon_ioctl.h 2006-06-13 10:45:30.000000000 +0200 @@ -93,7 +93,8 @@ struct radeon_dma_region *region, const char *caller ); @@ -769,7 +811,7 @@ extern void radeonFinish( GLcontext *ctx ); diff -ur ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_screen.c ./src/mesa/drivers/dri/radeon/radeon_screen.c --- ../Mesa-6.4.2/src/mesa/drivers/dri/radeon/radeon_screen.c 2005-11-29 23:36:02.000000000 +0100 -+++ ./src/mesa/drivers/dri/radeon/radeon_screen.c 2006-03-12 17:26:10.000000000 +0100 ++++ ./src/mesa/drivers/dri/radeon/radeon_screen.c 2006-06-13 10:45:30.000000000 +0200 @@ -410,6 +410,7 @@ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libxslt
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libxslt checked in at Wed Jun 21 17:48:36 CEST 2006. -------- --- libxslt/libxslt-python.changes 2006-01-25 21:37:50.000000000 +0100 +++ libxslt/libxslt-python.changes 2006-06-16 15:54:14.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 16 15:54:03 CEST 2006 - ke(a)suse.de + +- 1.1.17. + +------------------------------------------------------------------- --- libxslt/libxslt.changes 2006-05-23 15:34:31.000000000 +0200 +++ libxslt/libxslt.changes 2006-06-16 15:34:34.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 16 15:33:59 CEST 2006 - ke(a)suse.de + +- 1.1.17: + * Bug fixes: some regression tests, attribute/namespaces output, + problem in mixed xsl:value-of and xsl:text uses. + * Improvements: internal refactoring, use of the XPath object cache in + libxml2-2.6.25. +- Require libxml2-2.2.25. + +------------------------------------------------------------------- Old: ---- libxslt-1.1.16.tar.bz2 New: ---- libxslt-1.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.0EdA5V/_old 2006-06-21 17:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0EdA5V/_new 2006-06-21 17:48:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxslt-python (Version 1.1.16) +# spec file for package libxslt-python (Version 1.1.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: libxslt-python BuildRequires: libxml2-python libxslt-devel python-devel Summary: Python Bindings for libxslt -Version: 1.1.16 +Version: 1.1.17 Release: 1 License: X11/MIT Group: Development/Libraries/Python @@ -88,6 +88,8 @@ %doc python/tests/*.xsl %changelog -n libxslt-python +* Fri Jun 16 2006 - ke(a)suse.de +- 1.1.17. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Sep 30 2005 - aj(a)suse.de ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.0EdA5V/_old 2006-06-21 17:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0EdA5V/_new 2006-06-21 17:48:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxslt (Version 1.1.16) +# spec file for package libxslt (Version 1.1.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: libxslt BuildRequires: libgcrypt-devel libxml2-devel Summary: XSL Transformation Library -Version: 1.1.16 +Version: 1.1.17 Release: 1 License: X11/MIT Group: System/Libraries @@ -23,7 +23,7 @@ Patch1: libxslt-warn.patch Patch10: libxslt-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libxml2 >= 2.6.17 +Requires: libxml2 >= 2.6.25 URL: http://xmlsoft.org/XSLT/ %description @@ -113,6 +113,13 @@ %{_mandir}/man3/* %changelog -n libxslt +* Fri Jun 16 2006 - ke(a)suse.de +- 1.1.17: + * Bug fixes: some regression tests, attribute/namespaces output, + problem in mixed xsl:value-of and xsl:text uses. + * Improvements: internal refactoring, use of the XPath object cache in + libxml2-2.6.25. +- Require libxml2-2.2.25. * Tue May 23 2006 - ke(a)suse.de - Update to version 1.1.16: * Bug fixes (pattern compilation, namespace prefixes, etc.). ++++++ libxslt-1.1.16.tar.bz2 -> libxslt-1.1.17.tar.bz2 ++++++ ++++ 17319 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libxml2
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libxml2 checked in at Wed Jun 21 17:48:03 CEST 2006. -------- --- libxml2/libxml2-python.changes 2006-05-16 14:11:22.000000000 +0200 +++ libxml2/libxml2-python.changes 2006-06-16 15:06:47.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 16 15:06:38 CEST 2006 - ke(a)suse.de + +- 2.6.26. + +------------------------------------------------------------------- --- libxml2/libxml2.changes 2006-05-16 14:11:00.000000000 +0200 +++ libxml2/libxml2.changes 2006-06-16 15:06:31.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 16 15:04:22 CEST 2006 - ke(a)suse.de + +- 2.6.26; NEWS extract from http://xmlsoft.org/ : + * Bug fixes: encoding buffer problem, mix of code and data in xmlIO.c, + entities in XSD validation, variousXSD validation fixes, memory leak + in pattern, attribute with colon in name, XPath leak inerror + reporting, XInclude text include of selfdocument. + * Xpath optimizations. + +------------------------------------------------------------------- Old: ---- libxml2-2.6.24.tar.bz2 New: ---- libxml2-2.6.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2-python.spec ++++++ --- /var/tmp/diff_new_pack.qAMWba/_old 2006-06-21 17:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.qAMWba/_new 2006-06-21 17:47:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxml2-python (Version 2.6.24) +# spec file for package libxml2-python (Version 2.6.26) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: Development/Libraries/Python Autoreqprov: on Summary: Python Bindings for libxml2 -Version: 2.6.24 +Version: 2.6.26 Release: 1 Source: libxml2-%{version}.tar.bz2 Patch: libxml2-2.6.22-python-linkflags.patch @@ -93,6 +93,8 @@ %doc python/tests/*.py %changelog -n libxml2-python +* Fri Jun 16 2006 - ke(a)suse.de +- 2.6.26. * Tue May 16 2006 - ke(a)suse.de - Version 2.6.24. * Wed Jan 25 2006 - mls(a)suse.de ++++++ libxml2-test.spec ++++++ --- /var/tmp/diff_new_pack.qAMWba/_old 2006-06-21 17:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.qAMWba/_new 2006-06-21 17:47:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxml2-test (Version 2.6.24) +# spec file for package libxml2-test (Version 2.6.26) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/Libraries Autoreqprov: on Summary: Test Cases for libxml2 -Version: 2.6.24 +Version: 2.6.26 Release: 1 Source: libxml2-%{version}.tar.bz2 # Source: ftp://ftp.xmlsoft.org/%{name}-%{version}.tar.bz2 ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.qAMWba/_old 2006-06-21 17:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.qAMWba/_new 2006-06-21 17:47:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libxml2 (Version 2.6.24) +# spec file for package libxml2 (Version 2.6.26) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Group: System/Libraries Autoreqprov: on Summary: A Library to Manipulate XML Files -Version: 2.6.24 +Version: 2.6.26 Release: 1 Source: %{name}-%{version}.tar.bz2 # ftp://ftp.xmlsoft.org/ .gz only @@ -79,6 +79,7 @@ Autoreqprov: on Requires: %{name} = %{version} Requires: zlib-devel readline-devel +Requires: glibc-devel %description devel This package contains all necessary include files and libraries needed @@ -226,6 +227,13 @@ %{_datadir}/aclocal/libxml.m4 %changelog -n libxml2 +* Fri Jun 16 2006 - ke(a)suse.de +- 2.6.26; NEWS extract from http://xmlsoft.org/ : + * Bug fixes: encoding buffer problem, mix of code and data in xmlIO.c, + entities in XSD validation, variousXSD validation fixes, memory leak + in pattern, attribute with colon in name, XPath leak inerror + reporting, XInclude text include of selfdocument. + * Xpath optimizations. * Tue May 16 2006 - ke(a)suse.de - 2.6.24; NEWS extract from http://xmlsoft.org/ : * Improvements: XML catalog debugging; update to Unicode 4.01. ++++++ libxml2-2.6.24.tar.bz2 -> libxml2-2.6.26.tar.bz2 ++++++ ++++ 19406 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libkexif
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libkexif checked in at Wed Jun 21 17:47:19 CEST 2006. -------- --- KDE/libkexif/libkexif.changes 2006-05-20 13:09:31.000000000 +0200 +++ libkexif/libkexif.changes 2006-06-20 23:47:05.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 20 23:46:37 CEST 2006 - dmueller(a)suse.de + +- update to version 0.2.4: + * fix typo causing EXIF reading to fail + +------------------------------------------------------------------- Old: ---- libkexif-0.2.3.tar.bz2 New: ---- libkexif-0.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkexif.spec ++++++ --- /var/tmp/diff_new_pack.HMwcZx/_old 2006-06-21 17:47:08.000000000 +0200 +++ /var/tmp/diff_new_pack.HMwcZx/_new 2006-06-21 17:47:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libkexif (Version 0.2.3) +# spec file for package libkexif (Version 0.2.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ License: GPL Group: Development/Libraries/KDE Summary: EXIF Data Handling Library -Version: 0.2.3 +Version: 0.2.4 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 @@ -66,6 +66,9 @@ /opt/kde3/%_lib/* %changelog -n libkexif +* Tue Jun 20 2006 - dmueller(a)suse.de +- update to version 0.2.4: + * fix typo causing EXIF reading to fail * Sat May 20 2006 - adrian(a)suse.de - update to version 0.2.3 * EXIF orientation fixes ++++++ libkexif-0.2.3.tar.bz2 -> libkexif-0.2.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/ChangeLog new/libkexif-0.2.4/ChangeLog --- old/libkexif-0.2.3/ChangeLog 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/ChangeLog 2006-06-18 23:04:02.000000000 +0200 @@ -1,31 +1,52 @@ -v0.2.3 - Last Changed Rev: 537369 - 2006-05-04 +v 0.2.4 - 2006-06-18 ---------------------------------------------------------------------------- -2006-05-06 20:45 anaselli +2006-06-18 15:11 +0000 [r552622] anaselli - * trunk/extragear/libs/kipi-plugins/ChangeLog, - trunk/extragear/libs/libkexif/ChangeLog, - trunk/extragear/libs/libkipi/ChangeLog: fix ChangeLog files + * libkexif/kexifentry.cpp: missed mValue BUG: 128462 -2006-05-06 20:33 anaselli +2006-06-10 15:52 +0000 [r550001] anaselli - * trunk/extragear/libs/libkexif/libkexif.pc.in: updated version - for incoming release 0.2.3 + * libkexif/ChangeLog: fixed changelog with all the entries of rel. + 0.2.3 -2006-05-06 20:31 anaselli +2006-05-06 22:01 +0000 [r538121] toma - * trunk/extragear/libs/libkexif/NEWS, - trunk/extragear/libs/libkipi/NEWS: added a note into news to - check the Changelog + * kipi-plugins/ChangeLog, libkexif/ChangeLog, libkipi/ChangeLog: + updates -2006-05-06 20:25 anaselli +v0.2.3 - 2006-05-04 +---------------------------------------------------------------------------- + +2006-05-06 22:01 +0000 [r538121] toma + + * kipi-plugins/ChangeLog, libkexif/ChangeLog, libkipi/ChangeLog: + updates + +2006-05-06 20:45 +0000 [r538117] anaselli + + * kipi-plugins/ChangeLog, libkexif/ChangeLog, libkipi/ChangeLog: + fix ChangeLog files + +2006-05-06 20:33 +0000 [r538112-538114] anaselli + + * libkexif/libkexif.pc.in: updated version for incoming release + 0.2.3 + + * libkexif/NEWS, libkipi/NEWS: added a note into news to check the + Changelog + +2006-05-06 20:25 +0000 [r538109] anaselli + + * libkexif/libkexif.lsm: updated version for incoming release 0.2.3 + +2006-05-04 19:46 +0000 [r537436] anaselli - * trunk/extragear/libs/libkexif/libkexif.lsm: updated version for - incoming release 0.2.3 + * libkexif/ChangeLog: Added revision marker -2006-05-04 19:46 anaselli +2006-05-04 16:16 +0000 [r537369] toma - * trunk/extragear/libs/libkexif/ChangeLog: Added revision marker + * libkexif/ChangeLog, libkipi/ChangeLog: Updates. 2006-03-28 06:51 cgilles diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/RELEASE.rev new/libkexif-0.2.4/RELEASE.rev --- old/libkexif-0.2.3/RELEASE.rev 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/RELEASE.rev 2006-06-18 23:04:02.000000000 +0200 @@ -1,2 +1,2 @@ -Last Changed Rev: 538121 -Last Changed Date: 2006-05-07 00:01:42 +0200 (Sun, 07 May 2006) +Last Changed Rev: 552685 +Last Changed Date: 2006-06-18 22:06:38 +0200 (Sun, 18 Jun 2006) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/acinclude.m4 new/libkexif-0.2.4/acinclude.m4 --- old/libkexif-0.2.3/acinclude.m4 2006-05-07 00:22:22.000000000 +0200 +++ new/libkexif-0.2.4/acinclude.m4 2006-06-18 23:04:04.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/admin/acinclude.m4.in new/libkexif-0.2.4/admin/acinclude.m4.in --- old/libkexif-0.2.3/admin/acinclude.m4.in 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/admin/acinclude.m4.in 2006-06-18 23:04:02.000000000 +0200 @@ -2747,7 +2747,7 @@ EXRSTATUS=old else kde_save_LIBS="$LIBS" - LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`" + LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ" AC_LANG_SAVE AC_LANG_CPLUSPLUS kde_save_CXXFLAGS="$CXXFLAGS" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/admin/cvs.sh new/libkexif-0.2.4/admin/cvs.sh --- old/libkexif-0.2.3/admin/cvs.sh 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/admin/cvs.sh 2006-06-18 23:04:02.000000000 +0200 @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.2\"" + VERSION="\"3.5.3\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/configure new/libkexif-0.2.4/configure --- old/libkexif-0.2.3/configure 2006-05-07 00:22:46.000000000 +0200 +++ new/libkexif-0.2.4/configure 2006-06-18 23:04:37.000000000 +0200 @@ -1954,8 +1954,8 @@ # Define the identity of the package. - PACKAGE=libkexif-0.2.3 - VERSION="3.5.2" + PACKAGE=libkexif-0.2.4 + VERSION="3.5.3" cat >>confdefs.h <<_ACEOF @@ -35516,6 +35516,8 @@ ac_config_files="$ac_config_files po/tr/Makefile" + ac_config_files="$ac_config_files po/uk/Makefile" + ac_config_files="$ac_config_files po/zh_CN/Makefile" cat >confcache <<\_ACEOF @@ -36168,6 +36170,7 @@ "po/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; "po/ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; "po/tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; + "po/uk/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/uk/Makefile" ;; "po/zh_CN/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/configure.in new/libkexif-0.2.4/configure.in --- old/libkexif-0.2.3/configure.in 2006-05-07 00:22:23.000000000 +0200 +++ new/libkexif-0.2.4/configure.in 2006-06-18 23:04:05.000000000 +0200 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(libkexif-0.2.3, "3.5.2") dnl searches for some needed programs +AM_INIT_AUTOMAKE(libkexif-0.2.4, "3.5.3") dnl searches for some needed programs KDE_SET_PREFIX @@ -225,6 +225,7 @@ AC_CONFIG_FILES([ po/sv/Makefile ]) AC_CONFIG_FILES([ po/ta/Makefile ]) AC_CONFIG_FILES([ po/tr/Makefile ]) +AC_CONFIG_FILES([ po/uk/Makefile ]) AC_CONFIG_FILES([ po/zh_CN/Makefile ]) AC_OUTPUT # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/libkexif/kexifentry.cpp new/libkexif-0.2.4/libkexif/kexifentry.cpp --- old/libkexif-0.2.3/libkexif/kexifentry.cpp 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/libkexif/kexifentry.cpp 2006-06-18 23:04:02.000000000 +0200 @@ -104,7 +104,7 @@ exif_entry_get_value(mExifEntry, cstr.data(), cstr.size()-1); // just in case we don't get a null-terminated string cstr[cstr.size()-1] = '\0'; - QString str = QString::fromLatin1(cstr.data()); + mValue = QString::fromLatin1(cstr.data()); #else mValue = QString::fromUtf8(exif_entry_get_value(mExifEntry)); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/libkexif/libkexif.pc.in new/libkexif-0.2.4/libkexif/libkexif.pc.in --- old/libkexif-0.2.3/libkexif/libkexif.pc.in 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/libkexif/libkexif.pc.in 2006-06-18 23:04:02.000000000 +0200 @@ -6,6 +6,6 @@ Name: libkexif Description: KDE wrapper library for libexif with some extras Requires: -Version: 0.2.3 +Version: 0.2.4 Libs: -L${libdir} -lkexif Cflags: -I${includedir} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/libkexif.lsm new/libkexif-0.2.4/libkexif.lsm --- old/libkexif-0.2.3/libkexif.lsm 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/libkexif.lsm 2006-06-18 23:04:02.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: libkexif -Version: 0.2.3 -Entered-date: 2006-05-06 +Version: 0.2.4 +Entered-date: 2006-06-18 Description: A library to manipulate EXIF information Keywords: kde image jpeg exif Author: renchi at pooh.tam.uiuc.edu (Renchi Raju) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/Makefile.in new/libkexif-0.2.4/po/Makefile.in --- old/libkexif-0.2.3/po/Makefile.in 2006-05-07 00:23:09.000000000 +0200 +++ new/libkexif-0.2.4/po/Makefile.in 2006-06-18 23:05:11.000000000 +0200 @@ -329,7 +329,7 @@ xdg_menudir = @xdg_menudir@ #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. pt_BR et br ta es ca cy pl ja nl en_GB cs ru pt fr sr gl da mt ga lt sv bg nn zh_CN pa de rw sr@Latn it tr el nb is +SUBDIRS =. pt_BR et br ta es ca cy pl ja nl en_GB cs ru pt fr sr gl da mt ga lt sv bg nn zh_CN uk pa de rw sr@Latn it tr el nb is #>- all: all-recursive #>+ 1 all: docs-am all-recursive diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/ja/libkexif.po new/libkexif-0.2.4/po/ja/libkexif.po --- old/libkexif-0.2.3/po/ja/libkexif.po 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/po/ja/libkexif.po 2006-06-18 23:04:02.000000000 +0200 @@ -1,4 +1,4 @@ -# translation of libkexif.pot to japanese +# translation of libkexif.pot to Japanese # Yukiko BANDO <ybando(a)k6.dion.ne.jp>, 2005. # msgid "" @@ -7,7 +7,7 @@ "POT-Creation-Date: 2005-08-20 02:47+0200\n" "PO-Revision-Date: 2005-11-14 23:00+0900\n" "Last-Translator: Yukiko BANDO <ybando(a)k6.dion.ne.jp>\n" -"Language-Team: Japanese <kde-i18n-doc(a)kde.org>\n" +"Language-Team: Japanese <Kdeveloper(a)kde.gr.jp>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/nb/libkexif.po new/libkexif-0.2.4/po/nb/libkexif.po --- old/libkexif-0.2.3/po/nb/libkexif.po 2006-05-07 00:22:21.000000000 +0200 +++ new/libkexif-0.2.4/po/nb/libkexif.po 2006-06-18 23:04:02.000000000 +0200 @@ -1,17 +1,18 @@ +# translation of libkexif.po to Norwegian Bokmaal # translation of libkexif.po to Norsk Bokmål -# Nils Kristian Tomren <project(a)nilsk.net>, 2005. +# Nils Kristian Tomren <project(a)nilsk.net>, 2005, 2006. # msgid "" msgstr "" "Project-Id-Version: libkexif\n" "POT-Creation-Date: 2005-08-20 02:47+0200\n" -"PO-Revision-Date: 2005-03-20 14:26+0100\n" +"PO-Revision-Date: 2006-02-25 23:11+0100\n" "Last-Translator: Nils Kristian Tomren <project(a)nilsk.net>\n" -"Language-Team: Norsk Bokmål <i18n-no(a)lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmaal <i18n-no(a)lister.ping.uio.no>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: KBabel 1.10.2\n" #: _translatorinfo.cpp:1 msgid "" @@ -50,7 +51,6 @@ msgstr "digiKam-håndbok" #: kexifdialog.cpp:119 -#, fuzzy msgid "Select level of detail:" msgstr "Velg detaljnivå:" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/uk/Makefile.am new/libkexif-0.2.4/po/uk/Makefile.am --- old/libkexif-0.2.3/po/uk/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/libkexif-0.2.4/po/uk/Makefile.am 2006-06-18 23:04:02.000000000 +0200 @@ -0,0 +1,3 @@ +KDE_LANG = uk +SUBDIRS = $(AUTODIRS) +POFILES = AUTO diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/uk/Makefile.in new/libkexif-0.2.4/po/uk/Makefile.in --- old/libkexif-0.2.3/po/uk/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkexif-0.2.4/po/uk/Makefile.in 2006-06-18 23:05:11.000000000 +0200 @@ -0,0 +1,769 @@ +# Makefile.in generated by automake 1.9.4 from Makefile.am. +# KDE tags expanded automatically by am_edit - $Revision: 483858 $ +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = po/uk +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +#>- html-recursive info-recursive install-data-recursive \ +#>- install-exec-recursive install-info-recursive \ +#>- install-recursive installcheck-recursive installdirs-recursive \ +#>- pdf-recursive ps-recursive uninstall-info-recursive \ +#>- uninstall-recursive +#>+ 6 +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive nmcheck-recursive bcheck-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +#>+ 1 +#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +#>+ 1 +DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARTSCCONFIG = @ARTSCCONFIG@ +AUTOCONF = @AUTOCONF@ +AUTODIRS = @AUTODIRS@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONF_FILES = @CONF_FILES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DCOPIDL = @DCOPIDL@ +DCOPIDL2CPP = @DCOPIDL2CPP@ +DCOPIDLNG = @DCOPIDLNG@ +DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ +DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ +GMSGFMT = @GMSGFMT@ +HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ +KCONFIG_COMPILER = @KCONFIG_COMPILER@ +KDECONFIG = @KDECONFIG@ +KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ +KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ +KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ +KDE_HAVE_DOT = @KDE_HAVE_DOT@ +KDE_INCLUDES = @KDE_INCLUDES@ +KDE_LDFLAGS = @KDE_LDFLAGS@ +KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ +KDE_MT_LIBS = @KDE_MT_LIBS@ +KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ +KDE_PLUGIN = @KDE_PLUGIN@ +KDE_RPATH = @KDE_RPATH@ +KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ +KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ +KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ +KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ +KDE_USE_FPIE = @KDE_USE_FPIE@ +KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ +KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ +KDE_USE_PIE = @KDE_USE_PIE@ +KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ +LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ +LIBCOMPAT = @LIBCOMPAT@ +LIBCRYPT = @LIBCRYPT@ +LIBDL = @LIBDL@ +LIBEXIF06_CFLAGS = @LIBEXIF06_CFLAGS@ +LIBEXIF06_LIBS = @LIBEXIF06_LIBS@ +LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@ +LIBEXIF_LIBS = @LIBEXIF_LIBS@ +LIBJPEG = @LIBJPEG@ +LIBOBJS = @LIBOBJS@ +LIBPNG = @LIBPNG@ +LIBPTHREAD = @LIBPTHREAD@ +LIBRESOLV = @LIBRESOLV@ +LIBS = @LIBS@ +LIBSM = @LIBSM@ +LIBSOCKET = @LIBSOCKET@ +LIBTOOL = @LIBTOOL@ +LIBUCB = @LIBUCB@ +LIBUTIL = @LIBUTIL@ +LIBZ = @LIBZ@ +LIB_KAB = @LIB_KAB@ +LIB_KABC = @LIB_KABC@ +LIB_KDECORE = @LIB_KDECORE@ +LIB_KDED = @LIB_KDED@ +LIB_KDEPIM = @LIB_KDEPIM@ +LIB_KDEPRINT = @LIB_KDEPRINT@ +LIB_KDEUI = @LIB_KDEUI@ +LIB_KDNSSD = @LIB_KDNSSD@ +LIB_KFILE = @LIB_KFILE@ +LIB_KFM = @LIB_KFM@ +LIB_KHTML = @LIB_KHTML@ +LIB_KIMPROXY = @LIB_KIMPROXY@ +LIB_KIO = @LIB_KIO@ +LIB_KJS = @LIB_KJS@ +LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ +LIB_KPARTS = @LIB_KPARTS@ +LIB_KSPELL = @LIB_KSPELL@ +LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_KUNITTEST = @LIB_KUNITTEST@ +LIB_KUTILS = @LIB_KUTILS@ +LIB_POLL = @LIB_POLL@ +LIB_QPE = @LIB_QPE@ +LIB_QT = @LIB_QT@ +LIB_SMB = @LIB_SMB@ +LIB_X11 = @LIB_X11@ +LIB_XEXT = @LIB_XEXT@ +LIB_XRENDER = @LIB_XRENDER@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MCOPIDL = @MCOPIDL@ +MEINPROC = @MEINPROC@ +MOC = @MOC@ +MSGFMT = @MSGFMT@ +NOOPT_CFLAGS = @NOOPT_CFLAGS@ +NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +QTDOCDIR = @QTDOCDIR@ +QTE_NORTTI = @QTE_NORTTI@ +QT_INCLUDES = @QT_INCLUDES@ +QT_LDFLAGS = @QT_LDFLAGS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TOPSUBDIRS = @TOPSUBDIRS@ +UIC = @UIC@ +UIC_TR = @UIC_TR@ +USER_INCLUDES = @USER_INCLUDES@ +USER_LDFLAGS = @USER_LDFLAGS@ +USE_EXCEPTIONS = @USE_EXCEPTIONS@ +USE_RTTI = @USE_RTTI@ +USE_THREADS = @USE_THREADS@ +VERSION = @VERSION@ +WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ +XGETTEXT = @XGETTEXT@ +XMLLINT = @XMLLINT@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_INCLUDES = @X_INCLUDES@ +X_LDFLAGS = @X_LDFLAGS@ +X_PRE_LIBS = @X_PRE_LIBS@ +X_RPATH = @X_RPATH@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +all_includes = @all_includes@ +all_libraries = @all_libraries@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +compile_LIBKEXIF_FALSE = @compile_LIBKEXIF_FALSE@ +compile_LIBKEXIF_TRUE = @compile_LIBKEXIF_TRUE@ +datadir = @datadir@ +doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ +doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +include_ARTS_FALSE = @include_ARTS_FALSE@ +include_ARTS_TRUE = @include_ARTS_TRUE@ +include_x11_FALSE = @include_x11_FALSE@ +include_x11_TRUE = @include_x11_TRUE@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +kde_appsdir = @kde_appsdir@ +kde_bindir = @kde_bindir@ +kde_confdir = @kde_confdir@ +kde_datadir = @kde_datadir@ +kde_htmldir = @kde_htmldir@ +kde_icondir = @kde_icondir@ +kde_includes = @kde_includes@ +kde_kcfgdir = @kde_kcfgdir@ +kde_libraries = @kde_libraries@ +kde_libs_htmldir = @kde_libs_htmldir@ +kde_libs_prefix = @kde_libs_prefix@ +kde_locale = @kde_locale@ +kde_mimedir = @kde_mimedir@ +kde_moduledir = @kde_moduledir@ +kde_qtver = @kde_qtver@ +kde_servicesdir = @kde_servicesdir@ +kde_servicetypesdir = @kde_servicetypesdir@ +kde_sounddir = @kde_sounddir@ +kde_styledir = @kde_styledir@ +kde_templatesdir = @kde_templatesdir@ +kde_wallpaperdir = @kde_wallpaperdir@ +kde_widgetdir = @kde_widgetdir@ +kdeinitdir = @kdeinitdir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +libkexif_SUBDIR_included_FALSE = @libkexif_SUBDIR_included_FALSE@ +libkexif_SUBDIR_included_TRUE = @libkexif_SUBDIR_included_TRUE@ +libkipi_SUBDIR_included_FALSE = @libkipi_SUBDIR_included_FALSE@ +libkipi_SUBDIR_included_TRUE = @libkipi_SUBDIR_included_TRUE@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ +po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +qt_includes = @qt_includes@ +qt_libraries = @qt_libraries@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ +unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +x_includes = @x_includes@ +x_libraries = @x_libraries@ +xdg_appsdir = @xdg_appsdir@ +xdg_directorydir = @xdg_directorydir@ +xdg_menudir = @xdg_menudir@ +KDE_LANG = uk +#>- SUBDIRS = $(AUTODIRS) +#>+ 1 +SUBDIRS =. +#>- POFILES = AUTO +#>+ 2 +POFILES = libkexif.po +GMOFILES = libkexif.gmo +#>- all: all-recursive +#>+ 1 +all: all-nls docs-am all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +#>- @for dep in $?; do \ +#>- case '$(am__configure_deps)' in \ +#>- *$$dep*) \ +#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +#>- && exit 0; \ +#>- exit 1;; \ +#>- esac; \ +#>- done; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ +#>- cd $(top_srcdir) && \ +#>- $(AUTOMAKE) --gnu po/uk/Makefile +#>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu po/uk/Makefile + cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +#>- distdir: $(DISTFILES) +#>+ 1 +distdir: distdir-nls $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +#>- uninstall: uninstall-recursive +#>+ 1 +uninstall: uninstall-nls uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +#>- clean: clean-recursive +#>+ 1 +clean: kde-rpo-clean clean-recursive + +#>- clean-am: clean-generic clean-libtool mostlyclean-am +#>+ 1 +clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +#>- install-data-am: +#>+ 1 +install-data-am: install-nls + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +#>- maintainer-clean: maintainer-clean-recursive +#>+ 1 +maintainer-clean: clean-nls maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ + clean clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: + +#>+ 2 +KDE_DIST=Makefile.in libkexif.po Makefile.am + +#>+ 4 +libkexif.gmo: libkexif.po + rm -f libkexif.gmo; $(GMSGFMT) -o libkexif.gmo $(srcdir)/libkexif.po + test ! -f libkexif.gmo || touch libkexif.gmo + +#>+ 3 +clean-nls: + -rm -f libkexif.gmo + +#>+ 10 +install-nls: + $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES + @for base in libkexif ; do \ + echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ + if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ + elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/$$base.mo ;\ + fi ;\ + done + + +#>+ 3 +uninstall-nls: + rm -f $(DESTDIR)$(kde_locale)/$(KDE_LANG)/LC_MESSAGES/libkexif.mo + +#>+ 2 +all-nls: $(GMOFILES) + +#>+ 8 +distdir-nls:$(GMOFILES) + for file in $(POFILES); do \ + cp $(srcdir)/$$file $(distdir); \ + done + for file in $(GMOFILES); do \ + cp $(srcdir)/$$file $(distdir); \ + done + +#>+ 2 +docs-am: + +#>+ 15 +force-reedit: + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/uk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu po/uk/Makefile + cd $(top_srcdir) && perl admin/am_edit po/uk/Makefile.in + + +#>+ 21 +clean-bcheck: + rm -f *.bchecktest.cc *.bchecktest.cc.class a.out + +bcheck: bcheck-recursive + +bcheck-am: + @for i in ; do \ + if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ + echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ + echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ + echo "$$i"; \ + if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ + rm -f $$i.bchecktest.cc; exit 1; \ + fi ; \ + echo "" >> $$i.bchecktest.cc.class; \ + perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ + rm -f a.out; \ + fi ; \ + done + + +#>+ 3 +final: + $(MAKE) all-am + +#>+ 3 +final-install: + $(MAKE) install-am + +#>+ 3 +no-final: + $(MAKE) all-am + +#>+ 3 +no-final-install: + $(MAKE) install-am + +#>+ 3 +kde-rpo-clean: + -rm -f *.rpo + +#>+ 3 +nmcheck: +nmcheck-am: nmcheck diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libkexif-0.2.3/po/uk/libkexif.po new/libkexif-0.2.4/po/uk/libkexif.po --- old/libkexif-0.2.3/po/uk/libkexif.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkexif-0.2.4/po/uk/libkexif.po 2006-06-18 23:04:02.000000000 +0200 @@ -0,0 +1,76 @@ +# Translation of libkexif.po to Ukrainian +# +# Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>, 2006. +msgid "" +msgstr "" +"Project-Id-Version: libkexif\n" +"POT-Creation-Date: 2005-08-20 02:47+0200\n" +"PO-Revision-Date: 2006-06-13 11:40-0700\n" +"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n" +"Language-Team: Ukrainian <translation(a)linux.org.ua>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.2\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>" +"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "Іван Петрущак" + +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "ivanpetrouchtchak(a)yahoo.com" + +#: kexifdialog.cpp:56 +msgid "EXIF Information" +msgstr "Інформація EXIF" + +#: kexifdialog.cpp:66 +msgid "KExif" +msgstr "KExif" + +#: kexifdialog.cpp:68 +msgid "An Exif data viewer" +msgstr "Перегляд даних Exif" + +#: kexifdialog.cpp:74 +msgid "Main developer" +msgstr "Головний розробник" + +#: kexifdialog.cpp:77 kexifdialog.cpp:80 +msgid "developer" +msgstr "розробник" + +#: kexifdialog.cpp:86 +msgid "Digikam Handbook" +msgstr "Підручник для Digikam" + +#: kexifdialog.cpp:119 +msgid "Select level of detail:" +msgstr "Виберіть рівень подробиць:" + +#: kexifdialog.cpp:124 kexifdialog.cpp:193 +msgid "Simple" +msgstr "Простий" + +#: kexifdialog.cpp:125 +msgid "Full" +msgstr "Повністю" + +#: kexiflistview.cpp:47 +msgid "Name" +msgstr "Назва" + +#: kexiflistview.cpp:48 +msgid "Value" +msgstr "Значення" + +#: kexiflistview.cpp:138 +msgid "%1%2" +msgstr "%1%2" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libgphoto2
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libgphoto2 checked in at Wed Jun 21 17:47:02 CEST 2006. -------- --- GNOME/libgphoto2/libgphoto2.changes 2006-04-26 11:29:38.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2006-06-19 13:27:39.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 19 13:27:03 CEST 2006 - meissner(a)suse.de + +- Upgraded to 2.2.0 release. + - More new USB ids. + - Lots of MTP fixes. + - wait_for_event handling. + - metadata handling for MTP. + +------------------------------------------------------------------- Old: ---- libgphoto2-2.1.99.0head.tar.bz2 libgphoto2-map-mp3.patch libgphoto2-mtp-fixes.patch libgphoto2-new-usbids.patch New: ---- libgphoto2-2.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.55Aphd/_old 2006-06-21 17:46:39.000000000 +0200 +++ /var/tmp/diff_new_pack.55Aphd/_new 2006-06-21 17:46:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgphoto2 (Version 2.1.99.0head) +# spec file for package libgphoto2 (Version 2.2.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,19 +11,16 @@ # norootforbuild Name: libgphoto2 -BuildRequires: gcc-c++ hal-devel libexif libjpeg-devel resmgr +BuildRequires: gcc-c++ hal-devel libexif libjpeg-devel mDNSResponder-devel mDNSResponder-lib resmgr URL: http://gphoto.org/ %define prefix /usr License: LGPL Group: Hardware/Other Summary: A Digital Camera Library -Version: 2.1.99.0head -Release: 27 +Version: 2.2.0 +Release: 1 Source0: libgphoto2-%{version}.tar.bz2 -Patch0: libgphoto2-map-mp3.patch -Patch1: libgphoto2-mtp-fixes.patch -Patch2: libgphoto2-new-usbids.patch -Patch3: libgphoto2-music-player.patch +Patch0: libgphoto2-music-player.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev resmgr %if %suse_version > 920 @@ -89,9 +86,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}} @@ -175,6 +169,12 @@ %run_ldconfig %changelog -n libgphoto2 +* Mon Jun 19 2006 - meissner(a)suse.de +- Upgraded to 2.2.0 release. +- More new USB ids. +- Lots of MTP fixes. +- wait_for_event handling. +- metadata handling for MTP. * Wed Apr 26 2006 - meissner(a)suse.de - Readd names and "libgphoto2 support" tag for the MTP devices. - Mark the devices as "user" to get correct resmgr support. ++++++ libgphoto2-2.1.99.0head.tar.bz2 -> libgphoto2-2.2.0.tar.bz2 ++++++ ++++ 134854 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libgnomeui
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libgnomeui checked in at Wed Jun 21 17:46:31 CEST 2006. -------- --- GNOME/libgnomeui/libgnomeui.changes 2006-04-13 05:27:44.000000000 +0200 +++ libgnomeui/libgnomeui.changes 2006-06-21 07:45:04.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 21 07:44:30 CEST 2006 - federico(a)novell.com + +- Added libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff to + fix part of https://bugzilla.novell.com/show_bug.cgi?id=184875. + This makes GtkFileSystemGnomeVFS not append a "/" to the end of + certain URIs if they already have one. + +------------------------------------------------------------------- New: ---- libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomeui.spec ++++++ --- /var/tmp/diff_new_pack.w2a85j/_old 2006-06-21 17:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.w2a85j/_new 2006-06-21 17:46:16.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Requires: gnome-icon-theme shared-mime-info Version: 2.12.0 -Release: 21 +Release: 28 Summary: The GNOME User Interface Library Source: libgnomeui-%{version}.tar.bz2 Patch: libgnomeui-%{version}-free-of-static-mem.diff @@ -29,6 +29,7 @@ Patch4: libgnomeui-315549.patch Patch5: libgnomeui-potfiles.patch Patch6: libgnomeui-155010-filechooser-show-drives.diff +Patch7: libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,6 +92,7 @@ %patch3 -p1 %patch4 %patch6 -p1 +%patch7 -p1 gnome-patch-translation-update %build @@ -155,6 +157,11 @@ %{prefix}/share/gtk-doc/html/libgnomeui %changelog -n libgnomeui +* Wed Jun 21 2006 - federico(a)novell.com +- Added libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff to + fix part of https://bugzilla.novell.com/show_bug.cgi?id=184875. + This makes GtkFileSystemGnomeVFS not append a "/" to the end of + certain URIs if they already have one. * Thu Apr 13 2006 - federico(a)novell.com - Added libgnomeui-155010-filechooser-show-drives.diff to fix the libgnomeui part of ++++++ libgnomeui-184875-gtkfilesystemgnomevfs-no-extra-slash.diff ++++++ 2006-06-20 Federico Mena Quintero <federico(a)novell.com> * file-chooser/gtkfilesystemgnomevfs.c (gtk_file_system_gnome_vfs_parse): Don't append a '/' to the base URI if it already has one. Fixes part of https://bugzilla.novell.com/show_bug.cgi?id=184875. --- libgnomeui/file-chooser/gtkfilesystemgnomevfs.c.orig 2006-06-20 16:53:10.000000000 -0500 +++ libgnomeui/file-chooser/gtkfilesystemgnomevfs.c 2006-06-20 17:30:11.000000000 -0500 @@ -1595,7 +1595,8 @@ gtk_file_system_gnome_vfs_parse (GtkFile } else { - gchar *path_part, *path, *uri, *filesystem_path, *escaped, *base_dir; + gchar *path_part, *path, *uri, *filesystem_path, *escaped; + int len; if (last_slash == stripped) path_part = g_strdup ("/"); @@ -1627,12 +1628,24 @@ gtk_file_system_gnome_vfs_parse (GtkFile /* don't insert break here, read above comment */ #endif default: - escaped = gnome_vfs_escape_path_string (filesystem_path); - base_dir = g_strconcat (base_uri, "/", NULL); - uri = gnome_vfs_uri_make_full_from_relative (base_dir, escaped); - g_free (base_dir); + len = strlen (base_uri); + if (len != 0) + { + escaped = gnome_vfs_escape_path_string (filesystem_path); + + if (base_uri[len - 1] != '/') + { + char *base_dir; + + base_dir = g_strconcat (base_uri, "/", NULL); + uri = gnome_vfs_uri_make_full_from_relative (base_dir, escaped); + g_free (base_dir); + } + else + uri = gnome_vfs_uri_make_full_from_relative (base_uri, escaped); - g_free (escaped); + g_free (escaped); + } } g_free (filesystem_path); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit libgnomesu
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package libgnomesu checked in at Wed Jun 21 17:46:08 CEST 2006. -------- --- GNOME/libgnomesu/libgnomesu.changes 2006-05-26 12:00:09.000000000 +0200 +++ libgnomesu/libgnomesu.changes 2006-06-20 17:32:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 20 17:30:24 CEST 2006 - sbrabec(a)suse.cz + +- Updated translations from upstream (179651#c15). + +------------------------------------------------------------------- New: ---- libgnomesu-po-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomesu.spec ++++++ --- /var/tmp/diff_new_pack.SJJgRh/_old 2006-06-21 17:45:28.000000000 +0200 +++ /var/tmp/diff_new_pack.SJJgRh/_new 2006-06-21 17:45:28.000000000 +0200 @@ -23,7 +23,7 @@ Provides: xsu Obsoletes: xsu Version: 1.0.0 -Release: 35 +Release: 37 Summary: GNOME su Library Source: libgnomesu-%{version}.tar.bz2 Source1: gnomesu-pam.pamd @@ -34,6 +34,7 @@ Patch4: libgnomesu-1.0.0-ensure-xauthority-env.patch Patch5: libgnomesu-scrollbar.patch Patch6: libgnomesu-password-translation.patch +Patch7: libgnomesu-po-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +72,7 @@ %patch4 -p1 %patch5 %patch6 -p0 +%patch7 cp -a %{S:1} pam-backend/gnomesu-pam %build @@ -163,6 +165,8 @@ %{prefix}/%_lib/libgnomesu.*a %changelog -n libgnomesu +* Tue Jun 20 2006 - sbrabec(a)suse.cz +- Updated translations from upstream (179651#c15). * Fri May 26 2006 - zsu(a)suse.de - bugzilla #169082. Call _() to translate label string "_Password:" * Thu May 18 2006 - ro(a)suse.de ++++++ libgnomesu-po-update.patch ++++++ ++++ 612 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit krusader
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package krusader checked in at Wed Jun 21 17:45:21 CEST 2006. -------- --- KDE/krusader/krusader.changes 2006-06-20 15:56:13.000000000 +0200 +++ krusader/krusader.changes 2006-06-21 03:51:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 21 03:51:37 CEST 2006 - dmueller(a)suse.de + +- fix build with gcc >= 4.2.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krusader.spec ++++++ --- /var/tmp/diff_new_pack.SJrlLl/_old 2006-06-21 17:44:11.000000000 +0200 +++ /var/tmp/diff_new_pack.SJrlLl/_new 2006-06-21 17:44:11.000000000 +0200 @@ -20,7 +20,7 @@ Group: Productivity/File utilities Summary: A File Manager Version: 1.70.0 -Release: 16 +Release: 17 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: krusader-%{version}.tar.gz Patch0: krusader-1.70.0_compilerwarnings.patch @@ -69,6 +69,8 @@ %_mandir/man1/* %changelog -n krusader +* Wed Jun 21 2006 - dmueller(a)suse.de +- fix build with gcc >= 4.2.0 * Tue Jun 20 2006 - dmueller(a)suse.de - build parallel * Tue May 30 2006 - adrian(a)suse.de ++++++ krusader-1.70.0_compilerwarnings.patch ++++++ --- /var/tmp/diff_new_pack.SJrlLl/_old 2006-06-21 17:44:12.000000000 +0200 +++ /var/tmp/diff_new_pack.SJrlLl/_new 2006-06-21 17:44:12.000000000 +0200 @@ -1,6 +1,6 @@ Index: krusader/Panel/krbriefview.h -=================================================================== ---- krusader/Panel/krbriefview.h.orig +================================================================================ +--- krusader/Panel/krbriefview.h +++ krusader/Panel/krbriefview.h @@ -19,7 +19,7 @@ virtual KrViewItem *getKrViewItemAt(const QPoint &vp); @@ -30,3 +30,14 @@ signals: +--- krusader/VFS/vfs.h ++++ krusader/VFS/vfs.h +@@ -134,7 +134,7 @@ + + protected: + /// Feel the vfs dictionary with vfiles, must be implemented for each vfs +- virtual bool populateVfsList(const KURL& origin, bool showHidden) = 0L; ++ virtual bool populateVfsList(const KURL& origin, bool showHidden) = 0; + /// Set the vfile list pointer + void setVfsFilesP(vfileDict* dict); + /// clear and delete all current vfiles ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit kbd
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package kbd checked in at Wed Jun 21 17:44:04 CEST 2006. -------- --- kbd/kbd.changes 2006-06-06 16:11:30.000000000 +0200 +++ kbd/kbd.changes 2006-06-21 17:32:01.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 21 17:31:23 CEST 2006 - jw(a)suse.de + +- added some pclose(), fixing (#88501) + +------------------------------------------------------------------- New: ---- kbd-1.12-setfont-fpclose.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.qYbfec/_old 2006-06-21 17:43:53.000000000 +0200 +++ /var/tmp/diff_new_pack.qYbfec/_new 2006-06-21 17:43:53.000000000 +0200 @@ -15,7 +15,7 @@ Group: System/Console Autoreqprov: on Version: 1.12 -Release: 65 +Release: 66 Summary: Keyboard and Font Utilities Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -50,6 +50,7 @@ Patch18: kbd-%{version}-be-nice-to-kdm.diff Patch19: kbd-%{version}-happy-abuild.diff Patch20: kbd-%{version}-strip.diff +Patch21: kbd-%{version}-setfont-fpclose.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 800 PreReq: %fillup_prereq %insserv_prereq @@ -98,6 +99,7 @@ %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 for i in `find data/keymaps/mac -type f` ; do mv $i $i. sed -f %{S:42} < $i. > $i @@ -314,6 +316,8 @@ #rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog -n kbd +* Wed Jun 21 2006 - jw(a)suse.de +- added some pclose(), fixing (#88501) * Tue Jun 06 2006 - jw(a)suse.de - $MAGIC should have been $CONSOLE_MAGIC (#181612) * Wed May 31 2006 - jw(a)suse.de ++++++ kbd-1.12-setfont-fpclose.diff ++++++ --- kbd-1.12/src/setfont.c.orig 2004-01-16 20:45:31.000000000 +0100 +++ kbd-1.12/src/setfont.c 2006-06-21 17:28:56.999867425 +0200 @@ -398,8 +398,10 @@ fprintf(stderr, _("When loading several fonts, all " "must be psf fonts - %s isn't\n"), pathname); + fpclose(fpi); exit(EX_DATAERR); } + fpclose(fpi); // avoid zombies, jw(a)suse.de (#88501) bytewidth = (width+7) / 8; height = fontbuflth / (bytewidth * fontsize); if (verbose) @@ -483,6 +485,7 @@ if(readpsffont(fpi, &inbuf, &inputlth, &fontbuf, &fontbuflth, &width, &fontsize, 0, no_u ? NULL : &uclistheads) == 0) { + fpclose(fpi); /* we've got a psf font */ bytewidth = (width+7) / 8; height = fontbuflth / (bytewidth * fontsize); @@ -497,6 +500,7 @@ #endif return; } + fpclose(fpi); // avoid zombies, jw(a)suse.de (#88501) /* instructions to combine fonts? */ { char *combineheader = "# combine partial fonts\n"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit kdesdk3
by root＠suse.de 21 Jun '06

21 Jun '06

Hello community, here is the log from the commit of package kdesdk3 checked in at Wed Jun 21 17:43:58 CEST 2006. -------- --- KDE/kdesdk3/kdesdk3.changes 2006-05-30 16:29:13.000000000 +0200 +++ kdesdk3/kdesdk3.changes 2006-06-20 15:20:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 20 15:20:08 CEST 2006 - dmueller(a)suse.de + +- build parallel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk3.spec ++++++ --- /var/tmp/diff_new_pack.Pyy8ue/_old 2006-06-21 17:43:46.000000000 +0200 +++ /var/tmp/diff_new_pack.Pyy8ue/_new 2006-06-21 17:43:46.000000000 +0200 @@ -21,7 +21,7 @@ Group: System/GUI/KDE Summary: The KDE Software Development Kit Version: 3.5.3 -Release: 3 +Release: 4 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: cvs @@ -132,7 +132,7 @@ %build . /etc/opt/kde3/common_options ./configure $configkde -make +do_make %{?jobs:-j %jobs} cd ../gettext-0.10.35 rm -f missing mkinstalldirs ltconfig install-sh ltmain.sh libtool libtoolize --force @@ -338,6 +338,8 @@ /opt/kde3/include/repository_stub.h %changelog -n kdesdk3 +* Tue Jun 20 2006 - dmueller(a)suse.de +- build parallel * Tue May 30 2006 - dmueller(a)suse.de - fix BuildRequires * Wed May 24 2006 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0