August 2007 - openSUSE Commits - openSUSE Mailing Lists

commit evolution
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package evolution checked in at Fri Aug 31 15:41:58 CEST 2007. -------- --- GNOME/evolution/evolution.changes 2007-08-21 12:52:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/evolution/evolution.changes 2007-08-29 19:17:41.670843000 +0200 @@ -1,0 +2,28 @@ +Wed Aug 29 19:09:23 CEST 2007 - maw(a)suse.de + +- Update to version 2.11.91: + + Set the free/busy info of events entered directly on the + canvas with the editor defaults + + A new command line option, --disable-preview, to disable + loading previously selected emails that caused crashes + + Documentation updates + + Fixes for expanding newly created folders and Exchange calendar + delegation bugs + + Other bugs (bugzilla.gnome.org) fixed: #287394, #313221, + #322624, #327977, #331729, #335566, #351552, #352346, #377173, + #377309, #383684, #387312, #401533, #419690, #427469, #428125, + #429234, #444882, #451599, #454253, #455799, #458508, #458822, + #460326, #460821, #462007, #462010, #462138, #462332, #463061, + #463129, #463946, #464312, #201201, #201202, #239441, #256878, + #262226, #262682, #272167, #274070, #301835, #303877, #303878, + #308636, #309166, #328405, #329746, #330628, #331174, #337616, + #352346, #467364, #468309, #338803, #347770, #350539, #352358, + #353462, #355766, #355864, #364431, #364700, #367760, #385414, + #385517, #411619, #412732, #414420, #420492, #428110, #431459, + #435942, #440328, #440807, #458715, #464106, #464338, #465573, + #466548, #466796, #467165, #467198, #467382, #467559, #467883, + #467635, #468159, #468294, #468303, #468303, #468303, #468411, + #468440, #468734, #468804, and #468869 +- Remove upstreamed bnc-301835-itip-formatter-no-organizer-sentby.patch + +------------------------------------------------------------------- Old: ---- bnc-301835-itip-formatter-no-organizer-sentby.patch evolution-2.11.6.1.tar.bz2 New: ---- evolution-2.11.91.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.ZJ9996/_old 2007-08-31 15:41:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ZJ9996/_new 2007-08-31 15:41:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.11.6.1) +# spec file for package evolution (Version 2.11.91) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ Obsoletes: evoltn Provides: evoltn Autoreqprov: on -Version: 2.11.6.1 -Release: 13 +Version: 2.11.91 +Release: 1 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar… Source: %{name}-%{version}.tar.bz2 @@ -55,7 +55,6 @@ Patch90: fix-security-gtkhtml-moreui.diff Patch91: evo-2.8.2-build-break.fix Patch92: evo-2.8.2-regression-fix.patch -Patch93: bnc-301835-itip-formatter-no-organizer-sentby.patch Patch100: abuild.patch #Patch101: xsltproc-no-net.patch Patch102: evolution-2.11.6.1-cal-busy-recursion.patch @@ -312,7 +311,6 @@ # 91 and 92 upsream too #%patch91 # %patch92 -%patch93 -p1 %patch100 -p1 #%patch101 -p1 %patch102 -p1 @@ -442,6 +440,31 @@ %{_libdir}/evolution/*/conduits/*.so %changelog +* Wed Aug 29 2007 - maw(a)suse.de +- Update to version 2.11.91: + + Set the free/busy info of events entered directly on the + canvas with the editor defaults + + A new command line option, --disable-preview, to disable + loading previously selected emails that caused crashes + + Documentation updates + + Fixes for expanding newly created folders and Exchange calendar + delegation bugs + + Other bugs (bugzilla.gnome.org) fixed: #287394, #313221, + [#322624], #327977, #331729, #335566, #351552, #352346, #377173, + [#377309], #383684, #387312, #401533, #419690, #427469, #428125, + [#429234], #444882, #451599, #454253, #455799, #458508, #458822, + [#460326], #460821, #462007, #462010, #462138, #462332, #463061, + [#463129], #463946, #464312, #201201, #201202, #239441, #256878, + [#262226], #262682, #272167, #274070, #301835, #303877, #303878, + [#308636], #309166, #328405, #329746, #330628, #331174, #337616, + [#352346], #467364, #468309, #338803, #347770, #350539, #352358, + [#353462], #355766, #355864, #364431, #364700, #367760, #385414, + [#385517], #411619, #412732, #414420, #420492, #428110, #431459, + [#435942], #440328, #440807, #458715, #464106, #464338, #465573, + [#466548], #466796, #467165, #467198, #467382, #467559, #467883, + [#467635], #468159, #468294, #468303, #468303, #468303, #468411, + [#468440], #468734, #468804, and #468869 +- Remove upstreamed bnc-301835-itip-formatter-no-organizer-sentby.patch * Tue Aug 21 2007 - sbrabec(a)suse.cz - Fixed crash on appointments with no no SENTBY parameter (#301835, patch from Suman Manjunath). ++++++ evolution-2.11.6.1.tar.bz2 -> evolution-2.11.91.tar.bz2 ++++++ GNOME/evolution/evolution-2.11.6.1.tar.bz2 /mounts/work_src_done/STABLE/evolution/evolution-2.11.91.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 eel
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package eel checked in at Fri Aug 31 15:40:54 CEST 2007. -------- --- GNOME/eel/eel.changes 2007-08-09 19:23:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/eel/eel.changes 2007-08-30 23:56:08.020492000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 30 23:55:45 CEST 2007 - maw(a)suse.de + +- Update to version 2.19.90: + + Translation updates. + +------------------------------------------------------------------- Old: ---- eel-2.19.6.tar.bz2 New: ---- eel-2.19.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eel.spec ++++++ --- /var/tmp/diff_new_pack.h25083/_old 2007-08-31 15:38:07.000000000 +0200 +++ /var/tmp/diff_new_pack.h25083/_new 2007-08-31 15:38:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package eel (Version 2.19.6) +# spec file for package eel (Version 2.19.90) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ Autoreqprov: on Provides: eel2 = 2.2.2 Obsoletes: eel2 <= 2.2.2 -Version: 2.19.6 -Release: 5 +Version: 2.19.90 +Release: 1 Summary: The Eazel Extensions Library Source: ftp://ftp.gnome.org/pub/gnome/sources/eel/2.19/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org @@ -96,6 +96,9 @@ %{_libdir}/*.*a %changelog +* Thu Aug 30 2007 - maw(a)suse.de +- Update to version 2.19.90: + + Translation updates. * Thu Aug 09 2007 - maw(a)suse.de - Fix up the -lang subpackage. * Tue Aug 07 2007 - mauro(a)suse.de ++++++ eel-2.19.6.tar.bz2 -> eel-2.19.90.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/aclocal.m4 new/eel-2.19.90/aclocal.m4 --- old/eel-2.19.6/aclocal.m4 2007-07-31 02:45:20.000000000 +0200 +++ new/eel-2.19.90/aclocal.m4 2007-08-11 10:13:19.000000000 +0200 @@ -7882,7 +7882,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 35 IT_PROG_INTLTOOL +# serial 36 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [AC_PREREQ([2.50])dnl @@ -7895,7 +7895,7 @@ esac if test -n "$1"; then - AC_MSG_CHECKING(for intltool >= $1) + AC_MSG_CHECKING([for intltool >= $1]) INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` @@ -7924,6 +7924,7 @@ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' AC_SUBST(INTLTOOL_DESKTOP_RULE) AC_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -7943,6 +7944,7 @@ AC_SUBST(INTLTOOL_SCHEMAS_RULE) AC_SUBST(INTLTOOL_THEME_RULE) AC_SUBST(INTLTOOL_SERVICE_RULE) +AC_SUBST(INTLTOOL_POLICY_RULE) # Use the tools built into the package, not the ones that are installed. AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') @@ -7965,19 +7967,16 @@ fi fi -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) - # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], [DATADIRNAME=share], [case $host in *-*-solaris*) @@ -8018,10 +8017,6 @@ for file in intltool-extract intltool-merge intltool-update; do sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ < ${ac_aux_dir}/${file}.in > ${file}.out if cmp -s ${file} ${file}.out 2>/dev/null; then @@ -8036,9 +8031,7 @@ ], [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}']) +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}']) ]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/ChangeLog new/eel-2.19.90/ChangeLog --- old/eel-2.19.6/ChangeLog 2007-07-31 02:50:06.000000000 +0200 +++ new/eel-2.19.90/ChangeLog 2007-08-14 01:04:48.000000000 +0200 @@ -1,3 +1,15 @@ +=== eel 2.19.90 === + +2007-08-14 Martin Wehner <martin.wehner(a)gmail.com> + + * NEWS: + Update for release + +2007-07-31 Martin Wehner <martin.wehner(a)gmail.com> + + * configure.in: + Post release version bump + === eel 2.19.6 === 2007-07-31 Martin Wehner <martin.wehner(a)gmail.com> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/configure new/eel-2.19.90/configure --- old/eel-2.19.6/configure 2007-07-31 02:45:22.000000000 +0200 +++ new/eel-2.19.90/configure 2007-08-11 10:13:22.000000000 +0200 @@ -908,14 +908,11 @@ INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE +INTLTOOL_POLICY_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL -INTLTOOL_ICONV -INTLTOOL_MSGFMT -INTLTOOL_MSGMERGE -INTLTOOL_XGETTEXT ALL_LINGUAS DATADIRNAME PKG_CONFIG @@ -2045,7 +2042,7 @@ EEL_MAJOR_VERSION=2 EEL_MINOR_VERSION=19 -EEL_MICRO_VERSION=6 +EEL_MICRO_VERSION=90 # If you need a modifier for the version number. # Normally empty, but can be used to make "fixup" releases. LIBGNOMEVFS_EXTRAVERSION= @@ -4718,7 +4715,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4721 "configure"' > conftest.$ac_ext + echo '#line 4718 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7505,11 +7502,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7508: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7512: \$? = $ac_status" >&5 + echo "$as_me:7509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7773,11 +7770,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7776: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7773: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7780: \$? = $ac_status" >&5 + echo "$as_me:7777: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7877,11 +7874,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7880: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7877: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7884: \$? = $ac_status" >&5 + echo "$as_me:7881: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9342,7 +9339,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9345 "configure"' > conftest.$ac_ext + echo '#line 9342 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10206,7 +10203,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10209 "configure" +#line 10206 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10306,7 +10303,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10309 "configure" +#line 10306 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12645,11 +12642,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12648: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12645: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12652: \$? = $ac_status" >&5 + echo "$as_me:12649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12749,11 +12746,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12749: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12756: \$? = $ac_status" >&5 + echo "$as_me:12753: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13285,7 +13282,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 13288 "configure"' > conftest.$ac_ext + echo '#line 13285 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14343,11 +14340,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14346: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14343: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14350: \$? = $ac_status" >&5 + echo "$as_me:14347: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14447,11 +14444,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14450: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14447: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14454: \$? = $ac_status" >&5 + echo "$as_me:14451: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15892,7 +15889,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15895 "configure"' > conftest.$ac_ext + echo '#line 15892 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -16669,11 +16666,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16669: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16676: \$? = $ac_status" >&5 + echo "$as_me:16673: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16937,11 +16934,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16940: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16937: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16944: \$? = $ac_status" >&5 + echo "$as_me:16941: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17041,11 +17038,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17044: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17041: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17048: \$? = $ac_status" >&5 + echo "$as_me:17045: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18506,7 +18503,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 18509 "configure"' > conftest.$ac_ext + echo '#line 18506 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -19775,6 +19772,8 @@ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + @@ -19866,171 +19865,6 @@ fi fi -# Extract the first word of "iconv", so it can be a program name with args. -set dummy iconv; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_ICONV in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv" - ;; -esac -fi -INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV -if test -n "$INTLTOOL_ICONV"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5 -echo "${ECHO_T}$INTLTOOL_ICONV" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_MSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt" - ;; -esac -fi -INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT -if test -n "$INTLTOOL_MSGFMT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5 -echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge" - ;; -esac -fi -INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE -if test -n "$INTLTOOL_MSGMERGE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INTLTOOL_XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext" - ;; -esac -fi -INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT -if test -n "$INTLTOOL_XGETTEXT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5 -echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - # Substitute ALL_LINGUAS so we can use it in po/Makefile @@ -20048,7 +19882,7 @@ main () { extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr + return _nl_msg_cat_cntr ; return 0; } @@ -24906,9 +24740,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}' prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" -INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}' -INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}' -INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}' +INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' _ACEOF @@ -25176,14 +25008,11 @@ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim +INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim -INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim -INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim -INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim ALL_LINGUAS!$ALL_LINGUAS$ac_delim DATADIRNAME!$DATADIRNAME$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim @@ -25221,7 +25050,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -25785,10 +25614,6 @@ for file in intltool-extract intltool-merge intltool-update; do sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ - -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \ - -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \ - -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \ - -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \ < ${ac_aux_dir}/${file}.in > ${file}.out if cmp -s ${file} ${file}.out 2>/dev/null; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/configure.in new/eel-2.19.90/configure.in --- old/eel-2.19.6/configure.in 2007-07-10 04:43:38.000000000 +0200 +++ new/eel-2.19.90/configure.in 2007-07-31 03:00:06.000000000 +0200 @@ -32,7 +32,7 @@ EEL_MAJOR_VERSION=2 EEL_MINOR_VERSION=19 -EEL_MICRO_VERSION=6 +EEL_MICRO_VERSION=90 # If you need a modifier for the version number. # Normally empty, but can be used to make "fixup" releases. LIBGNOMEVFS_EXTRAVERSION= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/eel/eel-features.h new/eel-2.19.90/eel/eel-features.h --- old/eel-2.19.6/eel/eel-features.h 2007-07-31 02:53:12.000000000 +0200 +++ new/eel-2.19.90/eel/eel-features.h 2007-08-14 01:09:25.000000000 +0200 @@ -3,8 +3,8 @@ #define EEL_MAJOR_VERSION (2) #define EEL_MINOR_VERSION (19) -#define EEL_MICRO_VERSION (6) -#define EEL_VERSION "2.19.6" +#define EEL_MICRO_VERSION (90) +#define EEL_VERSION "2.19.90" extern const unsigned int eel_major_version, eel_minor_version, eel_micro_version; extern const char *eel_version; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/eel/Makefile.in new/eel-2.19.90/eel/Makefile.in --- old/eel-2.19.6/eel/Makefile.in 2007-07-31 02:53:05.000000000 +0200 +++ new/eel-2.19.90/eel/Makefile.in 2007-08-14 01:09:12.000000000 +0200 @@ -171,14 +171,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -190,7 +188,6 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/eel.spec new/eel-2.19.90/eel.spec --- old/eel-2.19.6/eel.spec 2007-07-31 02:53:37.000000000 +0200 +++ new/eel-2.19.90/eel.spec 2007-08-14 01:09:58.000000000 +0200 @@ -1,7 +1,7 @@ %define __spec_install_post /usr/lib/rpm/brp-compress Name: eel2 Summary: Eazel Extensions Library. -Version: 2.19.6 +Version: 2.19.90 Release: 1 License: GPL Group: System Environment/Libraries diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/intltool-extract.in new/eel-2.19.90/intltool-extract.in --- old/eel-2.19.6/intltool-extract.in 2007-07-31 02:53:03.000000000 +0200 +++ new/eel-2.19.90/intltool-extract.in 2007-08-14 01:09:09.000000000 +0200 @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; +my $VERSION = "0.36.0"; ## Loaded modules use strict; @@ -237,9 +237,9 @@ s/'/'/g; # ' s/"/"/g; # " - s/&/&/g; s/</</g; s/>/>/g; + s/&/&/g; return $_; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/intltool-merge.in new/eel-2.19.90/intltool-merge.in --- old/eel-2.19.6/intltool-merge.in 2007-07-31 02:53:03.000000000 +0200 +++ new/eel-2.19.90/intltool-merge.in 2007-08-14 01:09:09.000000000 +0200 @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.35.5"; +my $VERSION = "0.36.0"; ## Loaded modules use strict; @@ -93,9 +93,24 @@ my %po_files_by_lang = (); my %translations = (); -my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@"; +my $iconv = $ENV{"ICONV"} || "iconv"; my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); +sub isProgramInPath +{ + my ($file) = @_; + # If either a file exists, or when run it returns 0 exit status + return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); + return 0; +} + +if (! isProgramInPath ("$iconv")) +{ + print STDERR " *** iconv is not found on this system!\n". + " *** Without it, intltool-merge can not convert encodings.\n"; + exit; +} + # Use this instead of \w for XML files to handle more possible characters. my $w = "[-A-Za-z0-9._:]"; @@ -494,16 +509,15 @@ return $string; } -## NOTE: deal with < - < but not > - > because it seems its ok to have -## > in the entity. For further info please look at #84738. sub entity_decode { local ($_) = @_; s/'/'/g; # ' s/"/"/g; # " - s/&/&/g; s/</</g; + s/>/>/g; + s/&/&/g; return $_; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/intltool-update.in new/eel-2.19.90/intltool-update.in --- old/eel-2.19.6/intltool-update.in 2007-07-31 02:53:03.000000000 +0200 +++ new/eel-2.19.90/intltool-update.in 2007-08-14 01:09:09.000000000 +0200 @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.35.5"; +my $VERSION = "0.36.0"; my $PACKAGE = "intltool"; ## Loaded modules @@ -71,7 +71,8 @@ "sheet(?:\\.in)+|". # ? "schemas(?:\\.in)+|". # GConf specific "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. -"kbd(?:\\.in)+"; # GOK specific. +"kbd(?:\\.in)+|". # GOK specific. +"policy(?:\\.in)+"; # PolicyKit files my $ini_support = "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec @@ -328,7 +329,12 @@ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; }, ".."; - + find sub { + push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; + push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; + push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; + push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; + }, "$SRCDIR/.."; open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>; @@ -489,11 +495,15 @@ my %in2; foreach (@buf_potfiles_sorted) { + s#^$SRCDIR/../##; + s#^$SRCDIR/##; $in2{$_} = 1; } foreach (@buf_potfiles_ignore_sorted) { + s#^$SRCDIR/../##; + s#^$SRCDIR/##; $in2{$_} = 1; } @@ -501,9 +511,16 @@ foreach (@buf_allfiles_sorted) { - if (!exists($in2{$_})) + my $dummy = $_; + my $srcdir = $SRCDIR; + + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; + $dummy =~ s#_build/##; + if (!exists($in2{$dummy})) { - push @result, $_ + push @result, $dummy } } @@ -563,11 +580,23 @@ exit 1; } -sub isIntltoolExtractInPath +sub isProgramInPath { my ($file) = @_; # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file >/dev/null") == 0)); + return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); + return 0; +} + +sub isGNUGettextTool +{ + my ($file) = @_; + # Check that we are using GNU gettext tools + if (isProgramInPath ($file)) + { + my $version = `$file --version`; + return 1 if ($version =~ m/.*$GNU .*$.*/); + } return 0; } @@ -577,7 +606,7 @@ ## Generate the .h header files, so we can allow glade and ## xml translation support - if (! isIntltoolExtractInPath("$EXTRACT")) + if (! isProgramInPath ("$EXTRACT")) { print STDERR "\n *** The intltool-extract script wasn't found!" ."\n *** Without it, intltool-update can not generate files.\n"; @@ -624,13 +653,13 @@ # sub GeneratePOTemplate { - my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@"; + my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; chomp $XGETTEXT; - if (! -x $XGETTEXT) + if (! isGNUGettextTool ("$XGETTEXT")) { - print STDERR " *** xgettext is not found on this system!\n". + print STDERR " *** GNU xgettext is not found on this system!\n". " *** Without it, intltool-update can not extract strings.\n"; exit; } @@ -726,7 +755,23 @@ unlink "$MODULE.pot"; my @xgettext_argument=("$XGETTEXT", "--add-comments", - "--directory\=\.", + "--directory\=.", + "--default-domain\=$MODULE", + "--flag\=g_strdup_printf:1:c-format", + "--flag\=g_string_printf:2:c-format", + "--flag\=g_string_append_printf:2:c-format", + "--flag\=g_error_new:3:c-format", + "--flag\=g_set_error:4:c-format", + "--flag\=g_markup_printf_escaped:1:c-format", + "--flag\=g_log:3:c-format", + "--flag\=g_print:1:c-format", + "--flag\=g_printerr:1:c-format", + "--flag\=g_printf:1:c-format", + "--flag\=g_fprintf:2:c-format", + "--flag\=g_sprintf:2:c-format", + "--flag\=g_snprintf:3:c-format", + "--flag\=g_scanner_error:2:c-format", + "--flag\=g_scanner_warn:2:c-format", "--output\=$MODULE\.pot", "--files-from\=\.\/POTFILES\.in\.temp"); my $XGETTEXT_KEYWORDS = &FindPOTKeywords; @@ -793,9 +838,16 @@ { -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@"; + my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; my ($lang, $outfile) = @_; + if (! isGNUGettextTool ("$MSGMERGE")) + { + print STDERR " *** GNU msgmerge is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } + print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; my $infile = "$SRCDIR/$lang.po"; @@ -836,7 +888,14 @@ sub Console_Write_TranslationStatus { my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; + my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; + + if (! isGNUGettextTool ("$MSGFMT")) + { + print STDERR " *** GNU msgfmt is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); @@ -845,21 +904,28 @@ sub Console_Write_CoverageReport { - my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@"; + my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; + + if (! isGNUGettextTool ("$MSGFMT")) + { + print STDERR " *** GNU msgfmt is not found on this system!\n". + " *** Without it, intltool-update can not extract strings.\n"; + exit; + } &GatherPOFiles; foreach my $lang (@languages) { - print "$lang: "; + print STDERR "$lang: "; &POFile_Update ($lang, ""); } - print "\n\n * Current translation support in $MODULE \n\n"; + print STDERR "\n\n * Current translation support in $MODULE \n\n"; foreach my $lang (@languages) { - print "$lang: "; + print STDERR "$lang: "; system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); } } @@ -933,13 +999,13 @@ $conf_in || die "Cannot find top_builddir in Makevars."; } - elsif (-f "../configure.ac") + elsif (-f "$SRCDIR/../configure.ac") { - $conf_in = "../configure.ac"; + $conf_in = "$SRCDIR/../configure.ac"; } - elsif (-f "../configure.in") + elsif (-f "$SRCDIR/../configure.in") { - $conf_in = "../configure.in"; + $conf_in = "$SRCDIR/../configure.in"; } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/Makefile.in new/eel-2.19.90/Makefile.in --- old/eel-2.19.6/Makefile.in 2007-07-31 02:53:05.000000000 +0200 +++ new/eel-2.19.90/Makefile.in 2007-08-14 01:09:12.000000000 +0200 @@ -153,14 +153,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -172,7 +170,6 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/NEWS new/eel-2.19.90/NEWS --- old/eel-2.19.6/NEWS 2007-07-31 02:44:44.000000000 +0200 +++ new/eel-2.19.90/NEWS 2007-08-14 01:04:20.000000000 +0200 @@ -1,3 +1,6 @@ +Major changes in 2.19.90 were: +* Translation updates + Major changes in 2.19.6 were: * Fix crash in the open with dialog * Translation updates diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/po/ChangeLog new/eel-2.19.90/po/ChangeLog --- old/eel-2.19.6/po/ChangeLog 2007-07-30 22:27:24.000000000 +0200 +++ new/eel-2.19.90/po/ChangeLog 2007-08-11 10:13:13.000000000 +0200 @@ -1,3 +1,7 @@ +2007-08-08 Baris Cicek <baris(a)teamforce.name.tr> + + * tr.po: Updated Turkish translation + 2007-07-28 Inaki Larranaga Murgoitio <dooteo(a)zundan.com> * eu.po: Updated Basque translation. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/po/tr.po new/eel-2.19.90/po/tr.po --- old/eel-2.19.6/po/tr.po 2007-07-10 01:55:10.000000000 +0200 +++ new/eel-2.19.90/po/tr.po 2007-08-11 10:13:13.000000000 +0200 @@ -1,22 +1,22 @@ -# translation of eel.HEAD.tr.po to Turkish # Turkish translation of eel. -# Copyright (C) 2000-2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000-2003, 2004, 2007 Free Software Foundation, Inc. +# # Fatih Demir <kabalak(a)gtranslator.org>, 2000. # Ömer Fadıl USTA <omer_fad(a)hotmail.com>, 2001. # Arman Aksoy <armish(a)linux-sevenler.de>, 2003. -# Baris Cicek <baris(a)teamforce.name.tr>, 2004. -# +# Baris Cicek <baris(a)teamforce.name.tr>, 2004, 2007. msgid "" msgstr "" "Project-Id-Version: eel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-04 23:14+0300\n" -"PO-Revision-Date: 2004-09-03 02:38+0300\n" +"POT-Creation-Date: 2007-08-08 04:01+0300\n" +"PO-Revision-Date: 2007-08-08 04:00+0300\n" "Last-Translator: Baris Cicek <baris(a)teamforce.name.tr>\n" "Language-Team: Turkish <gnome-turk(a)gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: ../eel/eel-alert-dialog.c:115 msgid "Image/label border" @@ -60,7 +60,7 @@ #: ../eel/eel-editable-label.c:367 msgid "The text of the label." -msgstr "Etiketteki metin." +msgstr "Etiketin metni." #: ../eel/eel-editable-label.c:373 msgid "Justification" @@ -78,11 +78,11 @@ #: ../eel/eel-editable-label.c:382 msgid "Line wrap" -msgstr "Satır Bölme" +msgstr "Satır bölme" #: ../eel/eel-editable-label.c:383 msgid "If set, wrap lines if the text becomes too wide." -msgstr "Eğer seçili ise, satırlar çok geniş olduğunda bölünür." +msgstr "Eğer atanmışsa, satırlar çok geniş olduğunda bölünür." # libnautilus-extensions/nautilus-stock-dialogs.c:538 #: ../eel/eel-editable-label.c:390 @@ -101,7 +101,7 @@ #: ../eel/eel-editable-label.c:401 msgid "" "The position of the opposite end of the selection from the cursor in chars." -msgstr "Karakterlerin imleçle seçiminde karşı ucun pozisyonu." +msgstr "Seçimin karşı ucunun imlece göre karakter olarak konumu." #: ../eel/eel-editable-label.c:3049 msgid "Select All" @@ -127,32 +127,11 @@ #: ../eel/eel-gconf-extensions.c:90 msgid "All further errors shown only on terminal." -msgstr "Diğer tüm hatalar sadece terminalde görüntülenir." - -# libnautilus-extensions/nautilus-glib-extensions.c:1192 -#. localizers: These strings are part of the strftime -#. * self-check code and must be changed to match what strtfime -#. * yields. The first one is "%m/%d/%y, %I:%M %p". -#. -#: ../eel/eel-glib-extensions.c:1193 -msgid "01/01/00, 01:00 AM" -msgstr "01/01/00, 01:00 AM" - -# libnautilus-extensions/nautilus-glib-extensions.c:1193 -#. The second one is "%-m/%-d/%-y, %-I:%M %p". -#: ../eel/eel-glib-extensions.c:1195 -msgid "1/1/00, 1:00 AM" -msgstr "1/1/00, 1:00 AM" - -# libnautilus-extensions/nautilus-glib-extensions.c:1194 -#. The third one is "%_m/%_d/%_y, %_I:%M %p". -#: ../eel/eel-glib-extensions.c:1197 -msgid " 1/ 1/00, 1:00 AM" -msgstr " 1/ 1/00, 1:00 AM" +msgstr "Diğer tüm hatalar sadece uçbirimde görüntülenir." #: ../eel/eel-gnome-extensions.c:284 msgid "No image was selected." -msgstr "Hiç resim seçilmedi." +msgstr "Hiçbir resim seçilmedi." #: ../eel/eel-gnome-extensions.c:285 msgid "You must click on an image to select it." @@ -174,19 +153,21 @@ msgid "No applications selected" msgstr "Hiçbir uygulama seçilmedi" -#: ../eel/eel-mime-application-chooser.c:528 ../eel/eel-open-with-dialog.c:984 +#: ../eel/eel-mime-application-chooser.c:528 +#: ../eel/eel-open-with-dialog.c:1067 #, c-format msgid "%s document" msgstr "%s belgesi" -#: ../eel/eel-mime-application-chooser.c:538 ../eel/eel-open-with-dialog.c:997 +#: ../eel/eel-mime-application-chooser.c:538 +#: ../eel/eel-open-with-dialog.c:1080 msgid "Unknown" msgstr "Bilinmeyen" #: ../eel/eel-mime-application-chooser.c:546 #, c-format -msgid "Select an application to open %s and others of type \"%s\"" -msgstr "%s ve diğer \"%s\" türlerini açmak için bi uygulama seçin" +msgid "Select an application to open %s and other files of type \"%s\"" +msgstr "%s ve diğer \"%s\" türdeki dosyaları açmak için bi uygulama seçin" #: ../eel/eel-open-with-dialog.c:175 ../eel/eel-open-with-dialog.c:220 msgid "Could not run application" @@ -207,42 +188,42 @@ #: ../eel/eel-open-with-dialog.c:288 msgid "Could not add application to the application database" -msgstr "Uygulama uygulama veritabanına eklenemedi" +msgstr "Uygulama, uygulama veritabanına eklenemedi" #: ../eel/eel-open-with-dialog.c:401 msgid "Select an Application" msgstr "Bir Uygulama Seçin" -#: ../eel/eel-open-with-dialog.c:809 +#: ../eel/eel-open-with-dialog.c:892 msgid "Open With" msgstr "Birlikte Aç" -#: ../eel/eel-open-with-dialog.c:846 +#: ../eel/eel-open-with-dialog.c:929 msgid "Select an application to view its description." -msgstr "Açıklamasını görüntülemek için bi uygulama seçin" +msgstr "Açıklamasını görüntülemek için bir uygulama seçin." -#: ../eel/eel-open-with-dialog.c:871 +#: ../eel/eel-open-with-dialog.c:954 msgid "_Use a custom command" msgstr "Ö_zel bir komut kullan" -#: ../eel/eel-open-with-dialog.c:888 +#: ../eel/eel-open-with-dialog.c:971 msgid "_Browse..." msgstr "_Göz at..." -#: ../eel/eel-open-with-dialog.c:910 +#: ../eel/eel-open-with-dialog.c:993 msgid "_Open" msgstr "_Aç" -#: ../eel/eel-open-with-dialog.c:1004 +#: ../eel/eel-open-with-dialog.c:1087 #, c-format msgid "Open %s and other files of type \"%s\" with:" -msgstr "%s ve diğer \"%s\" türlerini birlikte aç:" +msgstr "%s ve diğer \"%s\" türdeki dosyaları birlikte aç:" -#: ../eel/eel-open-with-dialog.c:1036 +#: ../eel/eel-open-with-dialog.c:1119 msgid "_Add" msgstr "_Ekle" -#: ../eel/eel-open-with-dialog.c:1037 +#: ../eel/eel-open-with-dialog.c:1120 msgid "Add Application" msgstr "Uygulama Ekle" @@ -252,37 +233,4 @@ #: ../eel/eel-vfs-extensions.c:650 msgid " (invalid Unicode)" -msgstr " (Geçersiz Unikod)" - -# libnautilus-extensions/nautilus-stock-dialogs.c:466 -# libnautilus-extensions/nautilus-stock-dialogs.c:506 -#~ msgid "GConf Error" -#~ msgstr "GConf Hatası" - -# components/help/converters/gnome-db2html2/sect-elements.c:1027 -#~ msgid "No Selection Made" -#~ msgstr "Seçim Yapılmadı" - -#~ msgid "The application '%s' is not a valid executable" -#~ msgstr "'%s' uygulaması geçerli bir çalıştırılabilir dosya değil" - -#~ msgid "Could not open application" -#~ msgstr "Uygulama açılamadı" - -# components/help/hyperbola-filefmt.c:630 -# libnautilus-extensions/nautilus-stock-dialogs.c:446 -#~ msgid "Info" -#~ msgstr "Bilgi" - -# libnautilus-extensions/nautilus-stock-dialogs.c:456 -#~ msgid "Warning" -#~ msgstr "Uyarı" - -# libnautilus-extensions/nautilus-stock-dialogs.c:466 -# libnautilus-extensions/nautilus-stock-dialogs.c:506 -#~ msgid "Error" -#~ msgstr "Hata" - -# libnautilus-extensions/nautilus-stock-dialogs.c:538 -#~ msgid "Question" -#~ msgstr "Soru" +msgstr " (geçersiz Unikod)" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/eel-2.19.6/test/Makefile.in new/eel-2.19.90/test/Makefile.in --- old/eel-2.19.6/test/Makefile.in 2007-07-31 02:53:05.000000000 +0200 +++ new/eel-2.19.90/test/Makefile.in 2007-08-14 01:09:12.000000000 +0200 @@ -199,14 +199,12 @@ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_ICONV = @INTLTOOL_ICONV@ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -218,7 +216,6 @@ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cracklib
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package cracklib checked in at Fri Aug 31 15:38:00 CEST 2007. -------- --- cracklib/cracklib.changes 2007-08-20 10:19:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/cracklib/cracklib.changes 2007-08-31 10:22:32.690937000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 31 10:11:50 CEST 2007 - mc(a)suse.de + +- update localization files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cracklib.spec ++++++ --- /var/tmp/diff_new_pack.e23548/_old 2007-08-31 15:37:19.000000000 +0200 +++ /var/tmp/diff_new_pack.e23548/_new 2007-08-31 15:37:19.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Libraries Autoreqprov: on Version: 2.8.10 -Release: 30 +Release: 33 Requires: cracklib-dict Summary: Full Dictionary for cracklib Source: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.bz2 @@ -135,6 +135,8 @@ %{_datadir}/cracklib/pw_dict.pwi %changelog +* Fri Aug 31 2007 - mc(a)suse.de +- update localization files * Mon Aug 20 2007 - mc(a)suse.de - update localization files * Tue Jun 05 2007 - mc(a)suse.de ++++++ cracklib-po.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/da.po new/po/da.po --- old/po/da.po 2007-07-16 10:18:53.000000000 +0200 +++ new/po/da.po 2007-08-31 10:08:26.000000000 +0200 @@ -5,7 +5,7 @@ "Project-Id-Version: cracklib\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-03 09:41+0000\n" -"PO-Revision-Date: 2007-07-14 15:50+0200\n" +"PO-Revision-Date: 2007-08-24 11:54+0200\n" "Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n" "Language-Team: <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ #: lib/fascist.c:555 msgid "you are not registered in the password file" -msgstr "Du er ikke registreret i adgangskodefilen" +msgstr "du er ikke registreret i adgangskodefilen" #: lib/fascist.c:569 msgid "it is based on your username" @@ -24,7 +24,7 @@ #: lib/fascist.c:634 msgid "it is based upon your password entry" -msgstr "Det er baseret på din adgangskodeindtastning" +msgstr "det er baseret på din adgangskodeindtastning" #: lib/fascist.c:654 msgid "it is derived from your password entry" @@ -44,7 +44,7 @@ #: lib/fascist.c:731 msgid "it is WAY too short" -msgstr "Den er ALT for kort" +msgstr "den er ALT for kort" #: lib/fascist.c:736 msgid "it is too short" @@ -64,7 +64,7 @@ #: lib/fascist.c:788 msgid "it looks like a National Insurance number." -msgstr "Det ligner et CPR-nummer" +msgstr "det ligner et CPR-nummer" #: lib/fascist.c:815 msgid "it is based on a dictionary word" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/pa.po new/po/pa.po --- old/po/pa.po 2007-08-14 10:39:24.000000000 +0200 +++ new/po/pa.po 2007-08-31 10:08:33.000000000 +0200 @@ -1,18 +1,19 @@ -# translation of cracklib.pa.po to Panjabi +# translation of cracklib.po to Punjabi # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # # This file is distributed under the same license as @PACKAGE@ package. FIRST # # A S Alam <aalam(a)users.sf.net>, 2007. +# ASB <aalam(a)users.sf.net>, 2007. msgid "" msgstr "" -"Project-Id-Version: cracklib.pa\n" +"Project-Id-Version: cracklib\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-03 09:41+0000\n" -"PO-Revision-Date: 2007-08-13 07:34+0530\n" -"Last-Translator: A S Alam <aalam(a)users.sf.net>\n" -"Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n" +"PO-Revision-Date: 2007-08-21 06:31+0530\n" +"Last-Translator: ASB <aalam(a)users.sf.net>\n" +"Language-Team: Punjabi <punjabi-l10n(a)lists.sf.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,7 +22,7 @@ #: lib/fascist.c:555 msgid "you are not registered in the password file" -msgstr "ਤੁਸੀਂ ਗੁਪਤ-ਕੋਡ ਫਾਇਲ ਵਿੱਚ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ" +msgstr "ਤੁਸੀਂ ਪਾਸਵਰਡ ਫਾਇਲ ਵਿੱਚ ਰਜਿਸਟਰ ਨਹੀਂ ਹੋ" #: lib/fascist.c:569 msgid "it is based on your username" @@ -29,23 +30,23 @@ #: lib/fascist.c:634 msgid "it is based upon your password entry" -msgstr "ਇਹ ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਐਂਟਰੀ ਉੱਤੇ ਅਧਾਰਿਤ ਹੈ" +msgstr "ਇਹ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਐਂਟਰੀ ਉੱਤੇ ਅਧਾਰਿਤ ਹੈ" #: lib/fascist.c:654 msgid "it is derived from your password entry" -msgstr "ਇਹ ਤੁਹਾਡੀ ਗੁਪਤ-ਕੋਡ ਐਂਟਰੀ ਤੋਂ ਲਿਆ ਜਾਪਦਾ ਹੈ" +msgstr "ਇਹ ਤੁਹਾਡੀ ਪਾਸਵਰਡ ਐਂਟਰੀ ਤੋਂ ਲਿਆ ਜਾਪਦਾ ਹੈ" #: lib/fascist.c:667 msgid "it's derived from your password entry" -msgstr "ਇਹ ਤੁਹਾਡੀ ਗੁਪਤ-ਕੋਡ ਐਂਟਰੀ ਤੋਂ ਲਿਆ ਹੈ" +msgstr "ਇਹ ਤੁਹਾਡੀ ਪਾਸਵਰਡ ਐਂਟਰੀ ਤੋਂ ਲਿਆ ਹੈ" #: lib/fascist.c:681 msgid "it is derivable from your password entry" -msgstr "ਇਹ ਤੁਹਾਡੀ ਗੁਪਤ-ਕੋਡ ਐਂਟਰੀ ਤੋਂ ਸਮਝਣਯੋਗ ਹੈ" +msgstr "ਇਹ ਤੁਹਾਡੀ ਪਾਸਵਰਡ ਐਂਟਰੀ ਤੋਂ ਸਮਝਣਯੋਗ ਹੈ" #: lib/fascist.c:695 msgid "it's derivable from your password entry" -msgstr "ਇਹ ਤੁਹਾਡੀ ਗੁਪਤ-ਕੋਡ ਐਂਟਰੀ ਤੋਂ ਸਮਝਣਯੋਗ ਹੈ" +msgstr "ਇਹ ਤੁਹਾਡੀ ਪਾਸਵਰਡ ਐਂਟਰੀ ਤੋਂ ਸਮਝਣਯੋਗ ਹੈ" #: lib/fascist.c:731 msgid "it is WAY too short" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/sk.po new/po/sk.po --- old/po/sk.po 2007-05-31 10:54:28.000000000 +0200 +++ new/po/sk.po 2007-08-31 10:08:22.000000000 +0200 @@ -7,8 +7,8 @@ "Project-Id-Version: cracklib\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-03 09:41+0000\n" -"PO-Revision-Date: 2005-06-23 13:12+02:00\n" -"Last-Translator: Stanislav Visnovsky <visnov(a)suse.cz>\n" +"PO-Revision-Date: 2007-08-19 15:32+0100\n" +"Last-Translator: Ladislav Michnovic <lmichnovic(a)suse.cz>\n" "Language-Team: Slovak <sk-i18n(a)linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ #: lib/fascist.c:569 msgid "it is based on your username" -msgstr "je založené na mene vášho účtu" +msgstr "je založené na mene používateľa" #: lib/fascist.c:634 msgid "it is based upon your password entry" @@ -74,3 +74,4 @@ #: lib/fascist.c:834 msgid "it is based on a (reversed) dictionary word" msgstr "je založené na (obrátenom) slove zo slovníka" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 curl
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package curl checked in at Fri Aug 31 15:37:33 CEST 2007. -------- --- curl/curl.changes 2007-08-03 13:54:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/curl/curl.changes 2007-08-29 12:26:21.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 29 12:25:59 CEST 2007 - mmarek(a)suse.cz + +- s/openssl-devel/libopenssl-devel/ [#305815] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ curl.spec ++++++ --- /var/tmp/diff_new_pack.T23686/_old 2007-08-31 15:37:22.000000000 +0200 +++ /var/tmp/diff_new_pack.T23686/_new 2007-08-31 15:37:22.000000000 +0200 @@ -11,9 +11,9 @@ # norootforbuild Name: curl -BuildRequires: libidn-devel openssl-devel zlib-devel +BuildRequires: libidn-devel libopenssl-devel zlib-devel Version: 7.16.4 -Release: 1 +Release: 9 Autoreqprov: on License: BSD 3-Clause, X11/MIT Group: Productivity/Networking/Web/Utilities @@ -66,7 +66,7 @@ %package -n libcurl-devel Summary: A Tool for Transferring Data from URLs Group: Productivity/Networking/Web/Utilities -Requires: libcurl4 = %{version} zlib-devel openssl-devel libidn-devel +Requires: libcurl4 = %{version} zlib-devel libopenssl-devel libidn-devel # curl-devel (v 7.15.5) was last used in 10.2 Provides: curl-devel <= 7.15.5 Obsoletes: curl-devel < 7.16.2 @@ -158,6 +158,8 @@ %doc %{_mandir}/man3/* %changelog +* Wed Aug 29 2007 - mmarek(a)suse.cz +- s/openssl-devel/libopenssl-devel/ [#305815] * Fri Aug 03 2007 - mmarek(a)suse.cz - updated to 7.16.4 * added CURLOPT_NEW_FILE_PERMS and CURLOPT_NEW_DIRECTORY_PERMS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bug-buddy
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package bug-buddy checked in at Fri Aug 31 15:37:12 CEST 2007. -------- --- GNOME/bug-buddy/bug-buddy.changes 2007-08-24 19:10:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/bug-buddy/bug-buddy.changes 2007-08-31 00:54:41.768717000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 31 00:53:54 CEST 2007 - maw(a)suse.de + +- Update to version 2.19.91: + * minidump code fixes +- Remove breakpad-arches.patch, as it is not necessary with this + release. + +------------------------------------------------------------------- Old: ---- breakpad-arches.patch bug-buddy-2.19.0.tar.bz2 New: ---- bug-buddy-2.19.91.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bug-buddy.spec ++++++ --- /var/tmp/diff_new_pack.y22265/_old 2007-08-31 15:37:02.000000000 +0200 +++ /var/tmp/diff_new_pack.y22265/_new 2007-08-31 15:37:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bug-buddy (Version 2.19.0) +# spec file for package bug-buddy (Version 2.19.91) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,14 +14,13 @@ BuildRequires: evolution-data-server-devel fdupes gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnutls-devel intltool libelf-devel libglade2-devel libgtop-devel libsoup-devel perl-XML-Parser scrollkeeper update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.19.0 -Release: 12 +Version: 2.19.91 +Release: 1 Requires: %{name}-lang = %{version} Summary: The GNOME Desktop Bug Reporting Tool Source: ftp://ftp.gnome.org/pub/gnome/sources/bug-buddy/2.18/%{name}-%{version}.tar… Patch1: bug-buddy-kde-menus.patch Patch5: abuild.patch -Patch7: breakpad-arches.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gdb @@ -44,7 +43,6 @@ %setup -q %patch1 %patch5 -%patch7 -p0 %build autoreconf -f -i @@ -91,6 +89,11 @@ %files lang -f %{name}.lang %changelog +* Fri Aug 31 2007 - maw(a)suse.de +- Update to version 2.19.91: + * minidump code fixes +- Remove breakpad-arches.patch, as it is not necessary with this + release. * Fri Aug 24 2007 - maw(a)suse.de - Remove includes.patch, and replace it with breakpad-arches.patch (which comes out of gnome svn) (#297971) ++++++ bug-buddy-2.19.0.tar.bz2 -> bug-buddy-2.19.91.tar.bz2 ++++++ ++++ 16689 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 bootsplash-theme-SuSE
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package bootsplash-theme-SuSE checked in at Fri Aug 31 15:36:58 CEST 2007. -------- --- bootsplash-theme-SuSE/bootsplash-theme-SuSE.changes 2007-07-18 09:56:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/bootsplash-theme-SuSE/bootsplash-theme-SuSE.changes 2007-08-31 12:12:18.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 31 12:11:05 CEST 2007 - snwint(a)suse.de + +- added 1366x768 (#298025) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootsplash-theme-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.S19290/_old 2007-08-31 15:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.S19290/_new 2007-08-31 15:36:32.000000000 +0200 @@ -17,7 +17,7 @@ %endif URL: http://www.bootsplash.org/ Version: 3.1 -Release: 145 +Release: 165 Summary: Default SUSE Bootsplash Theme License: GPL v2 or later Group: System/Boot @@ -169,6 +169,8 @@ %config /var/adm/fillup-templates/sysconfig.bootsplash-theme-SuSE-NLD %changelog +* Fri Aug 31 2007 - snwint(a)suse.de +- added 1366x768 (#298025) * Wed Jul 18 2007 - coolo(a)suse.de - Update SUSE theme for 10.3 * Wed Mar 21 2007 - snwint(a)suse.de ++++++ Theme-SuSE.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSE/config/bootsplash-1366x768.cfg new/SuSE/config/bootsplash-1366x768.cfg --- old/SuSE/config/bootsplash-1366x768.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/SuSE/config/bootsplash-1366x768.cfg 2007-08-31 10:59:50.000000000 +0200 @@ -0,0 +1,34 @@ +# This is a bootsplash configuration file for +# SUSE Linux 10.3, resolution 1366x768. +# +# See www.bootsplash.org for more information. +# Written by Jakub Steiner <jimmac(a)novell.com> +# +version=3 +state=1 +progress_enable=0 +overpaintok=1 + + +fgcolor=7 +bgcolor=0 + +tx=20 +ty=60 +tw=1336 +th=708 + + +jpeg=/etc/bootsplash/themes/SuSE/images/bootsplash-1366x768.jpg +silentjpeg=/etc/bootsplash/themes/SuSE/images/silent-1366x768.jpg + + +mnganim logo /etc/bootsplash/themes/SuSE/images/logo.mng initframe logo silent center 1093 614 +mnganim logov /etc/bootsplash/themes/SuSE/images/logov.mng initframe logov origin 0 0 0 +mnganim infotext /etc/bootsplash/themes/SuSE/images/infotext.mng initframe infotext silent center 1105 664 + + +progress_enable=1 +box silent noover 999 644 1179 645 #ffffff10 +box silent inter 999 643 999 645 #ffffff00 +box silent 999 643 1179 646 #ffffff80 Files old/SuSE/images/bootsplash-1366x768.jpg and new/SuSE/images/bootsplash-1366x768.jpg differ Files old/SuSE/images/silent-1366x768.jpg and new/SuSE/images/silent-1366x768.jpg differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmorapplet-gnome
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package apparmorapplet-gnome checked in at Fri Aug 31 15:36:25 CEST 2007. -------- --- GNOME/apparmorapplet-gnome/apparmorapplet-gnome.changes 2007-08-06 22:01:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/apparmorapplet-gnome/apparmorapplet-gnome.changes 2007-08-15 01:46:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 15 01:46:35 CEST 2007 - ro(a)suse.de + +- change prefix to /opt/gnome for sles10-rt + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmorapplet-gnome.spec ++++++ --- /var/tmp/diff_new_pack.f16373/_old 2007-08-31 15:35:35.000000000 +0200 +++ /var/tmp/diff_new_pack.f16373/_new 2007-08-31 15:35:35.000000000 +0200 @@ -12,12 +12,13 @@ Name: apparmorapplet-gnome Version: 0.8 -Release: 1 +Release: 14 URL: http://forge.novell.com/modules/xfmod/project/?apparmor BuildRequires: gnome-common gnome-desktop-devel gnome-panel-devel %if %suse_version > 1010 BuildRequires: dbus-1-glib-devel %else +%define _prefix /opt/gnome BuildRequires: dbus-1-devel dbus-1-glib %endif Group: System/GUI/GNOME @@ -59,6 +60,8 @@ %{_datadir}/pixmaps/* %changelog +* Wed Aug 15 2007 - ro(a)suse.de +- change prefix to /opt/gnome for sles10-rt * Mon Aug 06 2007 - mbarringer(a)suse.de - Resolving bug #297486 (apparmorapplet-gnome does not report correct information for certain rejection types). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apache2
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package apache2 checked in at Fri Aug 31 15:36:18 CEST 2007. -------- --- apache2/apache2.changes 2007-08-23 12:11:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/apache2/apache2.changes 2007-08-31 12:38:21.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 31 12:37:27 CEST 2007 - poeml(a)suse.de + +- replace httpd-2.2.3-AddDirectoryIndexCharset.patch with the upstream + solution, httpd-2.2.4-mod_autoindex-charset-r570962.patch [#153557] + (backport from 2.2.6) + * Merge r570532, r570535, r570558 from trunk: + IndexOptions ContentType=text/html Charset=UTF-8 magic. + http://svn.apache.org/viewvc?rev=570962&view=rev + http://issues.apache.org/bugzilla/show_bug.cgi?id=42105 + This means that the AddDirectoryIndexCharset is no longer + available. Instead, IndexOptions Charset=xyz can be used. + +------------------------------------------------------------------- +Fri Aug 31 11:42:58 CEST 2007 - poeml(a)suse.de + +- remove libexpat-devel in the build service version of the package +- apply apache2-mod_cache-CVE-2007-1863.patch (patch 152) in the + buildservice package +- don't apply mod_dbd.c-issue18989-autoconnect.dif, since it + patches only modules/database/mod_dbd.c which is replaced with + trunk version anyway + +------------------------------------------------------------------- Old: ---- httpd-2.2.3-AddDirectoryIndexCharset.patch New: ---- httpd-2.2.4-mod_autoindex-charset-r570962.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.ub7793/_old 2007-08-31 15:31:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ub7793/_new 2007-08-31 15:31:35.000000000 +0200 @@ -55,7 +55,7 @@ Group: Productivity/Networking/Web/Servers %define realver 2.2.4 Version: 2.2.4 -Release: 57 +Release: 59 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -107,7 +107,7 @@ Patch65: httpd-2.0.49-log_server_status.dif Patch66: httpd-2.0.54-envvars.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif -Patch68: httpd-2.2.3-AddDirectoryIndexCharset.patch +Patch68: httpd-2.2.4-mod_autoindex-charset-r570962.patch Patch69: httpd-2.2.x.doublefree.patch Patch150: mod_dbd.c-issue18989-autoconnect.dif Patch151: apache2-mod_status-CVE-2006-5752.patch @@ -321,7 +321,7 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 -%patch68 -p1 +%patch68 -p0 %patch69 -p0 %patch151 -p0 %patch152 -p0 @@ -1060,6 +1060,23 @@ fi %changelog +* Fri Aug 31 2007 - poeml(a)suse.de +- replace httpd-2.2.3-AddDirectoryIndexCharset.patch with the upstream + solution, httpd-2.2.4-mod_autoindex-charset-r570962.patch [#153557] + (backport from 2.2.6) + * Merge r570532, r570535, r570558 from trunk: + IndexOptions ContentType=text/html Charset=UTF-8 magic. + http://svn.apache.org/viewvc?rev=570962&view=rev + http://issues.apache.org/bugzilla/show_bug.cgi?id=42105 + This means that the AddDirectoryIndexCharset is no longer + available. Instead, IndexOptions Charset=xyz can be used. +* Fri Aug 31 2007 - poeml(a)suse.de +- remove libexpat-devel in the build service version of the package +- apply apache2-mod_cache-CVE-2007-1863.patch (patch 152) in the + buildservice package +- don't apply mod_dbd.c-issue18989-autoconnect.dif, since it + patches only modules/database/mod_dbd.c which is replaced with + trunk version anyway * Thu Aug 23 2007 - mskibbe(a)suse.de - Bug 289996 - VUL-0: mod_status XSS in public server status page - Bug 289997 - VUL-0: apache2: mod_cache remote denial of service ++++++ httpd-2.2.4-mod_autoindex-charset-r570962.patch ++++++ Index: modules/generators/mod_autoindex.c =================================================================== --- modules/generators/mod_autoindex.c (revision 570961) +++ modules/generators/mod_autoindex.c (revision 570962) @@ -138,6 +138,8 @@ apr_array_header_t *hdr_list; apr_array_header_t *rdme_list; + char *ctype; + char *charset; } autoindex_config_rec; static char c_by_encoding, c_by_type, c_by_path; @@ -476,6 +478,12 @@ d_cfg->desc_adjust = K_NOADJUST; } } + else if (!strncasecmp(w, "Type=", 5)) { + d_cfg->ctype = apr_pstrdup(cmd->pool, &w[5]); + } + else if (!strncasecmp(w, "Charset=", 8)) { + d_cfg->charset = apr_pstrdup(cmd->pool, &w[8]); + } else { return "Invalid directory indexing option"; } @@ -620,6 +628,9 @@ new->icon_height = add->icon_height ? add->icon_height : base->icon_height; new->icon_width = add->icon_width ? add->icon_width : base->icon_width; + new->ctype = add->ctype ? add->ctype : base->ctype; + new->charset = add->charset ? add->charset : base->charset; + new->alt_list = apr_array_append(p, add->alt_list, base->alt_list); new->ign_list = apr_array_append(p, add->ign_list, base->ign_list); new->hdr_list = apr_array_append(p, add->hdr_list, base->hdr_list); @@ -1971,6 +1982,8 @@ char *colargs; char *fullpath; apr_size_t dirpathlen; + char *ctype = "text/html"; + char *charset; if ((status = apr_dir_open(&thedir, name, r->pool)) != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, @@ -1978,11 +1991,27 @@ return HTTP_FORBIDDEN; } + if (autoindex_conf->ctype) { + ctype = autoindex_conf->ctype; + } + if (autoindex_conf->charset) { + charset = autoindex_conf->charset; + } + else { #if APR_HAS_UNICODE_FS - ap_set_content_type(r, "text/html;charset=utf-8"); + charset = "UTF-8"; #else - ap_set_content_type(r, "text/html"); + charset = "ISO-8859-1"; #endif + } + if (*charset) { + ap_set_content_type(r, apr_pstrcat(r->pool, ctype, ";charset=", + charset, NULL)); + } + else { + ap_set_content_type(r, ctype); + } + if (autoindex_opts & TRACK_MODIFIED) { ap_update_mtime(r, r->finfo.mtime); ap_set_last_modified(r); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apache2-mod_mono
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package apache2-mod_mono checked in at Fri Aug 31 15:35:28 CEST 2007. -------- --- apache2-mod_mono/apache2-mod_mono.changes 2007-08-17 18:03:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/apache2-mod_mono/apache2-mod_mono.changes 2007-08-31 05:46:48.111280000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 31 05:46:28 CEST 2007 - wberrier(a)suse.de + +- mod_mono_1.2.5_p5_final.patch: fix regression: avoid sem leak + +------------------------------------------------------------------- New: ---- mod_mono_1.2.5_p5_final.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_mono.spec ++++++ --- /var/tmp/diff_new_pack.j12129/_old 2007-08-31 15:34:05.000000000 +0200 +++ /var/tmp/diff_new_pack.j12129/_new 2007-08-31 15:34:05.000000000 +0200 @@ -21,10 +21,11 @@ Group: Productivity/Networking/Web/Servers Autoreqprov: on Version: 1.2.5 -Release: 7 +Release: 12 Summary: Run ASP.NET Pages on Unix with Apache and Mono Source: %{modname}-%{version}.tar.bz2 Patch0: mod_mono_1.2.5_p4.patch.bz2 +Patch1: mod_mono_1.2.5_p5_final.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mod_mono = %{version}-%{release} Requires: xsp @@ -55,6 +56,7 @@ %prep %setup -n %{modname}-%{version} -q %patch0 +%patch1 -p1 %build autoreconf -fi @@ -74,6 +76,8 @@ %{_mandir}/man8/mod_mono.8* %changelog +* Fri Aug 31 2007 - wberrier(a)suse.de +- mod_mono_1.2.5_p5_final.patch: fix regression: avoid sem leak * Fri Aug 17 2007 - wberrier(a)suse.de - put mod_mono.conf in /etc/apache2/conf.d instead of /etc/apache2 - mod_mono_1.2.5_p4.patch.bz2: Bugfixes found in 1.2.5 ++++++ mod_mono_1.2.5_p5_final.patch ++++++ diff -ru p4/mod_mono-1.2.5/ChangeLog mod_mono-1.2.5/ChangeLog --- p4/mod_mono-1.2.5/ChangeLog 2007-08-16 14:43:48.000000000 -0600 +++ mod_mono-1.2.5/ChangeLog 2007-08-22 10:37:29.000000000 -0600 @@ -1,3 +1,8 @@ +2007-08-22 Marek Habersack <mhabersack(a)novell.com> + + * src/mod_mono.c (terminate_xsp2): if apache is shutting down, + destroy the mutex too, to avoid a leak. + 2007-08-10 Marek Habersack <mhabersack(a)novell.com> * src/mod_mono.c (terminate_xsp2): take an extra argument telling diff -ru p4/mod_mono-1.2.5/src/mod_mono.c mod_mono-1.2.5/src/mod_mono.c --- p4/mod_mono-1.2.5/src/mod_mono.c 2007-08-16 14:43:48.000000000 -0600 +++ mod_mono-1.2.5/src/mod_mono.c 2007-08-22 10:37:29.000000000 -0600 @@ -2256,7 +2256,18 @@ xsp->dashboard_shm = NULL; xsp->dashboard = NULL; } - + + if (!for_restart && xsp->dashboard_mutex) { + DEBUG_PRINT (0, "Destroying dasboard mutex %s", xsp->dashboard_lock_file); + rv = apr_global_mutex_destroy (xsp->dashboard_mutex); + if (rv != APR_SUCCESS) + ap_log_error (APLOG_MARK, APLOG_WARNING, STATCODE_AND_SERVER (rv), + "Failed to destroy the dashboard mutex '%s'", + xsp->dashboard_lock_file); + else + xsp->dashboard_mutex = NULL; + } + xsp->status = FORK_NONE; } @@ -2267,6 +2278,7 @@ static apr_status_t terminate_xsp (void *data) { + DEBUG_PRINT (0, "Cleaning up for shutdown"); return terminate_xsp2(data, NULL, 0, 0); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xsp
by root＠Hilbert.suse.de 31 Aug '07

31 Aug '07

Hello community, here is the log from the commit of package xsp checked in at Fri Aug 31 15:31:04 CEST 2007. -------- --- xsp/xsp.changes 2007-08-17 17:41:15.000000000 +0200 +++ /mounts/work_src_done/NOARCH/xsp/xsp.changes 2007-08-31 05:43:49.516064000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 05:42:49 CEST 2007 - wberrier(a)suse.de + +- xsp_1.2.5_p5_final.patch: Fix for regression in the request + broker + +------------------------------------------------------------------- New: ---- xsp_1.2.5_p5_final.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.ZM4590/_old 2007-08-31 15:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.ZM4590/_new 2007-08-31 15:30:42.000000000 +0200 @@ -16,10 +16,11 @@ Group: Productivity/Networking/Web/Servers Autoreqprov: on Version: 1.2.5 -Release: 6 +Release: 11 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.bz2 Patch0: xsp_1.2.5_p4.patch.bz2 +Patch1: xsp_1.2.5_p5_final.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: mono-devel mono-web pkgconfig @@ -47,6 +48,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build %{?env_options} @@ -99,6 +101,9 @@ %endif %changelog +* Fri Aug 31 2007 - wberrier(a)suse.de +- xsp_1.2.5_p5_final.patch: Fix for regression in the request + broker * Fri Aug 17 2007 - wberrier(a)suse.de - xsp_1.2.5_p4.patch.bz2: Bugfixes found in 1.2.5 -bugs: 81699, 81906, 82379, 82057 ++++++ xsp_1.2.5_p5_final.patch ++++++ diff -ru p4/xsp-1.2.5/ChangeLog xsp-1.2.5/ChangeLog --- p4/xsp-1.2.5/ChangeLog 2007-08-16 14:31:23.000000000 -0600 +++ xsp-1.2.5/ChangeLog 2007-08-22 10:21:31.000000000 -0600 @@ -1,3 +1,9 @@ +2007-08-18 Josh Tauberer <jit(a)occams.info> + + * src/Mono.WebServer/BaseRequestBroker.cs: Correct a mistake + in my previous patch: checking for wrap-around on requests_served + counter, since we bitmask it 0x7FFF, wrap-around occurs at 0x8000. + 2007-08-16 Wade Berrier <wberrier(a)novell.com> * configure.in: version bump -> 1.2.5 diff -ru p4/xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs --- p4/xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs 2007-08-16 14:31:23.000000000 -0600 +++ xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs 2007-08-22 10:21:31.000000000 -0600 @@ -183,8 +183,8 @@ requests_served++; // increment to 1 before putting into request_ids // so that the 0 id is reserved for slot not used - if (requests_served == 0) // and check for wrap-around for the above - requests_served++; // condition + if (requests_served == 0x8000) // and check for wrap-around for the above + requests_served = 1; // making sure we don't exceed 0x7FFF or go negative requests_count++; if (requests_count >= reqlen) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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